Fixed bug #130327. This is probably the last release of kimdaba under this name. Please merge media-gfx/kphotoalbum for future versions. Thanks to Urs Joss for spotting this.

(Portage version: 2.1_pre7-r5)

8 files changed, 91 insertions, 18 deletions

diff --git a/media-gfx/kimdaba/ChangeLog b/media-gfx/kimdaba/ChangeLog
index 5ca9a621335d..324d19108974 100644
--- a/media-gfx/kimdaba/ChangeLog
+++ b/media-gfx/kimdaba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/kimdaba
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/ChangeLog,v 1.13 2005/07/22 21:25:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/ChangeLog,v 1.14 2006/04/18 20:44:17 deathwing00 Exp $
+
+  18 Apr 2006; Ioannis Aslanidis <deathwing00@gentoo.org> kimdaba-2.1.ebuild,
+  kimdaba-2.0.ebuild, kimdaba-1.1.ebuild, kimdaba-1.0.1.ebuild:
+  Bug #130327. This is the last release of kimdaba under this name. To
+  access next releases, please unmerge kimdaba and merge kphotoalbum.
 
   22 Jul 2005; David Holm <dholm@gentoo.org> kimdaba-2.1.ebuild:
   Added to ~ppc.
diff --git a/media-gfx/kimdaba/Manifest b/media-gfx/kimdaba/Manifest
index 0873cf885907..cb3c5e683c15 100644
--- a/media-gfx/kimdaba/Manifest
+++ b/media-gfx/kimdaba/Manifest
@@ -1,10 +1,30 @@
 MD5 fb01e47de4760379a240337adc23c8ae ChangeLog 1520
-MD5 dc7c6ff33b80be4d1a2a531695afe9cc kimdaba-1.0.1.ebuild 427
-MD5 898bbf6eed174d47dd8edfc45733a76b kimdaba-1.1.ebuild 432
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 2587dbb10e3ba41ced856eb681ee62cb kimdaba-2.0.ebuild 600
-MD5 9956500b4e584ec65efb83b1f021e06b kimdaba-2.1.ebuild 772
-MD5 f7537f536c58778617d45603885dea95 files/digest-kimdaba-1.0.1 67
+RMD160 f267471787d28c140ff67c94e420f318e1ff43d4 ChangeLog 1520
+SHA256 16d8322a10741f56f9935be8094655b823d4608f68071e3c6435bde6b89820e7 ChangeLog 1520
+MD5 f0c207adf7479523b1fc1a8fd3ca00c4 files/digest-kimdaba-1.0.1 247
+RMD160 bb353bb3bceb5223b1ee6c4e7e557a23fc98280a files/digest-kimdaba-1.0.1 247
+SHA256 8a0a21532a69f9b064ac0a1087c74031e33e8626e80bc19b9825ec587c78a10c files/digest-kimdaba-1.0.1 247
 MD5 a0c23d1c1a7d12d827d49be92dd64d14 files/digest-kimdaba-1.1 65
+RMD160 d55d75dcb24a76afe7537bd938d331f3e6eab4c5 files/digest-kimdaba-1.1 65
+SHA256 09115c3e9cfd817aaf13d5c62c1c79abe6f0d550f09c880e713b73bb4f11534d files/digest-kimdaba-1.1 65
 MD5 068b53375139f12577924c84d3bd43be files/digest-kimdaba-2.0 65
