Cleanup: EAPI3, merge with live ebuild, use add_kdebase_dep

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

4 files changed, 22 insertions, 64 deletions

diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index a88a8ce7271a..0bcf69f73a23 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kmymoney
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.10 2010/08/18 21:29:48 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.11 2010/10/12 16:28:24 tampakrap Exp $
+
+  12 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  -kmymoney-3.98.1.ebuild, kmymoney-4.5.ebuild:
+  Cleanup: EAPI3, merge with live ebuild, use add_kdebase_dep
 
 *kmymoney-4.5 (18 Aug 2010)
 
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 4eb3fbc031dd..6667ccca7e8c 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,6 +1,3 @@
-DIST kmymoney-3.98.1.tar.bz2 14780410 RMD160 49c67a9f04ae306ec43c36635400c0083905284a SHA1 4ff898a6fe4a777636009b4eabf686cf0cdbfedc SHA256 877ca0e6ad7b6a6e205eb51275e984ba627d227201374bfc5d143a0a4e026864
-DIST kmymoney-4.5.tar.bz2 14590277 RMD160 7e785192ce2b77bc4d1716c79993c5df13931bcc SHA1 eb313afaf4f1fd406c1cbf8b80a1804bb505fc5a SHA256 dc2235202baf6de505129660e618c9cb4b14a36631e22ff3f57ab09089feab3c
-EBUILD kmymoney-3.98.1.ebuild 1461 RMD160 fc4572fba9ea143bf4324287707b9c627c2aac18 SHA1 2d5740e40e5590d275d60b77b4b8769d0c37abb8 SHA256 fa996dc4025315c342b29348c9fa8f60e6a4888998437176cd8063e71789b2a4
-EBUILD kmymoney-4.5.ebuild 1691 RMD160 536870b209ba32a4426055774b1c31c2c3ea6d6e SHA1 a119ca5f3fbfb95113158a545690447fe72506ab SHA256 5615194370bf4e348c8ca03c6dc0edcc4651b5a2ac76cc935f7910abcdafc8c8
-MISC ChangeLog 1565 RMD160 ab966ec56c8546a962a5a0a8246c99aacfa66c78 SHA1 9a19f9eadd2c9a03f920bd646f7ec79d3771350b SHA256 f9b44ed008cace4f1e7c3624dcbe09bbb9101bf0808c497f1fe83e6541ffd449
+EBUILD kmymoney-4.5.ebuild 1771 RMD160 891642835424a9eadf1a9de17a5c1df85b4000b1 SHA1 fb3e9ee8d3ac6198d3e08b3583a2e6b47592bdb2 SHA256 e045ac7cb2775c4068fc12c0c8d8f792b4addd4d8689086eef85e8e4e43f956f
+MISC ChangeLog 1733 RMD160 bd8c123995940f54fa24ec840ecbf04416c7e781 SHA1 7d7808ac19449f3eeef1ceed7aad391252ce192e SHA256 40ceef185676c79b561db7c856182d6dea7ef1c1707d3cda0b3ef74afbc61d63
 MISC metadata.xml 327 RMD160 337c462e38007a529ca6c979b341426898a9af04 SHA1 62bfe203a842760f95655a42acdd1da8f4436637 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f
diff --git a/app-office/kmymoney/kmymoney-3.98.1.ebuild b/app-office/kmymoney/kmymoney-3.98.1.ebuild
deleted file mode 100644
index 9638296b31f9..000000000000
--- a/app-office/kmymoney/kmymoney-3.98.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-3.98.1.ebuild,v 1.1 2010/06/05 22:10:18 ssuominen Exp $
-
-EAPI=2
-KDE_LINGUAS="bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu it lt
-ms nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-inherit virtualx kde4-base
-
-DESCRIPTION="A personal finance manager for KDE"
-HOMEPAGE="http://sourceforge.net/projects/kmymoney2/"
-SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug calendar +handbook hbci ofx quotes test"
-
-COMMON_DEPEND="app-crypt/gpgme
-	>=dev-libs/boost-1.33.1
-	dev-libs/libxml2
-	dev-libs/libgpg-error
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	calendar? ( dev-libs/libical )
-	hbci? ( >=net-libs/aqbanking-4.2.4[qt4]
-		>=sys-libs/gwenhywfar-3.11.3 )
-	ofx? ( >=dev-libs/libofx-0.9.1 )"
-RDEPEND="${COMMON_DEPEND}
-	quotes? ( >=dev-perl/Finance-Quote-1.17 )"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-util/cppunit-1.12.1 )"
-
-DOCS="AUTHORS BUGS ChangeLog* README* TODO"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable hbci KBANKING)
-		$(cmake-utils_use_enable calendar LIBICAL)
-		$(cmake-utils_use_enable ofx LIBOFX)
-		$(cmake-utils_use test KDE4_BUILD_TESTS)
-		)
-
-	kde4-base_src_configure
-}
-
-src_test() {
-	export maketype="kde4-base_src_test"
-	virtualmake
-}
diff --git a/app-office/kmymoney/kmymoney-4.5.ebuild b/app-office/kmymoney/kmymoney-4.5.ebuild
index bc87c8d1e80c..e17c0ef2b175 100644
--- a/app-office/kmymoney/kmymoney-4.5.ebuild
+++ b/app-office/kmymoney/kmymoney-4.5.ebuild
@@ -1,29 +1,36 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.5.ebuild,v 1.1 2010/08/18 21:29:48 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.5.ebuild,v 1.2 2010/10/12 16:28:24 tampakrap Exp $
 
-EAPI=2
+EAPI=3
+
+KMNAME="extragear/office"
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu it lt
+	ms nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
+	KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
+	KDE_HANDBOOK="optional"
+else
+	SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
+fi
 
-KDE_LINGUAS="bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu it lt
-ms nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
 inherit virtualx kde4-base
 
 DESCRIPTION="A personal finance manager for KDE"
 HOMEPAGE="http://kmymoney2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="debug calendar doc +handbook hbci ofx quotes test"
+IUSE="debug calendar doc hbci ofx quotes test"
 
 COMMON_DEPEND="
 	app-crypt/gpgme
 	>=dev-libs/boost-1.33.1
 	dev-libs/libgpg-error
 	dev-libs/libxml2
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}
+	$(add_kdebase_dep kdepimlibs)
 	calendar? ( dev-libs/libical )
 	hbci? (
 		>=net-libs/aqbanking-4.2.4[qt4]