Version bump (fixes bug #179074).

(Portage version: 2.1.4.1)

3 files changed, 141 insertions, 2 deletions

diff --git a/app-text/bibus/ChangeLog b/app-text/bibus/ChangeLog
index 852d82f79b2d..e35055231e1b 100644
--- a/app-text/bibus/ChangeLog
+++ b/app-text/bibus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/bibus
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.4 2007/09/22 14:02:15 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.5 2008/02/08 14:16:37 markusle Exp $
+
+*bibus-1.4.0_rc2 (08 Feb 2008)
+
+  08 Feb 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/bibus-1.4.0_rc2-install.patch, +bibus-1.4.0_rc2.ebuild:
+  Version bump (fixes bug #179074). Thanks much to Attila Tóth  
+  <atoth@atoth.sote.hu> for his ebuild and patches.
 
   22 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> bibus-1.2.0.ebuild:
   Keyworded ~amd64 as per bug 185872.
diff --git a/app-text/bibus/bibus-1.4.0_rc2.ebuild b/app-text/bibus/bibus-1.4.0_rc2.ebuild
new file mode 100644
index 000000000000..9625fd4ee295
--- /dev/null
+++ b/app-text/bibus/bibus-1.4.0_rc2.ebuild
@@ -0,0 +1,80 @@
+# 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.1 2008/02/08 14:16:37 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"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86 ~amd64"
+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}/${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"
+}
+
+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"
+
+	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 "${ROOT}"usr/share/bibus
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${ROOT}"usr/share/bibus
+}
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
new file mode 100644
index 000000000000..c48111c42b40
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.4.0_rc2-install.patch
@@ -0,0 +1,52 @@
+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