-MD5 740491e5fe1d75d66eea3600a5a676d4 files/digest-kimdaba-2.1 66
+RMD160 eb61bbc754ed542484289c376afab57216d66424 files/digest-kimdaba-2.0 65
+SHA256 348c88c8adcdfd96a17e72a584791735864d8fb527c79792215f4df7b865861b files/digest-kimdaba-2.0 65
+MD5 8ca3a9271d87eed0df166adefe571c30 files/digest-kimdaba-2.1 244
+RMD160 b0e98c0ca8d264416a4e70bf07a8bcd43cfb541c files/digest-kimdaba-2.1 244
+SHA256 5675734422db2b1071c1eb3d23042578c41cadd356914b3c4d29290c0f1f997f files/digest-kimdaba-2.1 244
+MD5 eeb1e32d733c6902250fc09de346dba8 kimdaba-1.0.1.ebuild 600
+RMD160 9ed59435e27f7b3f5ba9773450459ca2dcd9193b kimdaba-1.0.1.ebuild 600
+SHA256 e75e1b1eb1de3216a781f60b3d0e36dcbd3769f8810790e6dcc760aeb37d6a4c kimdaba-1.0.1.ebuild 600
+MD5 1403dbc7df600febeaea5dffb1ecc1cc kimdaba-1.1.ebuild 607
+RMD160 d775f79237b54a013f436012412e18346dcef893 kimdaba-1.1.ebuild 607
+SHA256 00b70243b651c098dfab142e1f0d5e0ed4a81df66f05d67514b3fcb807ad5659 kimdaba-1.1.ebuild 607
+MD5 dda6945859a078f9f13879cf4824c005 kimdaba-2.0.ebuild 764
+RMD160 8f1a2861c850f1d1077e0e1ab8b5331c3590c3b3 kimdaba-2.0.ebuild 764
+SHA256 49e58d23ccf010fe3e9ae0b0f070472e77f2177a94e80c982bf97e336dd2493f kimdaba-2.0.ebuild 764
+MD5 d9b95c1ddfe40182acfcea15bdf5d7e2 kimdaba-2.1.ebuild 937
+RMD160 0058a22f9401b079e4f530d39d3b2daacf0067ed kimdaba-2.1.ebuild 937
+SHA256 d30c29acb4d8ecec5c6b03acdde61cf047a74ad9d5f1b13daa8fda0fe18bc729 kimdaba-2.1.ebuild 937
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/media-gfx/kimdaba/files/digest-kimdaba-1.0.1 b/media-gfx/kimdaba/files/digest-kimdaba-1.0.1
index fa3859e5f817..f37355ce3b10 100644
--- a/media-gfx/kimdaba/files/digest-kimdaba-1.0.1
+++ b/media-gfx/kimdaba/files/digest-kimdaba-1.0.1
@@ -1 +1,3 @@
 MD5 e083d1143eee9a74f3159cb6cc1b84b2 kimdaba-1.0.1.tar.bz2 6499478
+RMD160 1ed2b3dcd38ddfbf9d8605c88cf4a1389870067b kimdaba-1.0.1.tar.bz2 6499478
+SHA256 86e313a9b42c11c44b0d8bf85a2e3d9f19ed0951f0ae00aab1c0ad17515d2bcf kimdaba-1.0.1.tar.bz2 6499478
diff --git a/media-gfx/kimdaba/files/digest-kimdaba-2.1 b/media-gfx/kimdaba/files/digest-kimdaba-2.1
index 189e0ac5c4c5..827123199a0f 100644
--- a/media-gfx/kimdaba/files/digest-kimdaba-2.1
+++ b/media-gfx/kimdaba/files/digest-kimdaba-2.1
@@ -1 +1,3 @@
 MD5 5c8b3e1d806c069830e893e5a433234a kimdaba-2.1.tar.bz2 11558295
+RMD160 6027e834a8eaf0cb36923fe8b7d6ac44e2d2b95e kimdaba-2.1.tar.bz2 11558295
+SHA256 586025ef4da0d9979ff07c5b447987a09f021fe10b983a9cec934c0150b53c9a kimdaba-2.1.tar.bz2 11558295
diff --git a/media-gfx/kimdaba/kimdaba-1.0.1.ebuild b/media-gfx/kimdaba/kimdaba-1.0.1.ebuild
index 191f2321f915..7e1fda5e6d37 100644
--- a/media-gfx/kimdaba/kimdaba-1.0.1.ebuild
+++ b/media-gfx/kimdaba/kimdaba-1.0.1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-1.0.1.ebuild,v 1.3 2005/03/13 16:20:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-1.0.1.ebuild,v 1.4 2006/04/18 20:44:17 deathwing00 Exp $
+
 inherit kde
 need-kde 3
 
@@ -12,3 +13,14 @@ SRC_URI="http://ktown.kde.org/kimdaba/download/${P}.tar.bz2"
 HOMEPAGE="http://ktown.kde.org/kimdaba/"
 LICENSE="GPL-2"
 KEYWORDS="x86"
