Version bump for openoffice-3 compatibility (see bug #246443).

(Portage version: 2.2_rc13/cvs/Linux 2.6.27-SENTINEL-2 i686)

5 files changed, 123 insertions, 141 deletions

diff --git a/app-text/bibus/ChangeLog b/app-text/bibus/ChangeLog
index 32217794ad7a..30ce77e1f199 100644
--- a/app-text/bibus/ChangeLog
+++ b/app-text/bibus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/bibus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.7 2008/05/29 15:52:15 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.8 2008/11/12 23:17:35 markusle Exp $
+
+*bibus-1.4.3.1 (12 Nov 2008)
+
+  12 Nov 2008; Markus Dittrich <markusle@gentoo.org>
+  -files/bibus-1.4.0_rc2-install.patch ,
+  -bibus-1.4.0_rc2.ebuild, -bibus-1.2.0.ebuild
+  +files/bibus-1.4.3.1-install.patch, +bibus-1.4.3.1.ebuild:
+  Version bump for openoffice-3 compatibility (see bug #246443). 
+  Thanks much to Attila Tóth for his help and patches.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> bibus-1.2.0.ebuild,
   bibus-1.4.0_rc2.ebuild, bibus-1.4.3.ebuild:
diff --git a/app-text/bibus/bibus-1.2.0.ebuild b/app-text/bibus/bibus-1.2.0.ebuild
deleted file mode 100644
index 6ec8e3d90cb4..000000000000
--- a/app-text/bibus/bibus-1.2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.2.0.ebuild,v 1.4 2008/05/29 15:52:15 hawking Exp $
-
-inherit python multilib
-
-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/${P}.zip"
-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}
-	app-arch/unzip"
-
-S="${WORKDIR}/${P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s:lib:$(get_libdir):g" \
-		-e "s:local/::g" \
-		Setup/bibus.sh
-}
-
-src_install() {
-	emake \
-		-f Setup/Makefile \
-		DESTDIR="${D}" \
-		oopath="/usr/$(get_libdir)/openoffice/program" \
-		prefix='$(DESTDIR)/usr' \
-		sysconfdir='$(DESTDIR)/etc' \
-		install || die "emake install failed"
-	emake \
-		-f Setup/Makefile \
-		DESTDIR="${D}" \
-		oopath="/usr/$(get_libdir)/openoffice/program" \
-		prefix='$(DESTDIR)/usr' \
-		sysconfdir='$(DESTDIR)/etc' \
-		install-doc-en || die "emake install failed"
-
-	insinto /usr/share/applications/
-	doins Setup/bibus.desktop
-	insinto /usr/share/icons/hicolor/48x48/apps/
-	doins Pixmaps/bibus.png
-
-	dodoc Docs/installation.txt
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/bibus
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/bibus
-}
diff --git a/app-text/bibus/bibus-1.4.0_rc2.ebuild b/app-text/bibus/bibus-1.4.3.1.ebuild
index 2d051d916b57..9e7f1cd7a946 100644
--- a/app-text/bibus/bibus-1.4.0_rc2.ebuild
+++ b/app-text/bibus/bibus-1.4.3.1.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.4.0_rc2.ebuild,v 1.2 2008/05/29 15:52:15 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.4.3.1.ebuild,v 1.1 2008/11/12 23:17:35 markusle Exp $
 
 inherit python multilib eutils
 
-MY_PV="1.4.0"
-
 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}rc2.zip"
+SRC_URI="mirror://sourceforge/${PN}-biblio/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86 ~amd64"
@@ -35,16 +33,10 @@ RDEPEND="virtual/ooo
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-S="${WORKDIR}/${PN}-${MY_PV}rc2"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-install.patch
-	sed -e "s:GENTOO-PF:${P}:g" \
-		-e "69aall:\n" \
-		-e "s:\$\(compile\)::" \
-		-i Makefile || die "Failed to patch makefile"
 	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
 		-i Setup/bibus.sh Makefile || die "Failed to fix bibus wrapper"
 }
