Version bump. Thanks Sandro Bonazzola for the diff, fixes bug #260294.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 22 insertions, 109 deletions

diff --git a/app-office/kmymoney2/ChangeLog b/app-office/kmymoney2/ChangeLog
index c7a20ad5fa65..8b632cc7d3bf 100644
--- a/app-office/kmymoney2/ChangeLog
+++ b/app-office/kmymoney2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kmymoney2
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.78 2009/01/17 14:20:00 tgurr Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.79 2009/05/28 23:55:02 tgurr Exp $
+
+*kmymoney2-0.9.3 (28 May 2009)
+
+  28 May 2009; Timo Gurr <tgurr@gentoo.org> -kmymoney2-0.9.2.ebuild,
+  -kmymoney2-0.9.2-r1.ebuild, +kmymoney2-0.9.3.ebuild:
+  Version bump. Thanks Sandro Bonazzola for the diff, fixes bug #260294.
 
 *kmymoney2-0.9.2-r1 (17 Jan 2009)
 
diff --git a/app-office/kmymoney2/kmymoney2-0.9.2-r1.ebuild b/app-office/kmymoney2/kmymoney2-0.9.2-r1.ebuild
deleted file mode 100644
index 5757c50bf5c9..000000000000
--- a/app-office/kmymoney2/kmymoney2-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.9.2-r1.ebuild,v 1.1 2009/01/17 14:20:00 tgurr Exp $
-
-EAPI="1"
-inherit kde
-
-DESCRIPTION="Personal Finances Manager for KDE."
-HOMEPAGE="http://kmymoney2.sourceforge.net"
-SRC_URI="mirror://sourceforge/kmymoney2/${P}-1.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt ofx qtdesigner test"
-
-COMMON_DEPEND="dev-libs/libxml2
-	ofx? ( >=dev-libs/libofx-0.8.2
-	|| ( dev-cpp/libxmlpp:2.6 >=dev-cpp/libxmlpp-1.0.1:0 )
-	>=net-misc/curl-7.9.7
-	app-text/opensp )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	test? ( >=dev-util/cppunit-1.8.0 )"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )"
-
-need-kde 3.5
-
-src_unpack() {
-	kde_src_unpack
-
-	cd "${S}"/kmymoney2/widgets
-	for x in Makefile.am Makefile.in; do
-		sed -e "s/kmymoneytitlelabel.png//" -i ${x}
-	done
-}
-
-src_compile() {
-	local myconf
-
-	# workaround kdeprefix mess
-	myconf="${myconf} \
-		--prefix=/usr/kde/3.5 \
-		--mandir=/usr/kde/3.5/share/man \
-		--infodir=/usr/kde/3.5/share/info \
-		--datadir=/usr/kde/3.5/share \
-		--sysconfdir=/usr/kde/3.5/etc"
-
-	myconf="${myconf} \
-		$(use_enable ofx ofxplugin)
-		$(use_enable ofx ofxbanking)
-		$(use_enable qtdesigner)
-		$(use_enable test cppunit)"
-
-	# bug 132665
-	replace-flags "-Os" "-O2"
-
-	kde_src_compile
-}
-
-src_test() {
-	# Parallel make check is broken
-	make -j1 check || die "Make check failed!"
-}
-
-src_install() {
-	kde_src_install
-	# bug 139082
-	rm "${D}"/usr/bin/kmymoney
-}
-
-pkg_postinst() {
-	echo
-	elog "If you want HBCI support in ${P}, please install app-office/kmm_banking separately."
-	echo
-}
diff --git a/app-office/kmymoney2/kmymoney2-0.9.2.ebuild b/app-office/kmymoney2/kmymoney2-0.9.3.ebuild
index 7ae0576e50a4..9af8c111880d 100644
--- a/app-office/kmymoney2/kmymoney2-0.9.2.ebuild
+++ b/app-office/kmymoney2/kmymoney2-0.9.3.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.9.2.ebuild,v 1.2 2008/12/15 20:48:39 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.9.3.ebuild,v 1.1 2009/05/28 23:55:02 tgurr Exp $
 
-EAPI="1"
+EAPI="2"
 inherit kde
 
 DESCRIPTION="Personal Finances Manager for KDE."
 HOMEPAGE="http://kmymoney2.sourceforge.net"
-SRC_URI="mirror://sourceforge/kmymoney2/${P}-1.tar.bz2"
+SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt ofx qtdesigner test"
+IUSE="crypt ofx qtdesigner sqlite3 test"
 
 COMMON_DEPEND="dev-libs/libxml2
 	ofx? ( >=dev-libs/libofx-0.8.2
 	|| ( dev-cpp/libxmlpp:2.6 >=dev-cpp/libxmlpp-1.0.1:0 )
 	>=net-misc/curl-7.9.7
-	app-text/opensp )"
+	app-text/opensp )
+	sqlite3? ( =dev-db/sqlite-3* )"
 
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/pkgconfig-0.9.0
@@ -29,25 +30,16 @@ RDEPEND="${COMMON_DEPEND}
 
 need-kde 3.5
 
-src_unpack() {
-	kde_src_unpack
-
-	cd "${S}"/kmymoney2/widgets
-	for x in Makefile.am Makefile.in; do
-		sed -e "s/kmymoneytitlelabel.png//" -i ${x}
-	done
-}
-
-src_compile() {
-	local myconf="$(use_enable ofx ofxplugin)
+src_configure() {
+	local myconf
+	myconf="${myconf} \
+		$(use_enable ofx ofxplugin)
 		$(use_enable ofx ofxbanking)
 		$(use_enable qtdesigner)
+		$(use_enable sqlite3)
 		$(use_enable test cppunit)"
 
-	# bug 132665
-	replace-flags "-Os" "-O2"
-
-	kde_src_compile
+	kde_src_configure
 }
 
 src_test() {
@@ -55,14 +47,8 @@ src_test() {
 	make -j1 check || die "Make check failed!"
 }
 
-src_install() {
-	kde_src_install
-	# bug 139082
-	rm "${D}"/usr/bin/kmymoney
-}
-
 pkg_postinst() {
 	echo
-	elog "If you want HBCI support in ${P}, please install app-office/kmm_banking separately."
+	elog "If you want HBCI support in ${P}, please install app-office/kmm_kbanking separately."
 	echo
 }