Fix dependency (gnomeprint isn't needed because gtkhtml-3.14 support gtk-print and some things better suits )

Package-Manager: portage-2.1.5_rc2

3 files changed, 27 insertions, 23 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index 41913ddc3a0a..7d0464ad49b3 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/gnucash
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.157 2008/03/25 03:42:45 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.158 2008/04/14 21:15:05 eva Exp $
+
+  14 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> gnucash-2.2.4.ebuild:
+  Fix dependency (gnomeprint isn't needed because gtkhtml-3.14 support
+  gtk-print and some things better suits $DEPEND)
 
   25 Mar 2008; Torsten Veller <tove@gentoo.org> gnucash-2.2.3.ebuild,
   gnucash-2.2.4.ebuild:
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 6af2dad6e107..951c215fc985 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -5,13 +5,13 @@ AUX SplitP.h.patch 548 RMD160 500b246a7e4a25d3d336bc9d5b8beef12c707c6d SHA1 c96f
 DIST gnucash-2.2.3.tar.bz2 6949569 RMD160 2f1d56c6cd7a31689bd3e879b96abcb5feeb38ae SHA1 67cbc2c462fe96f753b6aa6394915e2f04884ef6 SHA256 c52c73477cf4b37c07dd25abafeaa63b74e0d2168f2b7469081ed31092a545f2
 DIST gnucash-2.2.4.tar.bz2 7080056 RMD160 67ef969e91c965edecdc9acc42be7c2e4548e0bd SHA1 354c9ebbaeed964353d0b6436e62f05ce3503e48 SHA256 23deb1fb8da8f9a60bde7084dc7a39c10887a055799d96c2290f2ac74eca9623
 EBUILD gnucash-2.2.3.ebuild 2708 RMD160 418c32a55e9c6e698bd95d190c251f24f6270e96 SHA1 87c5d339f6e155fab9465e6c4362a6e7c2939b91 SHA256 15d4806380b0a75132fffac8c84f4e8392593e304964409e95a87ef68483641e
-EBUILD gnucash-2.2.4.ebuild 2365 RMD160 c2bbf72872319acd4cf6cdb1d2a6a42ff1be8c05 SHA1 8be53bfe6537a2f609e20ee8967b837276f9d659 SHA256 4700763f1cc4dfa8eae3e319ece974cbae40668ddf129cf64101511066da77c3
-MISC ChangeLog 23904 RMD160 4ac974ae5922caf6cd24be78c3db2e0caafc424f SHA1 e6fb5ed23e7276597ac3f1124cb09c187776003c SHA256 dc965b6245ce828c1efe5fdd56e3f0ce9a8731c06fe13c814f36d713dee73f3f
+EBUILD gnucash-2.2.4.ebuild 2351 RMD160 85c26c8b0a3d675cd9a5918ca6da496b5ae24704 SHA1 e7530ed08764f957e1d7ce08af529d429f534c4f SHA256 a7473358c89c623b5284497bd42633c3d4351d14419e308f9b41d23ec96a947f
+MISC ChangeLog 24101 RMD160 50869dba2a3c259a7015bc95a92e0699186aca39 SHA1 e14200ca980b7239f5ef5e3a905caa8f59c067c4 SHA256 835b178da8a08e9197eff34d056b80ecddb05f10f00b0e357f47533326321409
 MISC metadata.xml 255 RMD160 eed2a430ff95a969fb224cec79676fc1651de745 SHA1 7f6701628873130644bd55c3898c8baf59279c74 SHA256 8405513ba61307253676b41faad6234e851a4d136c47fb92fb08eab1d5f0ea76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH6HRuV3J2n04EauwRAtm2AJ42Vs/v1/Io9cdYlc8zz/LAITg38QCgiNph
-j9ze6rUjaZzP/V8RrjgzeuE=
-=7CXT
+iEYEARECAAYFAkgDyWUACgkQ1fmVwcYIWAa5xQCgoOqisoUeTS3/noexyXjg3usc
+drMAoLR7t9jq6ePy367HsPdMir2Tml0k
+=Z95l
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnucash/gnucash-2.2.4.ebuild b/app-office/gnucash/gnucash-2.2.4.ebuild
index ae1ebc1734a3..fac31d82a195 100644
--- a/app-office/gnucash/gnucash-2.2.4.ebuild
+++ b/app-office/gnucash/gnucash-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.4.ebuild,v 1.2 2008/03/25 03:42:45 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.4.ebuild,v 1.3 2008/04/14 21:15:05 eva Exp $
 
 EAPI=1
 
@@ -18,6 +18,8 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 IUSE="+doc ofx hbci chipcard debug quotes"
 
+# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.in)
+
 RDEPEND=">=dev-libs/glib-2.6.3
 	>=dev-scheme/guile-1.8.3
 	>=dev-scheme/slib-3.1.4
@@ -25,13 +27,10 @@ RDEPEND=">=dev-libs/glib-2.6.3
 	>=dev-libs/popt-1.5
 	>=x11-libs/gtk+-2.10
 	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/libgnomeprint-2.10
-	>=gnome-base/libgnomeprintui-2.10
 	>=gnome-base/libglade-2.4
 	>=gnome-extra/gtkhtml-3.14
 	>=dev-libs/libxml2-2.5.10
 	>=gnome-base/gconf-2
-	>=app-text/scrollkeeper-0.3
 	>=x11-libs/goffice-0.6
 	ofx? ( >=dev-libs/libofx-0.7.0 )
 	hbci? ( net-libs/aqbanking
@@ -40,13 +39,14 @@ RDEPEND=">=dev-libs/glib-2.6.3
 	quotes? ( dev-perl/DateManip
 		>=dev-perl/Finance-Quote-1.11
 		dev-perl/HTML-TableExtract )
-	dev-util/intltool
 	media-libs/libart_lgpl
 	x11-libs/pango"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/libtool"
+	  dev-util/pkgconfig
+	  dev-util/intltool
+	  sys-devel/libtool
+	>=app-text/scrollkeeper-0.3"
 
 PDEPEND="doc? ( >=app-doc/gnucash-docs-${DOC_VER} )"
 ELTCONF="--patch-only"
@@ -71,18 +71,18 @@ pkg_setup() {
 	if ${will_die} ; then
 		die "Please rebuild the packages with the use flags above."
 	fi
+
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable ofx)
+		$(use_enable hbci)
+		--disable-doxygen
+		--enable-locale-specific-tax
+		--disable-error-on-warning"
 }
 
 src_compile() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ofx) \
-		$(use_enable hbci) \
-		--disable-doxygen \
-		--enable-locale-specific-tax \
-		--disable-error-on-warning \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
+	gnome2_src_compile -j1
 }
 
 src_install() {