Version bump (see bug #284048).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 344 insertions, 2 deletions

diff --git a/app-text/bibus/ChangeLog b/app-text/bibus/ChangeLog
index 6c4a1a41cffa..f3e9d1279184 100644
--- a/app-text/bibus/ChangeLog
+++ b/app-text/bibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/bibus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.12 2009/09/01 03:16:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.13 2009/09/09 02:50:29 markusle Exp $
+
+*bibus-1.5_rc1 (09 Sep 2009)
+
+  09 Sep 2009; Markus Dittrich <markusle@gentoo.org> +bibus-1.5_rc1.ebuild,
+  +files/bibus-1.5_rc1-install.patch:
+  Version bump (see bug #284048).
 
 *bibus-1.4.3.2-r1 (01 Sep 2009)
 
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
index ef3cea15a0af..43c59d231159 100644
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@@ -2,10 +2,13 @@ AUX bibus-1.4.3-install.patch 3855 RMD160 6bf99b92198433fa7cf9a324247f559876fbf7
 AUX bibus-1.4.3.1-install.patch 5165 RMD160 5f6c5ad24327bf9df4e481408ff3a215106a2668 SHA1 f4f5bdd614b9b5a098603f15b8ebdaf3d20fb253 SHA256 439988e09f305301e50c287211c9d6205834b3d5af4b2b09800689d053ae6fd8
 AUX bibus-1.4.3.2-install.1.patch 13703 RMD160 3c2dfe7a43778d37caa8161102a2d126d3c92aa5 SHA1 9d082b2b58de1949c15e0a8c5a73d8dabdea4321 SHA256 3b9ee835cae7127d039b5861dcd65aa360b3e24176e49929628731cd66dba3e4
 AUX bibus-1.4.3.2-install.patch 13735 RMD160 16ecbf5b4688d339560d8d122239631804c610bc SHA1 a6a067ccb1cfc5b5024fb93d8d84669dd7b5bd4c SHA256 890ebf6061f005a893e80f023613e472cda37eaffb5c66d7539295d6a869af64
+AUX bibus-1.5_rc1-install.patch 13748 RMD160 81800c36071387dfeffb092296c23a8a219f5b5d SHA1 00b55c9186cc44238decfbb2265d47b44238646f SHA256 6c708127d3b1824873492c0e09733e6b3ebac247b2c3b2a11692ae36091f7807
 DIST bibus-1.4.3.1.tar.gz 4708868 RMD160 795382c2fe68720b5129e61fa5ecdc20c68ce77b SHA1 e96836e07b7352782233190e2fd89ebb74df0f59 SHA256 62b47267540f454a20c601517b687f5afb0c98d9478474b456c16a913d30ce9c
 DIST bibus-1.4.3.2.tar.gz 4800983 RMD160 3a228596f21fabd64a2d791614bb0136c8e28daf SHA1 88d30cb35acc22a6dd41ad5c3f43fb1ddb411c28 SHA256 54c6f688be5850d96d4d2606adee2769aff6f786cc0314f6dbf86746397a00cf
+DIST bibus-1.5rc1.tar.gz 4991994 RMD160 986eab10827ee35a3882d7a4d7ed448b6d9e31cb SHA1 2269053b9983f356149d4b216c88f8f8d2b7fc78 SHA256 5fdf23ffd1a7a80f025f8a002a19b30f3f2a645a2c7e0d69d9f9777449e39503
 EBUILD bibus-1.4.3.1.ebuild 1816 RMD160 276f5886edecea6ddbce084259f2d069e78b8e83 SHA1 90334a520ec61394a8258075bb094737db1e87b7 SHA256 62f377550be9e5294d0fd7e127551a961f22aa7ca158857e24ad0203203099e2
 EBUILD bibus-1.4.3.2-r1.ebuild 1836 RMD160 ee63e9858f9e0c88823b28e109f397e789b903f2 SHA1 4ca7a6159fbbbb21d3a58ac7c0566e0beb03b10d SHA256 623d8fd800276ab03c2897b0b3d790d3a4a0d2d832da9b208e08b02060ac2109
 EBUILD bibus-1.4.3.2.ebuild 1637 RMD160 be705294eb6f838cd393b064f1aa12a7c4da1535 SHA1 86233efbc3e2a8583cdc2edc110b16a38a9ca364 SHA256 4d826781269d35551a3ab05246cc4e590aa7ecb70136e8eaacd5e4b0474d87c1
-MISC ChangeLog 2476 RMD160 590204def12237b7d9ad48ad78074ca908f6b8eb SHA1 d6007d3ed133b2a2b27d9f2577752888526a7826 SHA256 183ffbed8f17c0e46b73663bbbe9be5541d58c60c4d7b68a8a2fe8009bf63aef
+EBUILD bibus-1.5_rc1.ebuild 1805 RMD160 f7a4c1de6ad8fc638b8e4bf200ae158a8eafde58 SHA1 ebf9d1f4d51d37184f57069e70de67439c324b58 SHA256 1c3a3b883d1ca4a1cc157f320f61c2483723139514606585bcb26f9245bf0bdf
+MISC ChangeLog 2655 RMD160 2d7de99b5238d2bf263e28f183b0ec150a3a73da SHA1 0122a691dcb395fcffd64b385b55f69303cc7836 SHA256 50e2a81aa290cda397885f4a8d509a7adb38b8dc5b5746efcb3000fab9a42a1a
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/app-text/bibus/bibus-1.5_rc1.ebuild b/app-text/bibus/bibus-1.5_rc1.ebuild
new file mode 100644
index 000000000000..c08f00c8852e
--- /dev/null
+++ b/app-text/bibus/bibus-1.5_rc1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5_rc1.ebuild,v 1.1 2009/09/09 02:50:29 markusle Exp $
+
+EAPI="2"
+
+inherit python multilib eutils versionator
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Bibliographic and reference management software, integrates with OO.o and MS Word"
+HOMEPAGE="http://bibus-biblio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-biblio/${PN}-${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql sqlite"
+# Most of this mess is designed to give the choice of sqlite or mysql
+# but prefer sqlite. We also need to default to sqlite if neither is requested.
+RDEPEND="virtual/ooo
+	=dev-python/wxpython-2.6*
+	sqlite? (
+		dev-python/pysqlite
+		dev-db/sqliteodbc
+	)
+	!sqlite? (
+		mysql? (
+			dev-python/mysql-python
+			dev-db/myodbc
+		)
+		!mysql? (
+			dev-python/pysqlite
+			dev-db/sqliteodbc
+		)
+	)
+	dev-db/unixODBC"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	python_version
+	epatch "${FILESDIR}"/${P}-install.patch
+	sed -e "s:gentoo-python:python${PYVER}:g" \
+		-i Makefile Setup/Makefile Setup/bibus.cfg Setup/bibus.sh \
+		|| die "Failed to adjust python paths"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		oopath="/usr/$(get_libdir)/openoffice/program" \
+		prefix='$(DESTDIR)/usr' \
+		sysconfdir='$(DESTDIR)/etc' \
+		install || die "emake install failed"
+	emake \
+		DESTDIR="${D}" \
+		oopath="/usr/$(get_libdir)/openoffice/program" \
+		prefix='$(DESTDIR)/usr' \
+		sysconfdir='$(DESTDIR)/etc' \
+		install-doc-en || die "emake install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/bibus
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/python${PYVER}/site-packages/bibus
+}
diff --git a/app-text/bibus/files/bibus-1.5_rc1-install.patch b/app-text/bibus/files/bibus-1.5_rc1-install.patch
new file mode 100644
index 000000000000..edd5c71c1b42
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.5_rc1-install.patch
@@ -0,0 +1,263 @@
+diff -Naur bibus-1.5rc1/Makefile bibus-1.5rc1.new/Makefile
+--- bibus-1.5rc1/Makefile	2009-07-01 07:38:01.000000000 -0400
++++ bibus-1.5rc1.new/Makefile	2009-09-08 22:25:22.000000000 -0400
+@@ -1,24 +1,25 @@
+ # you presumably will only have to change the three first lines below
+-DESTDIR = /usr/local
++DESTDIR = ${D}usr
+ python = /usr/bin/python
+ oopath = /usr/lib/openoffice/program
+-ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib
++ooure = /usr/lib/openoffice/basis-link/ure-link/lib
+ oobasis = /usr/lib/openoffice/basis-link/program
+ #
+ prefix = $(DESTDIR)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ datadir = $(prefix)/share
+-sysconfdir = /etc
++pythondir = $(prefix)/lib/gentoo-python/site-packages
++sysconfdir = ${D}etc
+ mandir = $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ 
+ define install-files
+-	install -d $(datadir)/bibus
+-	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
++	install -d $(pythondir)/bibus
++	install -m644 *.py MySQL_Bibus.ini $(pythondir)/bibus/
+ 	#
+ 	for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data; do \
+-		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
++		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(pythondir)/bibus/'{}' ';' ; \
+ 	done
+ 	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
+ 	# locale files. We look for all the directory in locale/
+@@ -35,41 +36,38 @@
+ 	# freedesktop icon and shortcut
+ 	install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
+ 	install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
+-	# The following lines are presumably not needed since icons/desktop are in standard locations
+-	#echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
+-	#echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
+ 
+ 	# bibus command
+ 	install -d $(bindir)
+-	ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus
+-	chmod 755 $(datadir)/bibus/bibusStart.py
++	ln -sf $(pythondir)/bibus/bibusStart.py $(bindir)/bibus
++	chmod 755 $(pythondir)/bibus/bibusStart.py
+ 
+ 	# basic doc files
+-	install -m755 -d $(datadir)/doc/bibus
+-	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
++	install -m755 -d $(datadir)/doc/${PF}
++	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/${PF}
+ 
+ 	# generating bibus.cfg file
+-	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
+-	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
+-	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
+-	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
+-	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
++	echo '[PATH]' > $(pythondir)/bibus/bibus.cfg
++	echo 'python = $(python)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'oopath = $(oopath)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'ooure = $(ooure)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'oobasis = $(oobasis)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'docdir = /usr/share/doc/${PF}/html' >> $(pythondir)/bibus/bibus.cfg
++	echo 'licence = /usr/share/doc/${PF}/copying' >> $(pythondir)/bibus/bibus.cfg
++	echo 'localedir = /usr/share/locale' >> $(pythondir)/bibus/bibus.cfg
++	echo 'systemconf = /etc/bibus.config' >> $(pythondir)/bibus/bibus.cfg
+ endef
+ 
+ define install-doc-en
+ 	# copying docs in from Docs/html/en/ for bibus-doc-en
+ 	cd Docs;\
+-	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
++	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/${PF}/'{}' ';'
+ endef
+ 
+ define compile
+-	# compile recursively all the python files located in $(datadir)/bibus
+-	$(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
+-	$(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
++	# compile recursively all the python files located in $(pythondir)/bibus
++	$(python) -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
++	$(python) -O -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
+ endef
+ 
+ install-files:
+@@ -85,13 +83,15 @@
+ 
+ 	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
+ 		echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "find /usr/share/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /etc/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/man/man1/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/share/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
+ 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
+ 	# end uninstaller
+diff -Naur bibus-1.5rc1/Setup/Makefile bibus-1.5rc1.new/Setup/Makefile
+--- bibus-1.5rc1/Setup/Makefile	2009-07-01 07:38:01.000000000 -0400
++++ bibus-1.5rc1.new/Setup/Makefile	2009-09-08 22:33:37.000000000 -0400
+@@ -1,24 +1,25 @@
+ # you presumably will only have to change the three first lines below
+-DESTDIR = /usr/local
++DESTDIR = ${D}usr
+ python = /usr/bin/python
+ oopath = /usr/lib/openoffice/program
+-ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib
++ooure = /usr/lib/openoffice/basis-link/ure-link/lib
+ oobasis = /usr/lib/openoffice/basis-link/program
+ #
+ prefix = $(DESTDIR)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ datadir = $(prefix)/share
+-sysconfdir = /etc
++pythondir = $(prefix)/lib/gentoo-python/site-packages
++sysconfdir = ${D}etc
+ mandir = $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ 
+ define install-files
+-	install -d $(datadir)/bibus
+-	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
++	install -d $(pythondir)/bibus
++	install -m644 *.py MySQL_Bibus.ini $(pythondir)/bibus/
+ 	#
+ 	for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data; do \
+-		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
++		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(pythondir)/bibus/'{}' ';' ; \
+ 	done
+ 	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
+ 	# locale files. We look for all the directory in locale/
+@@ -35,43 +36,40 @@
+ 	# freedesktop icon and shortcut
+ 	install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
+ 	install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
+-	# The following lines are presumably not needed since icons/desktop are in standard locations
+-	#echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
+-	#echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
+ 
+ 	# bibus command
+ 	install -d $(bindir)
+-	ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus
+-	chmod 755 $(datadir)/bibus/bibusStart.py
++	ln -sf $(pythondir)/bibus/bibusStart.py $(bindir)/bibus
++	chmod 755 $(pythondir)/bibus/bibusStart.py
+ 
+ 	# basic doc files
+-	install -m755 -d $(datadir)/doc/bibus
+-	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
++	install -m755 -d $(datadir)/doc/${PF}
++	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/${PF}
+ 
+ 	# generating bibus.cfg file
+-	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
+-	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
+-	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
+-	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
+-	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
++	echo '[PATH]' > $(pythondir)/bibus/bibus.cfg
++	echo 'python = $(python)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'oopath = $(oopath)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'ooure = $(ooure)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'oobasis = $(oobasis)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'docdir = /usr/share/doc/${PF}/html' >> $(pythondir)/bibus/bibus.cfg
++	echo 'licence = /usr/share/doc/${PF}/copying' >> $(pythondir)/bibus/bibus.cfg
++	echo 'localedir = /usr/share/locale' >> $(pythondir)/bibus/bibus.cfg
++	echo 'systemconf = /etc/bibus.config' >> $(pythondir)/bibus/bibus.cfg
+ endef
+ 
+ define install-doc-en
+ 	# copying docs in from Docs/html/en/ for bibus-doc-en
+ 	cd Docs;\
+-	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
++	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/${PF}/'{}' ';'
+ 	cd Docs;\
+ 	find html/ScreenShots/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
+ endef
+ 
+ define compile
+ 	# compile recursively all the python files located in $(datadir)/bibus
+-	$(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
+-	$(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
++	$(python) -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
++	$(python) -O -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
+ endef
+ 
+ install-files:
+@@ -87,13 +85,15 @@
+ 
+ 	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
+ 		echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "find /usr/share/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /etc/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/man/man1/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/share/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
+ 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
+ 	# end uninstaller
+diff -Naur bibus-1.5rc1/Setup/bibus.cfg bibus-1.5rc1.new/Setup/bibus.cfg
+--- bibus-1.5rc1/Setup/bibus.cfg	2009-07-01 07:38:01.000000000 -0400
++++ bibus-1.5rc1.new/Setup/bibus.cfg	2009-09-08 22:25:22.000000000 -0400
+@@ -1,7 +1,7 @@
+ [PATH]
+ python = /usr/bin/python
+ oopath = /usr/lib/openoffice/program
+-docdir = /usr/local/share/doc/bibus/html
+-licence = /usr/local/share/doc/bibus/copying
+-localedir = /usr/local/share/locale
+-systemconf = /usr/local/etc/bibus.config
++docdir = /usr/share/doc/bibus-1.4.3.2-r1/html
++licence = /usr/share/doc/bibus-1.4.3.2-r1/copying
++localedir = /usr/share/locale
++systemconf = /etc/bibus.config
+diff -Naur bibus-1.5rc1/Setup/bibus.sh bibus-1.5rc1.new/Setup/bibus.sh
+--- bibus-1.5rc1/Setup/bibus.sh	2009-07-01 07:38:01.000000000 -0400
++++ bibus-1.5rc1.new/Setup/bibus.sh	2009-09-08 22:25:22.000000000 -0400
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+-export LD_LIBRARY_PATH=/usr/lib/openoffice/program
+-export PYTHONPATH=/usr/lib/openoffice/program
+-exec /usr/bin/python /usr/local/share/bibus/bibus.py
++export LD_LIBRARY_PATH=/usr/lib/openoffice/program:/usr/lib/openoffice/basis-link/program:/usr/lib/openoffice/basis-link/ure-link/lib
++export PYTHONPATH=/usr/lib/openoffice/program:/usr/lib/openoffice/basis-link/program:/usr/lib/openoffice/basis-link/ure-link/lib
++exec /usr/bin/python /usr/lib/gentoo-python/site-packages/bibus/bibus.py