Update to eapi3. Fix kde dependencies managing.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

5 files changed, 23 insertions, 30 deletions

diff --git a/net-im/kmess/ChangeLog b/net-im/kmess/ChangeLog
index 905c29204c72..599579704376 100644
--- a/net-im/kmess/ChangeLog
+++ b/net-im/kmess/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/kmess
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.73 2011/01/17 22:38:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.74 2011/01/30 15:12:42 scarabeus Exp $
+
+  30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> kmess-2.0.5-r1.ebuild,
+  kmess-2.0.9999.ebuild, kmess-9999.ebuild:
+  Update to eapi3. Fix kde dependencies managing.
 
   17 Jan 2011; Markos Chandras <hwoarang@gentoo.org> -kmess-2.0.5.ebuild,
   kmess-2.0.5-r1.ebuild:
diff --git a/net-im/kmess/Manifest b/net-im/kmess/Manifest
index 35b2de1a58dd..27a240a9dc04 100644
--- a/net-im/kmess/Manifest
+++ b/net-im/kmess/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.0.5-msn_login_url_fix.patch 1637 RMD160 c9de7aa9ed2776b122371570a0132942ab817f84 SHA1 cba7a7506f7390959f712106df5b00d824242f91 SHA256 146883b9430532ed3d5766a26aab45cbb311600591516a104f179f11fe9087ad
 DIST kmess-2.0.5.tar.bz2 3621113 RMD160 68d66edf3f14d3de7919e2c6bf75c8a7860b03a3 SHA1 87bbd788e65d44fde63daf9eafa732aca0feb68f SHA256 c8045208c16975cce1ef404f073c934d69f6ee935a5c10d99c711a5e770d7b8e
-EBUILD kmess-2.0.5-r1.ebuild 1482 RMD160 69690cc8fcb4e65e36bd2744d545f54fa6b6894d SHA1 0a164342e1f71efde455264d034b180db4815de9 SHA256 cabe6ba89afaf8c7c923fd368953c73fabc50395784cbe2bee666d25c3c90426
-EBUILD kmess-2.0.9999.ebuild 1412 RMD160 4f31b2769b6f52ec05591238c31a27e49c658f40 SHA1 907c3e699c3cb8f85408a5da4cd7b23fb7cd0b35 SHA256 7a11c106b31310b05a4dcda1f7fae577bcd676adad5fcd7dc4d121f3a3563dc8
-EBUILD kmess-9999.ebuild 1382 RMD160 d997413f824405708b01adb79faa1822699c6174 SHA1 a5b812a20b22be4d157aeff1f1cfde3635785c4f SHA256 7a2240a6364b431767d3bef2537344141c96eac26cca42dc57865a114fd35b08
-MISC ChangeLog 10734 RMD160 997e3287370c8e3321727b523237fb476963910b SHA1 7ca0fbea178d66ad95dff0b1414d301682eeb4a5 SHA256 148c51fdf5dde3b0ebbde1777bf2854e8144f3aacb1682aca230bc5d5d9c7a06
+EBUILD kmess-2.0.5-r1.ebuild 1444 RMD160 34f8ac89981eb5a5609afa15b3eda6a8ac970a32 SHA1 92410300a03c00326ba8175048e2bee31a536a2a SHA256 a137468765be3a7007c233e2fe594bea80c94d990f94f67aa341257fd7c97b68
+EBUILD kmess-2.0.9999.ebuild 1397 RMD160 2e71d368085bcc595eb73f4b39d7dc3bd753b4b1 SHA1 4bf1a1d5f31e8111c7f466c2d0008e4f9f540957 SHA256 b7bc2278c40d07812a6e3206610558da8ee3d01d168d11863ee7f935f8df05c7
+EBUILD kmess-9999.ebuild 1367 RMD160 8f48022193a82305eeb094a248c104c701955b20 SHA1 e03cef27e5a9021db98e76289265fc5fe1a40f7f SHA256 3d087830ecb0ae375cc8c0b39c45085fcc54458b7a5d55a48c4433b2367cd485
+MISC ChangeLog 10908 RMD160 1f0fc004baf620fdedf3a9f4adc385aa804558d1 SHA1 5aad5e64239a3344f5d35853d66237d53e3b7c93 SHA256 5b45e9d1a3c5544d56651b85ee941319003c27c11aa37f16fcdc3b6c03b2cc2e
 MISC metadata.xml 325 RMD160 72a3ccc33b932a752045715c624752cfd6ec62e1 SHA1 3996953f983e21cd007ca8f48f1bb65d3b97e478 SHA256 d75ceff5bc965ae4840ce3663278c3d368f516c3cf2415dc94dec3f9acd3a2d5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk00xJAACgkQ9/cejkQaxBBtrwCfeunoJsfGaZS0NGn6krfdjITW
