Version bump, prevent linking against installed libs (#371264), drop old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 35 insertions, 29 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index bd8f841f0622..7d7e8cfecda4 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnucash
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.270 2013/12/08 17:45:42 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.271 2014/02/09 11:18:40 pacho Exp $
+
+*gnucash-2.6.1 (09 Feb 2014)
+
+  09 Feb 2014; Pacho Ramos <pacho@gentoo.org> +gnucash-2.6.1.ebuild,
+  -gnucash-2.4.12.ebuild:
+  Version bump, prevent linking against installed libs (#371264), drop old.
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnucash-2.4.13.ebuild:
   x86 stable, bug #478252
diff --git a/app-office/gnucash/gnucash-2.4.12.ebuild b/app-office/gnucash/gnucash-2.6.1.ebuild
index 3eeebc5f1915..5f9115bb2328 100644
--- a/app-office/gnucash/gnucash-2.4.12.ebuild
+++ b/app-office/gnucash/gnucash-2.6.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.12.ebuild,v 1.1 2013/04/07 08:50:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.6.1.ebuild,v 1.1 2014/02/09 11:18:40 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 python-single-r1 eutils
+inherit autotools gnome2 python-single-r1 eutils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
@@ -15,23 +15,23 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="chipcard debug +doc hbci mysql ofx postgres python quotes sqlite webkit"
+IUSE="chipcard debug +doc hbci mysql ofx postgres python quotes sqlite"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
-RDEPEND=">=dev-libs/glib-2.32.0:2
+# libdbi version requirement for sqlite taken from bug #455134
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
 	>=dev-libs/popt-1.5
 	>=dev-libs/libxml2-2.5.10:2
+	dev-libs/libxslt
 	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
 	dev-scheme/guile-www
 	>=dev-scheme/slib-3.1.4
-	>=gnome-base/gconf-2:2
-	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/libglade-2.4:2.0
 	gnome-base/libgnome-keyring
-	media-libs/libart_lgpl
+	>=net-libs/webkit-gtk-1.2:2
 	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.14:2
-	x11-libs/goffice:0.8[gnome]
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/goffice-0.7.0:0.8[gnome]
 	x11-libs/pango
 	ofx? ( >=dev-libs/libofx-0.9.1 )
 	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
@@ -42,10 +42,8 @@ RDEPEND=">=dev-libs/glib-2.32.0:2
 	quotes? ( dev-perl/DateManip
 		>=dev-perl/Finance-Quote-1.11
 		dev-perl/HTML-TableExtract )
-	webkit? ( net-libs/webkit-gtk:2 )
-	!webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 )
-	sqlite? ( >=dev-db/libdbi-0.8.4
-		>=dev-db/libdbi-drivers-0.8.3-r2[sqlite] )
+	sqlite? ( >=dev-db/libdbi-0.9.0
+		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
 	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
 	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
 "
@@ -63,32 +61,34 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	# Prevent linking against installed libs, bug #371264
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
-	DOCS="doc/README.OFX doc/README.HBCI"
+	local myconf
 
-	if use webkit ; then
-		G2CONF+=" --with-html-engine=webkit"
-	else
-		G2CONF+=" --with-html-engine=gtkhtml"
-	fi
+	DOCS="doc/README.OFX doc/README.HBCI"
 
 	if use sqlite || use mysql || use postgres ; then
-		G2CONF+=" --enable-dbi"
+		myconf+=" --enable-dbi"
 	else
-		G2CONF+=" --disable-dbi"
+		myconf+=" --disable-dbi"
 	fi
 
-	G2CONF+="
+	myconf+="
 		$(use_enable debug)
 		$(use_enable ofx)
 		$(use_enable hbci aqbanking)
-		$(use_enable python python-bindings)
+		$(use_enable python)
 		--disable-doxygen
 		--enable-locale-specific-tax
 		--disable-error-on-warning"
 
 	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	G2CONF+=" --disable-gtkmm"
+	myconf+=" --disable-gtkmm"
 
 	# guile wrongly exports LDFLAGS as LIBS which breaks modules
 	# Filter until a better ebuild is available, bug #202205
@@ -100,7 +100,7 @@ src_configure() {
 		fi
 	done
 
-	econf GUILE_LIBS="${GUILE_LIBS}" ${G2CONF}
+	gnome2_src_configure GUILE_LIBS="${GUILE_LIBS}" ${myconf}
 }
 
 src_test() {