Version bump. Added fix for #199730.

(Portage version: 2.1.4_rc10)

4 files changed, 163 insertions, 1 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/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 ""
+}