Version bump. Remove old.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 77 insertions, 54 deletions

diff --git a/app-office/skrooge/ChangeLog b/app-office/skrooge/ChangeLog
index db5e064bf2cd..0681df58ff3a 100644
--- a/app-office/skrooge/ChangeLog
+++ b/app-office/skrooge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/skrooge
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/ChangeLog,v 1.37 2013/03/02 19:37:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/ChangeLog,v 1.38 2013/03/10 09:00:29 kensington Exp $
+
+*skrooge-1.6.0 (10 Mar 2013)
+
+  10 Mar 2013; Michael Palimaka <kensington@gentoo.org> +skrooge-1.6.0.ebuild,
+  -skrooge-1.3.3.ebuild:
+  Version bump. Remove old.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> skrooge-1.3.3.ebuild,
   skrooge-1.5.1.ebuild:
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index f62af6b9525e..4b23c510f4ff 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST skrooge-1.3.3.tar.bz2 9737954 SHA256 251ffca5ad8e3696901fb29df2714fcb30541fe9e3107b9de2c2cb9f6b47cee9 SHA512 1066de3fc4a09f1d15fda58106b41519a0470cd5572660ca8d037dc9658030be4959c5dad94173e6decf56a9a04bbf2f874a92ade54fd544cfaf2339aaa38840 WHIRLPOOL 4b6eb773af793fa35d610b207fe209ff5f7e0f0679be2a1d79f94662d0ff9ecf7bb26332919f2c34ca8165122fa7a5e5a576fbc7b423d13c3d4f2a46dec16f27
 DIST skrooge-1.5.1.tar.bz2 9832351 SHA256 9d8332d80faf4c89b02582894588829b3004d6abf79528c4b6e35a791a8adebc SHA512 bab2c577364c97f941be8581ede81e50ed2a4acaf97337daacdba082d6721f30d4869a951a29ad184bb473e0a4b5e4062a6a729de192ba4015fb39dfe7690856 WHIRLPOOL 0a69541791182b74fc2fb040fa2f85fc5beacf7ee9b6e8719cf77efa24be49fefb403297d4862ece3d7c5c7d13a0461189219695241864c908416f4b4d2e1671
-EBUILD skrooge-1.3.3.ebuild 930 SHA256 9d5f9ceb6dd0490009678a600a6845ceff4daa4145bab9b5d2ba310471d33669 SHA512 44d65ceb28c7fd9ed1393d64de51bd273f8f2ebf12ee48bd91a4be75065dd2b832368566e36666d69d73f7d5595058e903ff8f0926728e605dda80fa029472de WHIRLPOOL 80d1a03ff67ebea785907baeb746588aad2d1b44488cdb32f1b6d8987c7f9e39138eaa2cb312474e1a056383707c9a69ec36005a379bc8d29906d1d6a72ab7c7
+DIST skrooge-1.6.0.tar.bz2 9849200 SHA256 7237400f0ae9af317ec9ac45d8d35144f827146b8cb4e37fa092412fec5f0b0e SHA512 4dd9321c9799b3fdc0a30b694c443f9157feddb26bfc4cf25ef14e38718a237da13685d0ae4394353e9dd3d98348aad16e45f0ad13c7b5baa1aeba633cf14a3f WHIRLPOOL a0016ba50114d037ddd54ff9c3662f5cd7c28390d3a082ce192f540ca5091e6fd93daad719b1960ac7fca1c32c825843b67b8cea2675b1232b3be249dfe4084b
 EBUILD skrooge-1.5.1.ebuild 933 SHA256 e18ad880b7f930aebf28cc777591898c7c8e7a95420e1231103805359b0fb802 SHA512 24b82c3c23689f355a47b9873754f56f374b988ae199628fac3aa2b62ae3f36df2842a24812adfbdd03e72453db017d302ffe74bdd1920ea20f6f7bc2ec08bcc WHIRLPOOL 8ca3d1f3018d7fdaf2b91fe1e2d057b63ed147ad2212629ceec84384e215c657796fd43f07e751d1ed0d83d384c1e007fd06747fa18630d4815e51b94d1a380e