diff --git a/app-text/bibus/files/bibus-1.4.0_rc2-install.patch b/app-text/bibus/files/bibus-1.4.0_rc2-install.patch
deleted file mode 100644
index c48111c42b40..000000000000
--- a/app-text/bibus/files/bibus-1.4.0_rc2-install.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur bibus-1.4.0rc2/Makefile bibus-1.4.0rc2.new/Makefile
---- bibus-1.4.0rc2/Makefile	2007-11-18 12:14:42.000000000 -0500
-+++ bibus-1.4.0rc2.new/Makefile	2008-02-08 08:59:23.000000000 -0500
-@@ -42,23 +42,23 @@
- 	chmod 755 $(datadir)/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/GENTOO-PF
-+	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/GENTOO-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 '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 'docdir = /usr/share/doc/GENTOO-PF/html' >> $(datadir)/bibus/bibus.cfg
-+	echo 'licence = /usr/share/doc/GENTOO-PF/copying' >> $(datadir)/bibus/bibus.cfg
-+	echo 'localedir = /usr/share/locale' >> $(datadir)/bibus/bibus.cfg
-+	echo 'systemconf = /etc/bibus.config' >> $(datadir)/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/GENTOO-PF/'{}' ';'
- endef
- 
- define compile
-@@ -85,7 +85,7 @@
- 		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 -rf $(datadir)/doc/GENTOO-PF" >> $(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
- 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
-diff -Naur bibus-1.4.0rc2/Setup/bibus.sh bibus-1.4.0rc2.new/Setup/bibus.sh
---- bibus-1.4.0rc2/Setup/bibus.sh	2007-11-18 12:14:42.000000000 -0500
-+++ bibus-1.4.0rc2.new/Setup/bibus.sh	2008-02-08 08:57:57.000000000 -0500
-@@ -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
-+exec /usr/bin/python /usr/share/bibus/bibus.py
diff --git a/app-text/bibus/files/bibus-1.4.3.1-install.patch b/app-text/bibus/files/bibus-1.4.3.1-install.patch
new file mode 100644
index 000000000000..90b5c3bbc852
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.4.3.1-install.patch
@@ -0,0 +1,111 @@
+diff -Naur bibus-1.4.3.1/Makefile bibus-1.4.3.1.new/Makefile
+--- bibus-1.4.3.1/Makefile	2008-10-28 13:46:10.000000000 -0400
++++ bibus-1.4.3.1.new/Makefile	2008-11-12 09:55:51.000000000 -0500
+@@ -2,14 +2,14 @@
+ DESTDIR = /usr/local
+ 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)
++prefix = $(DESTDIR)/usr
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ datadir = $(prefix)/share
+-sysconfdir = /etc
++sysconfdir = $(DESTDIR)/etc
+ mandir = $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ 
+@@ -44,8 +44,8 @@
+ 	chmod 755 $(datadir)/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
+@@ -53,16 +53,16 @@
+ 	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 'docdir = /usr/share/doc/${PF}/html' >> $(datadir)/bibus/bibus.cfg
++	echo 'licence = /usr/share/doc/${PF}/copying' >> $(datadir)/bibus/bibus.cfg
++	echo 'localedir = /usr/share/locale' >> $(datadir)/bibus/bibus.cfg
++	echo 'systemconf = /etc/bibus.config' >> $(datadir)/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
+@@ -71,6 +71,8 @@
+ 	$(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
+ endef
+ 
++all:
++
+ install-files:
+ 	$(install-files)
+ 
+@@ -84,13 +86,13 @@
+ 
+ 	# 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 "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.4.3.1/Setup/bibus.cfg bibus-1.4.3.1.new/Setup/bibus.cfg
+--- bibus-1.4.3.1/Setup/bibus.cfg	2005-10-01 09:10:41.000000000 -0400
++++ bibus-1.4.3.1.new/Setup/bibus.cfg	2008-11-12 09:15:08.000000000 -0500
+@@ -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/${P}/html
++licence = /usr/share/doc/${P}/copying
++localedir = /usr/share/locale
++systemconf = /etc/bibus.config
+diff -Naur bibus-1.4.3.1/Setup/bibus.sh bibus-1.4.3.1.new/Setup/bibus.sh
+--- bibus-1.4.3.1/Setup/bibus.sh	2005-11-30 18:21:40.000000000 -0500
++++ bibus-1.4.3.1.new/Setup/bibus.sh	2008-11-12 09:15:08.000000000 -0500
+@@ -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/share/bibus/bibus.py