Version bump; remove old

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 30 insertions, 38 deletions

diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 6414ae31e476..b33b31fb2a07 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/kmymoney
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.24 2012/02/13 18:46:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.25 2012/03/08 02:45:10 dilfridge Exp $
+
+*kmymoney-4.6.2 (08 Mar 2012)
+
+  08 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kmymoney-4.6.0-r1.ebuild, -files/kmymoney-4.6.0-gnucash.patch,
+  +kmymoney-4.6.2.ebuild:
+  Version bump; remove old
 
   13 Feb 2012; Johannes Huber <johu@gentoo.org>
   +files/kmymoney-4.6.1-qt48.patch, kmymoney-4.6.1.ebuild:
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 82cdd83ed275..646ace1f9a88 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -2,24 +2,29 @@
 Hash: SHA512
 
 AUX kmymoney-4.5.3-underlinking.patch 960 RMD160 fc4f54a5d5094668e6c37553661a12523f9ec79d SHA1 385fb9bd22625ddeb7b2545fe4e92d29b8ba42e5 SHA256 33d04cd3fc549871264ee02e9532e0afe07e2e9223008feac6c57e87d4bf6849
-AUX kmymoney-4.6.0-gnucash.patch 916 RMD160 0ea0f923930c90727369730c76c8474a3e415b83 SHA1 25a854e8b1c9da7164364d81dbaec009ce2cebd7 SHA256 2882c9eacae40031022e8488a410a39be739240d0351e0b5aa768577ba9ba045
 AUX kmymoney-4.6.1-qt48.patch 961 RMD160 8a44caa45c864687339a9f1d008e52d39bbc6a65 SHA1 b29a7cfbf4398e91bd4401a71a678d7ceb1f0cba SHA256 5fde218c7d0b62702e4d5bcac299472d3e6bff155e04680ef4923a4f42ec539d
 DIST kmymoney-4.5.3.tar.bz2 14937401 RMD160 896e2efcfe7ec400327f74d40b9393eaf38cbce5 SHA1 3333d19d2c84eae45b1be3aeb3d90780f2beb9e1 SHA256 a9b37275cf3cdcd5ce865d94391df44c7822639b830fccb9962a54b7fcf76ffb
-DIST kmymoney-4.6.0.tar.bz2 20914001 RMD160 e71d10a768ed19c4a4f264d70600f683f997565e SHA1 b3f250e82e67166bd7425a4343e744f1f2a6f743 SHA256 8f034a92682cc61dfa76c2593893524d00658c49360b17ddc67671e32ec7edf8
 DIST kmymoney-4.6.1.tar.bz2 22758086 RMD160 d49885bf04849b8a4db901a1c099b39006ee2b95 SHA1 dc1e80b256795df819c6167c22dc90ffcad741db SHA256 5fcab9c4f1b5868aabb816a87c61cb025e69a191f6cb218cce3f29f0c1c1b77a
+DIST kmymoney-4.6.2.tar.bz2 22762330 RMD160 b71f82f7fed3daba5711437db29cd225f38262d9 SHA1 b7dc6ce3a36c441ae2d199725db9aa2ec23fdd1f SHA256 add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75
 EBUILD kmymoney-4.5.3.ebuild 1789 RMD160 c031816a32d50e03694c8ea57f2e2df4020450b5 SHA1 48fdc7e30572f47d41652fa31027723fb0278a87 SHA256 3a2a194601332f3af474305d9694f0546b9a4dfe771e9bc918d0078d388f4a67
-EBUILD kmymoney-4.6.0-r1.ebuild 1926 RMD160 a762148984097bed5caa924f1d297492f7fdeb8d SHA1 fdd2191929c70008c0437fe117f2413fea3dd3d3 SHA256 0752ffa0ff41d34b7f7494e99dc2080245b4cd8d78c0945d281b6a8406dc5682
 EBUILD kmymoney-4.6.1.ebuild 1873 RMD160 1c758d931f3027ca9c55060cf60928fc41f7473b SHA1 819f0725e311141621fcfa55a066b78a6bfe41b8 SHA256 a061461c4eaba37c5160cc45f750ca2dd7f1653d605590ca49f782e24974968d
-MISC ChangeLog 3683 RMD160 7c5dec6281130f04874feb87b35a1a266334b8c9 SHA1 851fefc47b2dd028af78d23d9412044ec31f0e03 SHA256 d452ca6af313c17a223fb61dc296e3ee240a71d2723d10ff7c2254c13f5ff34a
+EBUILD kmymoney-4.6.2.ebuild 1878 RMD160 16bd914e977459867a962324640ba2e25a0519bb SHA1 df2a36bb820b9cc72f6d96d0a0fb1033a61460b5 SHA256 775b8a975bc10174cebe7a56541ca930e45bebcc0565fafe35c72c45abe24d11
+MISC ChangeLog 3896 RMD160 8ed2e9dc26fb35682f8a3d3b23f74d90e1e14f4b SHA1 0ceb895273dd0d5402ac8552ddd716c69cb7a98e SHA256 6387a092d3ddf703460199cfaf654fb340d6e665b10eac01f7516367c5d38e7b
 MISC metadata.xml 327 RMD160 337c462e38007a529ca6c979b341426898a9af04 SHA1 62bfe203a842760f95655a42acdd1da8f4436637 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPOVuCAAoJEO+t9ga+3I3aMTEIAKg1FnDyfgKnsOAqtcuqk3iP
