app-text/bibus: Version Bump including detection of libreoffice, #394537 thanks Bjoern Olausson; multi py ABI installation

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

6 files changed, 224 insertions, 28 deletions

diff --git a/app-text/bibus/ChangeLog b/app-text/bibus/ChangeLog
index 69d87c6498ee..2c6997774d66 100644
--- a/app-text/bibus/ChangeLog
+++ b/app-text/bibus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/bibus
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.32 2011/07/07 07:30:09 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.33 2012/04/28 09:14:35 jlec Exp $
+
+*bibus-1.5.2 (28 Apr 2012)
+
+  28 Apr 2012; Justin Lecher <jlec@gentoo.org> bibus-1.5.1.ebuild,
+  +bibus-1.5.2.ebuild, +files/bibus-1.5.2-install.patch, metadata.xml:
+  Version Bump including detection of libreoffice, #394537 thanks Bjoern
+  Olausson; multi py ABI installation
 
   07 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
   -files/bibus-1.4.3.1-install.patch:
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
index 480e6116b083..c38c279170cf 100644
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@@ -3,24 +3,17 @@ Hash: SHA512
 
 AUX bibus-1.5.0-install.patch 13663 RMD160 6b1bf51fb104538bec4ea7a1a0d2e83655a7dd4a SHA1 4891b042320b9695a99ea6904e446483da3a52ad SHA256 70bf0ba4e2f29c40bfdaefcb8c8d0a10bc592b9e08a8dbf14c6a25b342b84edb
 AUX bibus-1.5.0-pysqlite.patch 907 RMD160 e96689ddf0192d6ee644dfcb2f2e8ce846e63dbf SHA1 40de7cb804247cd5d9e4def7f5b368fc816adecf SHA256 ad6a8b13087d6a70f5e4f9f220ee14274eab94d422c4a1c3ede5527fa02c45ba
+AUX bibus-1.5.2-install.patch 5630 RMD160 e7121a1db1a3ff55c7f1605912b0999e546dc60c SHA1 7a1e64d85ff13f0e63671c6b2e46e6b1eb3ffaf1 SHA256 33d29b68cc89d8023011aa15d544769c832ba280eca98478c68159d41778f72f
 DIST bibus-1.5.1.tar.gz 4989431 RMD160 3e2025153a16564301c941d743afb44e01570544 SHA1 b129be44f5f2e67fb5e20e769f9f018123b0cdc7 SHA256 1e6e6895124d2ab4147be83f2f87d0b1e78b2786f27345b3d1a3976d13d4c70d
