Removed old version.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 5 insertions, 328 deletions

diff --git a/app-text/bibus/ChangeLog b/app-text/bibus/ChangeLog
index f3e9d1279184..c6e3cb581801 100644
--- a/app-text/bibus/ChangeLog
+++ b/app-text/bibus/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2009/09/09 02:50:29 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.14 2009/09/09 02:56:21 markusle Exp $
+
+  09 Sep 2009; Markus Dittrich <markusle@gentoo.org> -bibus-1.4.3.2.ebuild,
+  -files/bibus-1.4.3.2-install.patch:
+  Removed old version.
 
 *bibus-1.5_rc1 (09 Sep 2009)
 
diff --git a/app-text/bibus/bibus-1.4.3.2.ebuild b/app-text/bibus/bibus-1.4.3.2.ebuild
deleted file mode 100644
index a06c17eb909d..000000000000
--- a/app-text/bibus/bibus-1.4.3.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.4.3.2.ebuild,v 1.1 2009/02/15 17:53:50 patrick Exp $
-
-inherit python multilib eutils
-
-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}.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}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	cp -a bibus-1.4.3 "${P}"
-	rm -rf bibus-1.4.3
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-install.patch
-}
-
-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/python2.5/site-packages/bibus
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/python2.5/site-packages/bibus
-}
diff --git a/app-text/bibus/files/bibus-1.4.3.2-install.patch b/app-text/bibus/files/bibus-1.4.3.2-install.patch
deleted file mode 100644
index c2698c73e8c2..000000000000
--- a/app-text/bibus/files/bibus-1.4.3.2-install.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -urN bibus-1.4.3.2-orig/Makefile bibus-1.4.3.2-dw/Makefile
---- bibus-1.4.3.2-orig/Makefile	2009-01-09 00:00:26.000000000 +0100
-+++ bibus-1.4.3.2-dw/Makefile	2009-01-10 10:39:27.000000000 +0100
-@@ -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/python2.5/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/python2.5/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/lib/python2.5/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 -urN bibus-1.4.3.2-orig/Setup/bibus.cfg bibus-1.4.3.2-dw/Setup/bibus.cfg
---- bibus-1.4.3.2-orig/Setup/bibus.cfg	2009-01-09 00:00:26.000000000 +0100
-+++ bibus-1.4.3.2-dw/Setup/bibus.cfg	2009-01-10 10:14:03.000000000 +0100
-@@ -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 -urN bibus-1.4.3.2-orig/Setup/bibus.sh bibus-1.4.3.2-dw/Setup/bibus.sh
---- bibus-1.4.3.2-orig/Setup/bibus.sh	2009-01-09 00:00:26.000000000 +0100
-+++ bibus-1.4.3.2-dw/Setup/bibus.sh	2009-01-10 10:10:46.000000000 +0100
-@@ -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/python2.5/site-packages/bibus/bibus.py
-diff -urN bibus-1.4.3.2-orig/Setup/Makefile bibus-1.4.3.2-dw/Setup/Makefile
---- bibus-1.4.3.2-orig/Setup/Makefile	2009-01-09 00:00:26.000000000 +0100
-+++ bibus-1.4.3.2-dw/Setup/Makefile	2009-01-10 10:39:50.000000000 +0100
-@@ -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/python2.5/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/python2.5/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-+		echo "rm /usr/lib/python2.5/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