Version bump. Clean up.

(Portage version: 2.1.4_rc14)

6 files changed, 16 insertions, 130 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index e3043adea2e6..35aa32bedde6 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,12 @@
 # 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.147 2008/01/08 06:56:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.148 2008/01/08 21:51:49 tove Exp $
+
+*gnucash-2.2.3 (08 Jan 2008)
+
+  08 Jan 2008; Torsten Veller <tove@gentoo.org> -gnucash-2.2.1-r1.ebuild,
+  -gnucash-2.2.2.ebuild, +gnucash-2.2.3.ebuild:
+  Version bump. Clean up.
 
   08 Jan 2008; Torsten Veller <tove@gentoo.org> gnucash-2.2.2-r1.ebuild:
   Using goffice-0.6 requires latest gtkhtml (#204798)
diff --git a/app-office/gnucash/files/digest-gnucash-2.2.1-r1 b/app-office/gnucash/files/digest-gnucash-2.2.1-r1
deleted file mode 100644
index abcd385fbaa1..000000000000
--- a/app-office/gnucash/files/digest-gnucash-2.2.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c971dba50b6e04d8fdd66cb681e1cead gnucash-2.2.1.tar.bz2 6978600
-RMD160 4f06292a1b6e98a1cb5a00a5f396d387705a3a1d gnucash-2.2.1.tar.bz2 6978600
-SHA256 c39f0d22529dedda722e21d3c44798ddf507c0a1f4e130ee6b7e4ddceb395728 gnucash-2.2.1.tar.bz2 6978600
diff --git a/app-office/gnucash/files/digest-gnucash-2.2.2 b/app-office/gnucash/files/digest-gnucash-2.2.2
deleted file mode 100644
index 257cd8be4e98..000000000000
--- a/app-office/gnucash/files/digest-gnucash-2.2.2
+++ /dev/null
@@ -1,6 +0,0 @@
-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/digest-gnucash-2.2.3 b/app-office/gnucash/files/digest-gnucash-2.2.3
new file mode 100644
index 000000000000..f11a1198c544
--- /dev/null
+++ b/app-office/gnucash/files/digest-gnucash-2.2.3
@@ -0,0 +1,3 @@
+MD5 a90e2d01e3c487d36e9a5f5fd82d2149 gnucash-2.2.3.tar.bz2 6949569
+RMD160 2f1d56c6cd7a31689bd3e879b96abcb5feeb38ae gnucash-2.2.3.tar.bz2 6949569
+SHA256 c52c73477cf4b37c07dd25abafeaa63b74e0d2168f2b7469081ed31092a545f2 gnucash-2.2.3.tar.bz2 6949569
diff --git a/app-office/gnucash/gnucash-2.2.2.ebuild b/app-office/gnucash/gnucash-2.2.2.ebuild
deleted file mode 100644
index ff1018678321..000000000000
--- a/app-office/gnucash/gnucash-2.2.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.2 2007/12/20 15:20:13 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
-	x11-libs/goffice
-	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 ""
-}
diff --git a/app-office/gnucash/gnucash-2.2.1-r1.ebuild b/app-office/gnucash/gnucash-2.2.3.ebuild
index 83b78eb29612..6786fbba8526 100644
--- a/app-office/gnucash/gnucash-2.2.1-r1.ebuild
+++ b/app-office/gnucash/gnucash-2.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.1-r1.ebuild,v 1.2 2007/10/25 06:50:25 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.3.ebuild,v 1.1 2008/01/08 21:51:49 tove Exp $
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DOC_VER="2.2.0"
 
@@ -21,19 +21,16 @@ RDEPEND=">=dev-libs/glib-2.6.3
 	     (  <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
+	>=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.12*
-		=gnome-extra/gtkhtml-3.10*
-	)
+	>=gnome-extra/gtkhtml-3.14
 	>=dev-libs/libxml2-2.5.10
 	>=gnome-base/gconf-2
 	>=app-text/scrollkeeper-0.3
-	<x11-libs/goffice-0.5
+	>=x11-libs/goffice-0.6
 	ofx? ( >=dev-libs/libofx-0.7.0 )
 	hbci? ( net-libs/aqbanking
 		chipcard? ( sys-libs/libchipcard )