-EBUILD bibus-1.5.1.ebuild 1914 RMD160 3c7c3dd9494cded6073d079c2d0176a23d7219ea SHA1 9bd20a270afa9aeab84e66ed37f2af28c7186d94 SHA256 2290dffd8ae16646f4d25a508ab7dac4d2d7c21a521bd1bdc47a1be502bb85bd
-MISC ChangeLog 5316 RMD160 4beaa3bc4bca5b45060dcd4d7b860dc0986630af SHA1 bb88520a20e39e562e6eda0df16da625627a9216 SHA256 6c8c51293978f0e16617773780785df13db45b4b92969f68304dfb4dd0f252e1
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+DIST bibus_1.5.2.orig.tar.gz 5411889 RMD160 41d17ec9312be9def5984b258a18bb8345512ff5 SHA1 2c09ae44363bd41466f72d2a03a7c6bc5000b922 SHA256 c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02
+EBUILD bibus-1.5.1.ebuild 1949 RMD160 7d4bffb002d5531b92369de80e20ad41a1b4212a SHA1 2ec0eb82e080cd61b50f68861dcaf6cbca5bfb38 SHA256 2a82de981f04da3e100aa2da5f6047ed86205c37b30ec3dbbe1d7588ad215a69
+EBUILD bibus-1.5.2.ebuild 2066 RMD160 f066dc8e3713d5a88fe3fa1bfb250e50410a84c9 SHA1 e949fc5e7cbfdb1d2d06ba6ac96dcf5e29616b3a SHA256 65b42f322919f0ddf2d2ecaf98a1b13cf5ef314eb4570a8eaadf38c563b81000
+MISC ChangeLog 5590 RMD160 8fe89f33f64090fe780ad4517b3170137ec07ce4 SHA1 0342b4b3ca2db57183b9b8f322b3a0b81c62267c SHA256 ff5a478f8ff713122f9ae7e44e42992580b78d95f03ea25ce054461a1ce0021f
+MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOFWCFAAoJEPqDWhW0r/LCNSkP/0aK4zRhkBXzJpcguend/+1i
-0KD/XPiJXuVZSmm6UaP2JwwUob29Qs7M4aDtz0ooFxQm54xkJEjQJWpyWMEr8Jeo
-JNs3ZOt1Wve3HSX+kbxSoED9Skk/KwWSkcNuhv345rNILX7rchxxoHrDlQw6FscU
-KVIdv8B+SAepYeNcpxtZ4GaJmtfgGuOpMcdfTw54U7uU6vfci/Fa/L4nGwMxrNyz
-pgtlGaSbVgfnzeOqX7NZh44ksVrsQveXuKVPMp34h5fftf5hdX6fJTgmFzrPMpcX
-B4zNpho1721MnDgsvsvBIPiXIO1my7OTOWOF8nCC1E28FO6CAoXZX/FlAmNyQu7r
-IJoztMORdH8s+0VRoxCS9UIyyZW1MUozqgTvQ1Ki0yyTdl8lbzgJSOxA2xchhx0K
-ASLWIO2LkU7DUsDaSKERbOxcs8pGMqz7abPgHWI5C/6clQ14qz8snQs1q1rWTni9
-HDl46+mgLzjZhk1aO9f2xp6vIhftSoddSyVRSgL0LQWqcdyes/6eT6WNABSrG5+1
-YbO9afhN3u5zR5QiKZTXEh6pqwZkyXKsIgrJjeXf4phKtt61NUIbNkkr0SyTAk7P
-8Rd8rfHDeMuNduh7gDXu7Nzj+uAkOkcK+YQ6jo8D9yxtWlRAma8mVXk2U/YL2fmN
-dG4bI5cyx7KyQFO5DQ8u
-=I+08
+iEYEAREKAAYFAk+btQAACgkQgAnW8HDreRY86gCbB27n5zeJHfc4z6BEFS8wfz5A
+IosAoMWy9Y2luq7W2TJo2WGHHiG/J3ol
+=A9SX
 -----END PGP SIGNATURE-----
diff --git a/app-text/bibus/bibus-1.5.1.ebuild b/app-text/bibus/bibus-1.5.1.ebuild
index 1c6457a06913..308a2c842547 100644
--- a/app-text/bibus/bibus-1.5.1.ebuild
+++ b/app-text/bibus/bibus-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.1.ebuild,v 1.8 2011/06/28 20:02:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.1.ebuild,v 1.9 2012/04/28 09:14:35 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -18,16 +18,18 @@ IUSE="mysql"
 
 # 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.
+# Cannot depend on virtual/ooo
 # bibus fails to start with app-office/openoffice-bin (bug #288232).
-RDEPEND="|| ( app-office/libreoffice app-office/openoffice )
+RDEPEND="
+	|| ( app-office/libreoffice app-office/openoffice )
 	=dev-python/wxpython-2.8*
 	dev-python/pysqlite
 	dev-db/sqliteodbc
