Version bump. Added fix for #199730.

Package-Manager: portage-2.1.4_rc10

5 files changed, 183 insertions, 8 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index b2667acef0ab..bbe04a48b328 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gnucash
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.143 2007/10/25 06:50:25 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.144 2007/12/18 12:23:38 tove Exp $
+
+*gnucash-2.2.2 (18 Dec 2007)
+
+  18 Dec 2007; Torsten Veller <tove@gentoo.org>
+  +files/gnucash-2.2.2-icons.patch, +gnucash-2.2.2.ebuild:
+  Version bump. Thanks to Alex Rostovtsev for the icons patch (#199730).
+  Change goffice dependency because gnucash works with >=goffice-0.5.1 (#191555).
 
   25 Oct 2007; Torsten Veller <tove@gentoo.org> gnucash-2.2.1-r1.ebuild:
   Change slib dependency
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 594352b5f0c1..b188fa2dac21 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,9 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnucash-2.2.2-icons.patch 1289 RMD160 02926143b16dad015ab07915871ce9b6081b2ed1 SHA1 183c8a062248197dfaa978bf8c3fe7f7d0b1e82c SHA256 845522f0a056695e803b7e1fb74ead63846480bb4b5bdd1223d59c38e3c02a48
+MD5 f0d1d2a8991df4f7c3b05f4d71b1f19e files/gnucash-2.2.2-icons.patch 1289
+RMD160 02926143b16dad015ab07915871ce9b6081b2ed1 files/gnucash-2.2.2-icons.patch 1289
+SHA256 845522f0a056695e803b7e1fb74ead63846480bb4b5bdd1223d59c38e3c02a48 files/gnucash-2.2.2-icons.patch 1289
 DIST gnucash-2.0.5.tar.bz2 7372056 RMD160 b3d853f376143121f29b14ff81d09e044183584f SHA1 802ac3c8fd6f2448bad96a78b20c8fec9d6b89ad SHA256 b7e2efcdc79ba864a1730af9e0197cdbf586c9008196eaffffce8f020f1fb479
 DIST gnucash-2.2.1.tar.bz2 6978600 RMD160 4f06292a1b6e98a1cb5a00a5f396d387705a3a1d SHA1 d181d0bf7af2664cada62f63ab29b6ade92ae1b1 SHA256 c39f0d22529dedda722e21d3c44798ddf507c0a1f4e130ee6b7e4ddceb395728
+DIST gnucash-2.2.2.tar.bz2 7076072 RMD160 e64602283ccd51f0298a7ee637a49742932e5e3d SHA1 157b4ac6f211ab82041fa6a0b9a5bf93ffda2aac SHA256 66a4c54d2f1784826d3a44e27e237d36aeff6009e58eef6a31f340b68201086e
 DIST gnucash-docs-2.0.1.tar.bz2 9262237 RMD160 f2b00a5ce745921ea4e8a2360baff13aaf3fc083 SHA1 ce04f51e8eeb8324b7abca6bf84ddb18562cf6b4 SHA256 f39e6248fef20c761c74b534024869952e26b98879930b3a675178fd3d5260ff
+DIST gnucash-icon.svg.bz2 5046 RMD160 e9389e5d2468416c5d2168ce30fb4ff57dd27872 SHA1 f14697723a5a2b88acf4420b2b107a8578c398c7 SHA256 a679c12477536b5f43c01d0448ddfe03de195d9954bfebc087bba1f549214d71
 EBUILD gnucash-2.0.5.ebuild 3391 RMD160 b96f5a3d2be402307a0fa23d48be48de5e5c6777 SHA1 8b49b6ba46fe26d6adc8906827126e03e97dc548 SHA256 78f3c6eb86f879fc1d30c399267b5ec1604be821c1112453282ab90cc4c8d9fa
 MD5 ccbd99dccfacdfd8dee1ac293ff05558 gnucash-2.0.5.ebuild 3391
 RMD160 b96f5a3d2be402307a0fa23d48be48de5e5c6777 gnucash-2.0.5.ebuild 3391
@@ -12,10 +18,14 @@ EBUILD gnucash-2.2.1-r1.ebuild 2687 RMD160 96861a788661df4b61b47c6746758bf81143c
 MD5 ce36553bf8d85d280fce8c434c9d867d gnucash-2.2.1-r1.ebuild 2687
 RMD160 96861a788661df4b61b47c6746758bf81143cd11 gnucash-2.2.1-r1.ebuild 2687
 SHA256 3900b8781918f904ff317e3430525bc9b12befad39f6621e5283e6c710d70cb8 gnucash-2.2.1-r1.ebuild 2687
-MISC ChangeLog 21731 RMD160 70ef59aa58e075624054c621bbffa753b4e13848 SHA1 091860213b2b9fdf965901de31b55dd48fc5c4fc SHA256 002ca4606b4a411ce9122ed1b9d7fc754923e2c4b9cfa705a51b710d9c2d28e7
-MD5 7508c88e4968f4bb0091d5df95b0f7de ChangeLog 21731
-RMD160 70ef59aa58e075624054c621bbffa753b4e13848 ChangeLog 21731
-SHA256 002ca4606b4a411ce9122ed1b9d7fc754923e2c4b9cfa705a51b710d9c2d28e7 ChangeLog 21731
+EBUILD gnucash-2.2.2.ebuild 2877 RMD160 b0b531871d73a5c4b5009037b265846e0d50078f SHA1 0478e05e62630bdd441762b240f227e9ed63e08b SHA256 d812e68aa074966443d97b7e618a5a664cd0eb40460d5300dcdde28bd7ccda40
+MD5 86fb862c7924756d66f50eb6726d29cf gnucash-2.2.2.ebuild 2877
+RMD160 b0b531871d73a5c4b5009037b265846e0d50078f gnucash-2.2.2.ebuild 2877
+SHA256 d812e68aa074966443d97b7e618a5a664cd0eb40460d5300dcdde28bd7ccda40 gnucash-2.2.2.ebuild 2877
+MISC ChangeLog 22024 RMD160 e581ca964d4a8cfe8409dc680c01948045d0bbfd SHA1 fae6cfbc006a0cdbec80f5fd55225feea3c4ea59 SHA256 e681c83f5adc3ba996e36cdfcad7e0d5a680765446e97136992a1ec35eaa23dc
+MD5 9fba1e59c59b3e75e053d695da0809f6 ChangeLog 22024
+RMD160 e581ca964d4a8cfe8409dc680c01948045d0bbfd ChangeLog 22024
+SHA256 e681c83f5adc3ba996e36cdfcad7e0d5a680765446e97136992a1ec35eaa23dc ChangeLog 22024
 MISC metadata.xml 255 RMD160 eed2a430ff95a969fb224cec79676fc1651de745 SHA1 7f6701628873130644bd55c3898c8baf59279c74 SHA256 8405513ba61307253676b41faad6234e851a4d136c47fb92fb08eab1d5f0ea76
 MD5 5a997c1c189832cfc13e114ed77828e2 metadata.xml 255
 RMD160 eed2a430ff95a969fb224cec79676fc1651de745 metadata.xml 255
@@ -26,10 +36,13 @@ SHA256 ebe268d3c8346d57cc6ec50e148ba02d6ebd34f98fe9208ecd972cc79c9c01f6 files/di
 MD5 3010093f07999e31e18f848ede5fded2 files/digest-gnucash-2.2.1-r1 247
 RMD160 2f29b9915b60d47ba8617fb97c68789532c2dcb0 files/digest-gnucash-2.2.1-r1 247
 SHA256 230cc51a3eb1742ed883f389ebaa325e51328f38994090d1d834e10b221cbca2 files/digest-gnucash-2.2.1-r1 247
+MD5 3c669ec26ffd8b12a204efa9ffb735ab files/digest-gnucash-2.2.2 482
+RMD160 ff7cf4ae5665c178ae9905a7b680da2d3b7968c3 files/digest-gnucash-2.2.2 482
+SHA256 192e3a93a4b76816fc57ef38076a19098e0a39f2496cc2774e86ba16deab5f26 files/digest-gnucash-2.2.2 482
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHIDzJV3J2n04EauwRAofaAJwNoPIRuUNnG1el2ID0nlNoGzJusQCgmBij
-rJl+frIX7GbbBz07gMByv9U=
-=1m0z
+iD8DBQFHZ7vkV3J2n04EauwRAkHMAKCB4P8a6UlDrJ8acRlB0DAzvhf1dACgvWac
+HbkY9NwMa/SXSGWPMLltgEU=
+=YYqE
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnucash/files/digest-gnucash-2.2.2 b/app-office/gnucash/files/digest-gnucash-2.2.2
new file mode 100644
index 000000000000..257cd8be4e98
--- /dev/null
+++ b/app-office/gnucash/files/digest-gnucash-2.2.2
@@ -0,0 +1,6 @@
+MD5 dd8ee31c057ecbccd298841c57426582 gnucash-2.2.2.tar.bz2 7076072
+RMD160 e64602283ccd51f0298a7ee637a49742932e5e3d gnucash-2.2.2.tar.bz2 7076072
+SHA256 66a4c54d2f1784826d3a44e27e237d36aeff6009e58eef6a31f340b68201086e gnucash-2.2.2.tar.bz2 7076072
+MD5 0d2f7eb0b4b59312e5b13f269f2735d4 gnucash-icon.svg.bz2 5046
+RMD160 e9389e5d2468416c5d2168ce30fb4ff57dd27872 gnucash-icon.svg.bz2 5046
+SHA256 a679c12477536b5f43c01d0448ddfe03de195d9954bfebc087bba1f549214d71 gnucash-icon.svg.bz2 5046
diff --git a/app-office/gnucash/files/gnucash-2.2.2-icons.patch b/app-office/gnucash/files/gnucash-2.2.2-icons.patch
new file mode 100644
index 000000000000..47a28e00f3b4
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.2.2-icons.patch
@@ -0,0 +1,39 @@
+--- src/pixmaps/Makefile.am	2007-12-18 11:25:57.000000000 +0100
++++ src/pixmaps/Makefile.am	2007-12-18 11:33:13.000000000 +0100
+@@ -36,10 +36,31 @@
+   stock_split_title.png \
+   stock_split_watermark.png
+ 
+-gncicondir = ${datadir}/pixmaps
+-gncicon_DATA = gnucash-icon-16x16.png \
+-  gnucash-icon-32x32.png \
+-  gnucash-icon-48x48.png
++gncnormalicondir = ${datadir}/icons/hicolor/48x48/apps
++gncnormalicon_DATA = 48x48/gnucash-icon.png
++48x48/gnucash-icon.png: gnucash-icon-48x48.png
++	-mkdir 48x48
++	cp gnucash-icon-48x48.png 48x48/gnucash-icon.png
++
++gncmediumicondir = ${datadir}/icons/hicolor/32x32/apps
++gncmediumicon_DATA = 32x32/gnucash-icon.png
++32x32/gnucash-icon.png: gnucash-icon-32x32.png
++	-mkdir 32x32
++	cp gnucash-icon-32x32.png 32x32/gnucash-icon.png
++
++gncsmallicondir = ${datadir}/icons/hicolor/16x16/apps
++gncsmallicon_DATA = 16x16/gnucash-icon.png
++16x16/gnucash-icon.png: gnucash-icon-16x16.png
++	-mkdir 16x16
++	cp gnucash-icon-16x16.png 16x16/gnucash-icon.png
++
++gncsvgicondir = ${datadir}/icons/hicolor/scalable/apps
++gncsvgicon_DATA = gnucash-icon.svg
+ 
+ EXTRA_DIST = \
+-  ${gncpixmap_DATA} ${gncicon_DATA}
++  ${gncpixmap_DATA} \
++  ${gncnormalicon_DATA} ${gncmediumicon_DATA} ${gncsmallicon_DATA} \
++  ${gncsvgicon_DATA}
++
++clean-local:
++	-rm -rf 48x48 32x32 16x16
diff --git a/app-office/gnucash/gnucash-2.2.2.ebuild b/app-office/gnucash/gnucash-2.2.2.ebuild
new file mode 100644
index 000000000000..8e76ebda96fc
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.2.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.2.ebuild,v 1.1 2007/12/18 12:23:38 tove Exp $
+
+inherit autotools eutils gnome2
+
+DOC_VER="2.2.0"
+
+DESCRIPTION="A personal finance manager."
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-icon.svg.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="ofx hbci chipcard debug quotes"
+
+RDEPEND=">=dev-libs/glib-2.6.3
+	|| ( ( >=dev-scheme/guile-1.8.3 >=dev-scheme/slib-3.1.4  )
+	     (  <dev-scheme/guile-1.8.3  =dev-scheme/slib-3.1.1* ) )
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/popt-1.5
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libgnomeui-2.4
+	>=gnome-base/libgnomeprint-2.10
+	>=gnome-base/libgnomeprintui-2.10
+	>=gnome-base/libglade-2.4
+	|| (
+		=gnome-extra/gtkhtml-3.12*
+		=gnome-extra/gtkhtml-3.10*
+	)
+	>=dev-libs/libxml2-2.5.10
+	>=gnome-base/gconf-2
+	>=app-text/scrollkeeper-0.3
+	ofx? ( >=dev-libs/libofx-0.7.0 )
+	hbci? ( net-libs/aqbanking
+		chipcard? ( sys-libs/libchipcard )
+	)
+	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"
+
+PDEPEND=">=app-doc/gnucash-docs-${DOC_VER}"
+ELTCONF="--patch-only"
+DOC="AUTHORS ChangeLog* DOCUMENTERS HACKING NEWS TODO README* doc/README*"
+
+pkg_setup() {
+	local will_die=false
+	local flags="deprecated regex"
+	if ! built_with_use --missing true dev-scheme/guile ${flags} ; then
+		eerror "dev-scheme/guile must be built with \"${flags}\" use flags"
+		will_die=true
+	fi
+	if ! built_with_use gnome-extra/libgsf gnome ; then
+		eerror "gnome-extra/libgsf must be built with gnome use flag"
+		will_die=true
+	fi
+	if ! built_with_use x11-libs/goffice gnome ; then
+		eerror "x11-libs/goffice must be built with gnome use flag"
+		will_die=true
+	fi
+
+	if ${will_die} ; then
+		die "Please rebuild the packages with the use flags above."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cp "${WORKDIR}"/gnucash-icon.svg "${S}"/src/pixmaps || die
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-icons.patch
+	AT_M4DIR=macros eautoreconf
+}
+
+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"
+}
+
+src_test() {
+	GUILE_WARN_DEPRECATED=no \
+	emake -j1 check \
+	|| die "Make check failed. See above for details."
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	ewarn ""
+	ewarn "If you are using Scheduled Transactions, the data file saved by"
+	ewarn "GnuCash 2.2 is NOT backward-compatible with GnuCash 2.0."
+	ewarn "Please make a safe backup of your 2.0 data before upgrading to 2.2"
+	ewarn ""
+}