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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 25 insertions, 113 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/Manifest b/app-office/kmymoney2/Manifest
index ad5e9ba37a51..7316bc3ec7b1 100644
--- a/app-office/kmymoney2/Manifest
+++ b/app-office/kmymoney2/Manifest
@@ -1,10 +1,9 @@
 AUX kmymoney2.desktop.diff 598 RMD160 d696a4e357424d956742e015f5bb287b50717392 SHA1 ef2dec205d3dee0a233a32d26b7ff8947f4a513f SHA256 71b9f54e4190e56ae016d989bb03dbef3eb7b5fc205eba4cd0a5737993ea78ae
 DIST kmymoney2-0.8.8.tar.bz2 6144296 RMD160 16805ae67a4219be209b5e7645c48d6b76edcd31 SHA1 60c44490519ee5fb85fb248933cbcede885c83de SHA256 88c93af9dd768aa4deb18d531f72a323710b680c7bab13b96dfa641024d564a7
 DIST kmymoney2-0.8.9.tar.bz2 6161688 RMD160 f7a332e667aea347fcf47163cc8607e795fec11a SHA1 c53d77cde7b1c4e8a4e613001dd5cdb48cb43525 SHA256 d23717d273e366ba84d7ef3138d71b1b7d758e6c626e83439df7fc1a567c3965
-DIST kmymoney2-0.9.2-1.tar.bz2 7294904 RMD160 a6a08e09d2f1d089a8d3a7d6083bb65712e4a581 SHA1 02010f9ab0ff803e921b70aea37efa8ed22ba583 SHA256 3400fea967ac5c66a45ae8bb031be31bb8afb36871ed1db40898977714f13867
+DIST kmymoney2-0.9.3.tar.bz2 7724798 RMD160 2e9f3867c2c7dd7308876e89b6a1b1fd1f6a2494 SHA1 88ebaf136569999f74d726efba4d0f00895f88a5 SHA256 d4497c4981de8f30dadb17e24cc774cdc98a9aeec251b0f77d56045fdbbda984
 EBUILD kmymoney2-0.8.8.ebuild 1276 RMD160 1b99e93219fab31bc1459fae44f0ba792c0c6bb3 SHA1 b1cc7a825f2db6a286a3aabfe754be3342312d21 SHA256 2607c917ca313c857cf26c0546c3af35b9055c7c347925db3ae4ba6b566abd27
 EBUILD kmymoney2-0.8.9.ebuild 1236 RMD160 6ad51873565ca8acfcd6bda24428135b599cc7c0 SHA1 798f8dbeb6f316099ecacf1e1c9faf91d0db14ef SHA256 316a93d7b928a32f241137200b305b2ffec33e842c5c207919fa5d3da54033fe
-EBUILD kmymoney2-0.9.2-r1.ebuild 1724 RMD160 79f78c5a14ec7ccb9f5ac9cc83d139cff05c0475 SHA1 73429cc60cd3ee8c3fddd2a71c95fe800131e0f7 SHA256 7d935c8fe7ebb55612b81a98e7e66d56e05a4f836246fdbd56b7c6ad36081c7b
-EBUILD kmymoney2-0.9.2.ebuild 1481 RMD160 dffe7ed109dea4f63dfe5a3a10fb72d29f4cb945 SHA1 86795810d62aba421b5b1309a94457ae109b8535 SHA256 339217b29dc2ff58eac0635e4b7d1cb0a1da114dcab0434015faaaffddd068db
-MISC ChangeLog 10286 RMD160 151d62c8120cc8dc4a2f9c20509f8bb0bb80cbaf SHA1 fbb0add9a4ccfcf849692f81074b469093542a3c SHA256 edbc4df3eb766d85fe32d344cea9da41aa5761567cc4bfbb73f279211a5a1924
+EBUILD kmymoney2-0.9.3.ebuild 1296 RMD160 e75ff469f92e3be33abc6a83127f1ff9219404e3 SHA1 c26149ecee9a54209bc7fe186924632cd400262a SHA256 a6dd7307b9ea81e2bb4a216e8db0318813063d160420d7d6a654291acf28c0a3
+MISC ChangeLog 10516 RMD160 31a55476b0004ecdb42f481c4a36eda9750d4d2c SHA1 9a5c43d788de6a46b9e6176446ea524a6c594f20 SHA256 45b2561cfabe60fd081bd09479ef606242dddc5bbbc82dbf18697a0f4402af5e
 MISC metadata.xml 323 RMD160 0f1bb56d62ac59678b8582c818c971002fe0b880 SHA1 6bcee84bade72323278353e67c1d8a5f37439952 SHA256 a446cc8189316c91fabdf76858442b3f31ef000a58b1a6d88ed992214e08b6b6
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
 }