+	dev-db/unixODBC
 	mysql? (
 		dev-python/mysql-python
 		dev-db/myodbc
-	)
-	dev-db/unixODBC"
+	)"
 DEPEND="${RDEPEND}"
 
 pkg_setup() {
@@ -36,9 +38,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.0-install.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-pysqlite.patch
-	sed -e "s:gentoo-python:python$(python_get_version):g" \
+	epatch \
+		"${FILESDIR}"/${PN}-1.5.0-install.patch \
+		"${FILESDIR}"/${PN}-1.5.0-pysqlite.patch
+	sed \
+		-e "s:gentoo-python:python$(python_get_version):g" \
 		-i Makefile Setup/Makefile Setup/bibus.cfg Setup/bibus.sh \
 		|| die "Failed to adjust python paths"
 
diff --git a/app-text/bibus/bibus-1.5.2.ebuild b/app-text/bibus/bibus-1.5.2.ebuild
new file mode 100644
index 000000000000..1a3ec3f14885
--- /dev/null
+++ b/app-text/bibus/bibus-1.5.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.2.ebuild,v 1.1 2012/04/28 09:14:35 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
+
+inherit eutils fdo-mime multilib python versionator
+
+DESCRIPTION="Bibliographic and reference management software, integrates with L/OO.o and MS Word"
+HOMEPAGE="http://bibus-biblio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql"
+
+# 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.
+# Cannot depend on virtual/ooo
+# bibus fails to start with app-office/openoffice-bin (bug #288232).
+RDEPEND="
+	|| ( app-office/libreoffice app-office/openoffice )
+	=dev-python/wxpython-2.8*
+	dev-python/pysqlite
+	dev-db/sqliteodbc
+	dev-db/unixODBC
+	mysql? (
+		dev-python/mysql-python
+		dev-db/myodbc
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_pkg_setup
+	if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
+		OFFICESUITE="/usr/$(get_libdir)/openoffice"
+	else
+		OFFICESUITE="/usr/$(get_libdir)/libreoffice"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-install.patch \
+		"${FILESDIR}"/${PN}-1.5.0-pysqlite.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	einfo "Installing for ${OFFICESUITE}"
+	installation() {
+		emake \
+			DESTDIR="${D}" \
+			prefix="${EPREFIX}/usr" \
+			oopath="${OFFICESUITE}/program" \
+			ooure="${OFFICESUITE}/ure-link/lib" \
+			oobasis="${OFFICESUITE}/program" \
+			sysconfdir="${EPREFIX}/etc" \
+			pythondir="$(python_get_sitedir)" \
+			python=$(PYTHON -a) \
+			install install-doc-en
+	}
+	python_execute_function installation
+}
+
+pkg_postinst() {
+	python_mod_optimize bibus
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	python_mod_cleanup bibus
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/bibus/files/bibus-1.5.2-install.patch b/app-text/bibus/files/bibus-1.5.2-install.patch
new file mode 100644
index 000000000000..5225fcd6c3d8
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.5.2-install.patch
@@ -0,0 +1,110 @@
+ Makefile |   62 ++++++++++++++++++++++++--------------------------------------
+ 1 files changed, 24 insertions(+), 38 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d41b12d..b07cdff 100755
+--- a/Makefile
++++ b/Makefile
+@@ -14,62 +14,60 @@ mandir = $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ 
+ define install-files
+-	install -d $(datadir)/bibus
+-	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
++	install -d $(DESTDIR)$(pythondir)/bibus
++	install -m644 *.py MySQL_Bibus.ini $(DESTDIR)/$(pythondir)/bibus/
+ 	#
+ 	for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data LyX Utilities; 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 $(DESTDIR)/$(pythondir)/bibus/'{}' ';' ; \
+ 	done
+-	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
++	install -m644 Setup/UnoConnectionListener.odg -D $(DESTDIR)/$(datadir)/bibus/Setup/UnoConnectionListener.odg
+ 	# locale files. We look for all the directory in locale/
+ 	for dir in $(wildcard locale/*); do \
+ 		if [ -d $$dir ] && [ $$dir != "locale/CVS" ]; then \
+-			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
++			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(DESTDIR)/$(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
+ 		fi; \
+ 	done
+ 	# bibus.config in /etc
+-	install -m644 bibus.config -D $(sysconfdir)/bibus.config
++	install -m644 bibus.config -D $(DESTDIR)/$(sysconfdir)/bibus.config
+ 	# man page
+-	install -m644 Setup/bibus.1 -D $(man1dir)/bibus.1
++	install -m644 Setup/bibus.1 -D $(DESTDIR)/$(man1dir)/bibus.1
+ 
+ 	# 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
++	install -m644 Pixmaps/bibus.png -D $(DESTDIR)$(datadir)/pixmaps/bibus.png
++	install -m644 Setup/bibus.desktop -D $(DESTDIR)/$(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
++	install -d $(DESTDIR)/$(bindir)
++	ln -sf $(pythondir)/bibus/bibusStart.py $(DESTDIR)/$(bindir)/bibus
++	chmod 755 $(DESTDIR)$(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 $(DESTDIR)/$(datadir)/doc/${PF}
++	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(DESTDIR)/$(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]' > $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'python = $(python)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'oopath = $(oopath)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'ooure = $(ooure)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'oobasis = $(oobasis)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'docdir = $(datadir)/doc/${PF}/html' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'localedir = $(datadir)/locale' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(DESTDIR)/$(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 $(DESTDIR)/$(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')"
++	echo "No compilation"
+ endef
+ 
+ install-files:
+@@ -83,15 +81,3 @@ install:
+ 	$(install-doc-en)
+ 	$(compile)
+ 
+-	# 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
+-	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
+-	# end uninstaller
diff --git a/app-text/bibus/metadata.xml b/app-text/bibus/metadata.xml
index b229aec85b8f..d369d068ffb8 100644
--- a/app-text/bibus/metadata.xml
+++ b/app-text/bibus/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci</herd>
 </pkgmetadata>