Version bump (fixes bug #179074).

Package-Manager: portage-2.1.4.1

4 files changed, 145 insertions, 3 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/Manifest b/app-text/bibus/Manifest
index 66edce5d1fb2..969429733703 100644
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@@ -1,4 +1,7 @@
+AUX bibus-1.4.0_rc2-install.patch 2721 RMD160 8fc558aee85120eb6b18ca1b7862df7136503847 SHA1 0dac5b1a4b99b3cf0967dac4225b085dde9ac087 SHA256 2425333705a2548b4499561730921251ccca4b89a683c208ee3a366c58fabd25
 DIST bibus-1.2.0.zip 3910294 RMD160 cfe25ed33577712f0f16eea410a65f284aa2dffe SHA1 6429f375c5f745ce00cd2f1d72c46f37541b3f5e SHA256 aa10b4f5d767453d4b3d21ae7dff8bee2e652f42655a479c5b762a6d28b54e26
+DIST bibus-1.4.0rc2.zip 6334244 RMD160 7a52c69e250f97ecca9b28e00b5a913372752838 SHA1 0be277340bac24d30f0b4f7bfc873138d11ec054 SHA256 52a9e0f47783365c0d65404edbd95ebb3df5408d4b988d006023318538758253
 EBUILD bibus-1.2.0.ebuild 1820 RMD160 9e6581ea3fa952a8d36d5bd1d625029bc3b55126 SHA1 83ae51aeaaa3453452cfa9d9d4b0a4b7b58f3a95 SHA256 9d0018630e1f7c02fd6fa0cd0adbda93e5c3971ae5d82227cb7a4326e999ca84
-MISC ChangeLog 726 RMD160 9b0a7ec82b865496ada4a55ed55c7fa56a8eb923 SHA1 2d26260348cba3eeda9d694b66cb0654b76264a4 SHA256 3711bf47bdbf5c30d2e6d1888711f9811213189bc7da11115ba2901966400ba1
+EBUILD bibus-1.4.0_rc2.ebuild 2023 RMD160 86e8ea936d096748e614570f389181c8d36397c5 SHA1 84e4261a26bca769515138ef8c852f33ca3a66c1 SHA256 8df115d7257f8e758e65314bb2ffad230d1486a18a834ce6703a786c47a22a7b
+MISC ChangeLog 993 RMD160 1b1ca1f9ea9733dbd9db8d4ec49d9ae0d868721f SHA1 ce0a4f3bb95678ad0005661fca10debc622e4816 SHA256 ce4d4a2c7fda0c320c2c50353a987e08921e9638f2c640c6666ba54085d6e665
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
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