-scQAnRkeHN8tBuWTNntbY037tbkc5xzT
-=H4fE
------END PGP SIGNATURE-----
diff --git a/net-im/kmess/kmess-2.0.5-r1.ebuild b/net-im/kmess/kmess-2.0.5-r1.ebuild
index 0963c7828058..59191bd46eb2 100644
--- a/net-im/kmess/kmess-2.0.5-r1.ebuild
+++ b/net-im/kmess/kmess-2.0.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-2.0.5-r1.ebuild,v 1.3 2011/01/17 22:38:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-2.0.5-r1.ebuild,v 1.4 2011/01/30 15:12:42 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 KDE_LINGUAS="ar ca de el es et fi fr gl hu it ja nl pt_BR ru sk tr zh_CN zh_TW"
 inherit kde4-base
@@ -25,7 +25,7 @@ COMMONDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	gif? ( media-libs/giflib )
-	konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
+	konqueror? ( $(add_kdebase_dep libkonq) )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 "
 DEPEND="${COMMONDEPEND}
@@ -33,8 +33,7 @@ DEPEND="${COMMONDEPEND}
 	xscreensaver? ( x11-proto/scrnsaverproto )
 "
 RDEPEND="${COMMONDEPEND}
-	konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} )
-	kde-base/oxygen-icons
+	konqueror? ( $(add_kdebase_dep konqueror) )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-im/kmess/kmess-2.0.9999.ebuild b/net-im/kmess/kmess-2.0.9999.ebuild
index f825ffcf2acf..cb0a0e348a93 100644
--- a/net-im/kmess/kmess-2.0.9999.ebuild
+++ b/net-im/kmess/kmess-2.0.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-2.0.9999.ebuild,v 1.1 2010/10/23 19:34:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-2.0.9999.ebuild,v 1.2 2011/01/30 15:12:42 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 EGIT_HAS_SUBMODULES="true"
 KDE_LINGUAS="ar ca da de el es et fi fr hu it ko nb nl pt_BR sk sl sv th tr zh_CN zh_TW"
@@ -25,7 +25,7 @@ COMMONDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	gif? ( media-libs/giflib )
-	konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
+	konqueror? ( $(add_kdebase_dep libkonq) )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 "
 DEPEND="${COMMONDEPEND}
@@ -33,7 +33,7 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}
 	!net-im/kmess:0
-	konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} )
+	konqueror? ( $(add_kdebase_dep konqueror) )
 "
 RESTRICT="test"
 
diff --git a/net-im/kmess/kmess-9999.ebuild b/net-im/kmess/kmess-9999.ebuild
index 10b9e056f0e0..e3bf8cf36d8b 100644
--- a/net-im/kmess/kmess-9999.ebuild
+++ b/net-im/kmess/kmess-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-9999.ebuild,v 1.1 2010/10/23 19:34:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-9999.ebuild,v 1.2 2011/01/30 15:12:42 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 EGIT_HAS_SUBMODULES="true"
 KDE_LINGUAS="ar ca da de el es et fi fr hu it ko nb nl pt_BR sk sl sv th tr zh_CN zh_TW"
@@ -24,7 +24,7 @@ COMMONDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	gif? ( media-libs/giflib )
-	konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
+	konqueror? ( $(add_kdebase_dep libkonq) )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 "
 DEPEND="${COMMONDEPEND}
@@ -32,7 +32,7 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}
 	!net-im/kmess:0
-	konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} )
+	konqueror? ( $(add_kdebase_dep konqueror) )
 "
 RESTRICT="test"