Update to eapi3. Fix kde dependencies managing.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

4 files changed, 19 insertions, 16 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/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"