-MISC ChangeLog 5138 SHA256 21af5b0381933862bd9a34f4ad905613353fa4c9a370b650a3d72a3808dfbed1 SHA512 62ad908346bb8361c90b527ef57736a4507efb4c67b6f8f4e5c7c214a99acd5e5db4090a12ec62967dcb65aaa0a5bb4f4b583fc29d68382a3e6ec39a3fba0dc4 WHIRLPOOL 38d5b569ef6fd0961351a0807a9d1fb246f95c6cf925a97f7289ebb4c1cb972eae6822004af789d193f960daf055bccbe13f22bf065884ec2181db613d776b4d
+EBUILD skrooge-1.6.0.ebuild 1512 SHA256 d9e2bf32d7bb9d271f9c0926fd0b87e301d29fdbd6716fbaf28a26126dfc72ec SHA512 445aca91897963ca56dd40675fc53b72eb93f8a3ab444d82d64198832d0f87a0826ea0c2fd0b9a67a5c10543f03a7ee2e86d8038463e640e0b73401826ea3a84 WHIRLPOOL b5abcb505cb1f88125ca09fa3c9129a078cac5e489705277daa8a22c55e233481b0ca2c521adcbde58bab7f43910f5f728896874f6caeccd71f4a7f458dd7492
+MISC ChangeLog 5303 SHA256 52c0c72411f18142fe9cb9da55fe8f0ceb518543db30bd75fc53bfd05f4d6100 SHA512 8c10647efa23e0d95f32d1fdb0d1610b9a3087b850c4f9d74815373e5cf3071c71a5b840ddd232faee4a866271b5c9120e5c7ec2aac24f6fef5c9be374a16601 WHIRLPOOL 62898dfe2853d012aa94c051f57dcf5cf1826957496e4f8138067193cbd9ce0e0bbf9be21f033bdbef1ee43a1b40af57803d5bd7e497d0fdd7d148f688fa178a
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMlT4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88mFMQAKfY9bAKNjckjaIHGwAu6smy
-sf4Ss2Y9zznu8gMsCs2aDEgNpJhGGtSANEGhOejHTAolhn7xWmCdOF0ByiZdaRX3
-4AnAIvhNyyZwUExM2VYbhVJ/fx0T537edX2NXClPrnYBMgI/loKm0hv8iG9HDjpk
-nYAh3J4KwEog2AdeGanXZL7ZNp3U+cWZzsRsG28SUR/NK8MUQdFMAYeM++r7mco+
-46XQ/3ZCAt7yUvRgTdcQcTq28ayp7AVtuS1zKrFcCFFOocoblumGmwy3occWcH/N
-GCeatdPsWutf7RNXYd8Vr2hku++0eR56B6oR+lxnDBeSaQHMotdoGRzTFOTnZ8UK
-ooh73o2fRQyxU+xNZRXmo3le5uTG1zU+QujQL6J9ZaeF3/+l9B3IuDu4ISXGwd4G
-E1D13dDERSrkVd9dQt3IBmQ8Kk1FzIzSesGJ+yinH5i8q/7m6duG9o63pYbAM5B5
-t2v0c8OBv5WndYrVbqzw4Qd7VLhk1zeGerUQqIwP4lDXXFr3Uy99w/wp5BtY+7j2
-VeIzXEqH50rJ4lQfr6rGs2QQRRa1wsHShdmsPaxAUHttJFN7WiEWVKoCP56KX4ZB
-oTWWKtYP89oQ++F8dKZl+WKnHm6pg1KyrvDB/YydhUW98/5LrHulv9gIMrXrtBdo
-CcaK0qq8jeuzPEO3h4N7
-=YSHV
+iQEcBAEBCAAGBQJRPEuZAAoJEMbwO6tnXQ0ssAUIANLOKnIxYz39vvNXNfIRhVBm
+TFzYWeDYiNOsc9ZnugQrmbFQIAvev8K7jp3+EnADlqdcf2XfRici2tX270WNoPGE
+w+/wKrLt5tidvRe0eRKOOvO/kmSWMrVSyygqAkmWfQc7fMDBTMus32b/UyTKvpFz
+Yh5ED1dpZZKkgSFlwwrZxXRX5jrvPpDeLWE3BiafOrpaoUUfGwwKx1Sw8DOo7tqU
+nBvYdQee/w8w/kEJmrcpxtQMR5L4PPJmwlchJoz+JcTwr4YJrxzhuf0zYLGmYwrB
+R3fjDjPBt4wOg4JygvOgd/JJMWY3QrOlrJlF4BBa7EY5DqCMmJzfUXEphAq/Wp0=
+=/6qc
 -----END PGP SIGNATURE-----
diff --git a/app-office/skrooge/skrooge-1.3.3.ebuild b/app-office/skrooge/skrooge-1.3.3.ebuild
deleted file mode 100644
index c4a65b35128e..000000000000
--- a/app-office/skrooge/skrooge-1.3.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.3.3.ebuild,v 1.4 2013/03/02 19:37:28 hwoarang Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja
-ko lt ms nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
-KDE_DOC_DIRS="doc"
-KDE_HANDBOOK=optional
-inherit kde4-base
-
-DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
-HOMEPAGE="http://www.skrooge.org/"
-SRC_URI="http://www.skrooge.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/qca:2
-	dev-libs/grantlee
-	>=dev-libs/libofx-0.9.1
-	dev-qt/qtsql:4[sqlite]
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-scripts)
-"
-
-DOCS=( AUTHORS CHANGELOG README TODO )
-
-src_test() { :; }
-# tests are not included in tarball, bug 372315
diff --git a/app-office/skrooge/skrooge-1.6.0.ebuild b/app-office/skrooge/skrooge-1.6.0.ebuild
new file mode 100644
index 000000000000..46005c2e26c4
--- /dev/null
+++ b/app-office/skrooge/skrooge-1.6.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.6.0.ebuild,v 1.1 2013/03/10 09:00:29 kensington Exp $
+
+EAPI=5
+
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu it
+ja ko lt ms nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
+HOMEPAGE="http://www.skrooge.org/"
+SRC_URI="http://www.skrooge.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	app-crypt/qca:2
+	dev-db/sqlite:3
+	dev-libs/grantlee
+	>=dev-libs/libofx-0.9.1
+	dev-qt/qtsql:4[sqlite]
+"
+RDEPEND="${DEPEND}
+	|| (
+		( $(add_kdebase_dep kde-dev-scripts) )
+		( $(add_kdebase_dep kdesdk-scripts) )
+	)
+"
+
+# upstream does not ship tests in releases
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	RESTRICT="test"
+fi
+
+DOCS=( AUTHORS CHANGELOG README TODO )
+
+src_prepare() {
+	if [[ ${KDE_BUILD_TYPE} != live ]]; then
+		# KDE_LINGUAS is also used to install appropriate handbooks
+		# since there is no en_US 'translation', it cannot be added
+		# hence making this impossible to install
+		mv doc/en_US doc/en || die "doc move failed"
+		sed -i -e 's/en_US/en/' doc/CMakeLists.txt || die "sed failed"
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	kde4-base_src_test
+}