-Jh9NqIrM8c8vZzkiou1N9ErBummhb22BGNhlQGlm7TVSIx+IksUU6J4CCKcv+sc2
-fV9N5bfZBae6ZWT1lXZ0gczdxno/gtSS1gNhmdNiPCqeW/ghRcySHLY6ShkvkMES
-amX8sPpjJVCBNIqoUU1mBLh69qe0QbDpMgM6ffOR5bUkVZO0tRSJVrHc2cl3x/j/
-vsM7M70LmMwz4KPaGzh9tjFDx/tVC37FQg5D1DZG4dg+k5DtD8duoAAbciGzr5/B
-LjqF2qKYFj7shs2d7ZziVi1b1K1FKC0Ojh48QlqqDob/YT6wrkgeGlbXSQkZF5c=
-=Aee3
+iQIcBAEBCgAGBQJPWB1vAAoJEEb+UGWnxTyHzC0P/A/IYqCDeS2kC6QLeFl1ZrYP
+6w6M2u3exeTiDdlj8fDt81yRruCYl6Jvn7hXFauBCOSID/uYpz81dPt1bVSh8RSZ
+WR2TB6TFdLlJdg1N5NbZnNyPZPwaxYJFUwjdu3L9AUAnp2IRPt8PdP8TxOPZVVoh
+oMsF2g472RkCNb3j+n1dcMpEu31N2rrL2lO5EaEwji+nMMHFuqc2x8izxurxFRZS
+hKmUsn/PD2CgHnDu5QCIHh5GKXNBySMajtwdAcUIKSOEB9CLdoX22PL+kES8mosi
+4PEPMze264t70u1R0s7++WBf6ayhE02cLPGUiPPkOcc6JYWUIWx9GfEoMwn9VmKe
+7z/yxREP32oyJLrrsb016OQyO2iAaGemhxoQPl9T2UEIRTeKddVqFDyXKEofW2tr
+Cmo0psG9Cyk8ILQb+h0fLZT48Yan601O0F0lhsb4bMImnNHTuRFB0Ya0PZUgCVpL
+a62cShGbubG+T3BAT26H4grD9i25DrkFGdFxhSYn21eFKbe3SsVJqFCyBJIneE6E
+BPu1LnmY4ZBpDjGThF6btA59zYMQnfPTAu2uXPZNFhoWbI24wnwHbaFSQikR73Jt
+BFFGhytLisSMipoc1zCEmdXlbrb5/2d3CocTmY/H6wDNOZVTzW42RTPb+/GJaZ61
+1vc1QrRcjXcGt2/iqS6U
+=LrrI
 -----END PGP SIGNATURE-----
diff --git a/app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch b/app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch
deleted file mode 100644
index 240ad186e9eb..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN kmymoney-4.6.0.orig/kmymoney/converter/mymoneygncreader.cpp kmymoney-4.6.0/kmymoney/converter/mymoneygncreader.cpp
---- kmymoney-4.6.0.orig/kmymoney/converter/mymoneygncreader.cpp	2011-08-09 07:48:04.000000000 +0200
-+++ kmymoney-4.6.0/kmymoney/converter/mymoneygncreader.cpp	2011-10-22 00:40:05.731618915 +0200
-@@ -1267,6 +1267,7 @@
-   if (bAnonymize) setFileHideFactor();
-   //m_defaultPayee = createPayee (i18n("Unknown payee"));
- 
-+  MyMoneyFile::instance()->attachStorage(m_storage);
-   MyMoneyFileTransaction ft;
-   m_xr = new XmlReader(this);
-   try {
-@@ -1277,6 +1278,7 @@
-     KMessageBox::error(0, i18n("Import failed:\n\n%1", e->what()), PACKAGE);
-     qWarning("%s", qPrintable(e->what()));
-   } // end catch
-+  MyMoneyFile::instance()->detachStorage(m_storage);
-   signalProgress(0, 1, i18n("Import complete"));  // switch off progress bar
-   delete m_xr;
-   qDebug("Exiting gnucash importer");
diff --git a/app-office/kmymoney/kmymoney-4.6.0-r1.ebuild b/app-office/kmymoney/kmymoney-4.6.2.ebuild
index 876bc5c87c49..348350c76766 100644
--- a/app-office/kmymoney/kmymoney-4.6.0-r1.ebuild
+++ b/app-office/kmymoney/kmymoney-4.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.0-r1.ebuild,v 1.1 2011/10/21 22:45:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.2.ebuild,v 1.1 2012/03/08 02:45:10 dilfridge Exp $
 
 EAPI=4
 
@@ -27,9 +27,9 @@ IUSE="debug calendar doc hbci ofx quotes test"
 
 COMMON_DEPEND="
 	app-crypt/gpgme
-	>=app-office/libalkimia-4.3.1
+	>=app-office/libalkimia-4.3.2
 	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp
+	dev-cpp/libxmlpp:2.6
 	dev-libs/boost
 	dev-libs/glib:2
 	dev-libs/gmp
@@ -54,8 +54,7 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.5.3-underlinking.patch"
-	"${FILESDIR}/${PN}-4.6.0-gnucash.patch"
+	"${FILESDIR}/${PN}-4.6.1-qt48.patch"
 )
 
 src_configure() {