[gentoo-commits] gentoo-x86 commit in app-text/bibus: metadata.xml ChangeLog bibus-1.5.1.ebuild bibus-1.5.2.ebuild

[Justin Lecher (jlec)]

jlec        12/04/28 09:14:35

  Modified:             metadata.xml ChangeLog bibus-1.5.1.ebuild
  Added:                bibus-1.5.2.ebuild
  Log:
  app-text/bibus: Version Bump including detection of libreoffice, #394537 thanks Bjoern Olausson; multi py ABI installation
  
  (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  app-text/bibus/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/bibus/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	17 Oct 2006 20:52:06 -0000	1.2
+++ metadata.xml	28 Apr 2012 09:14:35 -0000	1.3
@@ -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>



1.33                 app-text/bibus/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	7 Jul 2011 07:30:09 -0000	1.32
+++ ChangeLog	28 Apr 2012 09:14:35 -0000	1.33
@@ -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@g.o> 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@g.o>
   -files/bibus-1.4.3.1-install.patch:



1.9                  app-text/bibus/bibus-1.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/bibus-1.5.1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/bibus-1.5.1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/bibus-1.5.1.ebuild?r1=1.8&r2=1.9

Index: bibus-1.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bibus-1.5.1.ebuild	28 Jun 2011 20:02:03 -0000	1.8
+++ bibus-1.5.1.ebuild	28 Apr 2012 09:14:35 -0000	1.9
@@ -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 @@
 
 # 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 @@
 }
 
 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"
 



1.1                  app-text/bibus/bibus-1.5.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/bibus-1.5.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibus/bibus-1.5.2.ebuild?rev=1.1&content-type=text/plain

Index: bibus-1.5.2.ebuild
===================================================================
# 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
}