+
+DEPEND="!media-gfx/kphotoalbum"
+
+pkg_postinst()
+{
+	einfo "Version 2.1 of media-gfx/kimdaba is the last one released"
+	einfo "under that name. From version 2.2 and on, please use"
+	einfo "media-gfx/kphotoalbum, after removing your current"
+	einfo "media-gfx/kimdaba."
+}
+
diff --git a/media-gfx/kimdaba/kimdaba-1.1.ebuild b/media-gfx/kimdaba/kimdaba-1.1.ebuild
index 849f2f6c974f..de7db5483bc7 100644
--- a/media-gfx/kimdaba/kimdaba-1.1.ebuild
+++ b/media-gfx/kimdaba/kimdaba-1.1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-1.1.ebuild,v 1.4 2005/03/13 16:20:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-1.1.ebuild,v 1.5 2006/04/18 20:44:17 deathwing00 Exp $
+
 inherit kde
 need-kde 3
 
@@ -12,3 +13,14 @@ SRC_URI="http://ktown.kde.org/kimdaba/download/${P}.tar.bz2"
 HOMEPAGE="http://ktown.kde.org/kimdaba/"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~amd64"
+
+DEPEND="!media-gfx/kphotoalbum"
+
+pkg_postinst()
+{
+	einfo "Version 2.1 of media-gfx/kimdaba is the last one released"
+	einfo "under that name. From version 2.2 and on, please use"
+	einfo "media-gfx/kphotoalbum, after removing your current"
+	einfo "media-gfx/kimdaba."
+}
+
diff --git a/media-gfx/kimdaba/kimdaba-2.0.ebuild b/media-gfx/kimdaba/kimdaba-2.0.ebuild
index 9c6d01d177ec..8d49d6d0547f 100644
--- a/media-gfx/kimdaba/kimdaba-2.0.ebuild
+++ b/media-gfx/kimdaba/kimdaba-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-2.0.ebuild,v 1.6 2005/06/04 14:41:09 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-2.0.ebuild,v 1.7 2006/04/18 20:44:17 deathwing00 Exp $
 
 inherit kde
 
@@ -13,6 +13,16 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ~sparc x86"
 IUSE=""
 
-DEPEND="media-libs/libkipi
+DEPEND="!media-gfx/kphotoalbum
+	media-libs/libkipi
 	|| ( kde-base/kdegraphics-kfile-plugins kde-base/kdegraphics )"
 need-kde 3.2
+
+pkg_postinst()
+{
+	einfo "Version 2.1 of media-gfx/kimdaba is the last one released"
+	einfo "under that name. From version 2.2 and on, please use"
+	einfo "media-gfx/kphotoalbum, after removing your current"
+	einfo "media-gfx/kimdaba."
+}
+
diff --git a/media-gfx/kimdaba/kimdaba-2.1.ebuild b/media-gfx/kimdaba/kimdaba-2.1.ebuild
index af8c5b52ade8..ffe23d8fb8fe 100644
--- a/media-gfx/kimdaba/kimdaba-2.1.ebuild
+++ b/media-gfx/kimdaba/kimdaba-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-2.1.ebuild,v 1.4 2005/07/22 21:25:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kimdaba/kimdaba-2.1.ebuild,v 1.5 2006/04/18 20:44:17 deathwing00 Exp $
 
 inherit kde
 
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND="media-libs/libkipi
+DEPEND="!media-gfx/kphotoalbum
+	media-libs/libkipi
 	|| ( kde-base/kdegraphics-kfile-plugins kde-base/kdegraphics )"
 
 need-kde 3.2
@@ -25,3 +26,12 @@ src_unpack()
 	find ${S}/translations -name Makefile.in | xargs \
 		sed -i -e 's|LANG)/doc|LANG)/kimdaba|g'
 }
+
+pkg_postinst()
+{
+	einfo "Version 2.1 of media-gfx/kimdaba is the last one released"
+	einfo "under that name. From version 2.2 and on, please use"
+	einfo "media-gfx/kphotoalbum, after removing your current"
+	einfo "media-gfx/kimdaba."
+}
+