--- /var/portage/portage/app-office/gnucash/gnucash-2.0.5.ebuild	2007-07-11 00:05:28.000000000 +0200
+++ gnucash-2.2.0.ebuild	2007-07-16 15:16:02.000000000 +0200
@@ -4,25 +4,25 @@
 
 inherit eutils gnome2
 
-DOC_VER="2.0.1"
+DOC_VER="2.2.0"
 
 DESCRIPTION="A personal finance manager."
 HOMEPAGE="http://www.gnucash.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${PN}-docs-${DOC_VER}.tar.bz2"
+	mirror://sourceforge/${PN}/${PN}-docs-${DOC_VER}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 IUSE="ofx hbci chipcard doc debug quotes nls"
 
-RDEPEND=">=dev-libs/glib-2.4.0
-	dev-scheme/guile
-	~dev-scheme/slib-3.1.1-r1
+RDEPEND=">=dev-libs/glib-2.6.3
+	>=dev-scheme/guile-1.8
+	=dev-scheme/slib-3.1.1*
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/popt-1.5
-	>=x11-libs/gtk+-2.4
+	>=x11-libs/gtk+-2.6
 	>=gnome-base/libgnomeui-2.4
 	>=gnome-base/libgnomeprint-2.10
 	>=gnome-base/libgnomeprintui-2.10
@@ -32,10 +32,9 @@
 		=gnome-extra/gtkhtml-3.10*
 	)
 	>=dev-libs/libxml2-2.5.10
-	=dev-libs/g-wrap-1.9.6*
 	>=gnome-base/gconf-2
 	>=app-text/scrollkeeper-0.3
-	>=x11-libs/goffice-0.0.4
+	>=x11-libs/goffice-0.1.0
 	gnome-extra/yelp
 	ofx? ( >=dev-libs/libofx-0.7.0 )
 	hbci? ( net-libs/aqbanking
@@ -46,52 +45,60 @@
 		dev-perl/HTML-TableExtract )
 	app-text/docbook-xsl-stylesheets
 	=app-text/docbook-xml-dtd-4.1.2*
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+	media-libs/libart_lgpl
+	x11-libs/pango"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen
 		media-gfx/graphviz
 		virtual/tetex )
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	sys-devel/libtool
+	>=dev-lang/swig-1.3.28"
 
 pkg_setup() {
-	built_with_use gnome-extra/libgsf gnome || die "gnome-extra/libgsf must be built with gnome"
-	built_with_use x11-libs/goffice gnome || die "x11-libs/goffice must be built with gnome"
+	local will_die=false
+	if ! built_with_use gnome-extra/libgsf gnome ; then
+		einfo "gnome-extra/libgsf must be built with gnome use flag"
+		will_die=true
+	fi
+	if ! built_with_use x11-libs/goffice gnome ; then
+		einfo "x11-libs/goffice must be built with gnome use flag"
+		will_die=true
+	fi
 
 	if has_version =dev-scheme/guile-1.8*; then
 		local flags="deprecated regex"
 		if ! built_with_use dev-scheme/guile ${flags}; then
-			einfo "guile must be built with \"${flags}\" use flags"
-			die "guile must be built with \"${flags}\" use flags"
+			einfo "dev-scheme/guile must be built with \"${flags}\" use flags"
+			will_die=true
 		fi
 	fi
+	if ${will_die}; then
+		die "Please rebuilt the packages with the use flags above."
+	fi
 }
 
 src_compile() {
-
-	local myconf
-
-	if use doc ; then
-		myconf="${myconf} --enable-latex-docs"
-	fi
-
 	econf \
 		$(use_enable debug) \
 		$(use_enable ofx) \
 		$(use_enable doc doxygen) \
 		$(use_enable doc html-docs) \
+		$(use_enable doc latex-docs) \
 		$(use_enable doc dot) \
 		$(use_enable hbci) \
-		$(use_enable hbci mt940) \
 		--enable-locale-specific-tax \
-		${myconf} || die "econf failed"
+		|| die "econf failed"
 
-	MAKEOPTS="-j1"
 	emake || die "emake failed"
+#	emake -j1 || die "emake failed"
 
 	cd "${WORKDIR}/gnucash-docs-${DOC_VER}"
 	econf || die "doc econf failed"
 	emake || die "doc emake failed"
+#	emake -j1 || die "doc emake failed"
 }
 
 src_test() {
@@ -106,7 +113,6 @@
 src_install() {
 	gnome2_src_install || die "gnome2_src_install failed"
 	dodoc AUTHORS ChangeLog* DOCUMENTERS HACKING INSTALL NEWS TODO README* doc/README*
-	make_desktop_entry ${P} "GnuCash ${PV}" gnucash-icon.png "GNOME;Office;Finance"
 
 	cd "${WORKDIR}/${PN}-docs-${DOC_VER}"
 	make DESTDIR="${D}" \
@@ -116,7 +122,7 @@
 }
 
 pkg_postinst() {
-	elog "Please note that postgresql support has been removed."
-	elog "Please see: https://bugs.gentoo.org/show_bug.cgi?id=146769#c9"
-	elog "for an explanation."
+	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"
 }