Sync with kde overlay. Bumps EAPI to 5. Migrate to newer python eclass. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 13 insertions, 71 deletions

diff --git a/app-portage/kportagetray/ChangeLog b/app-portage/kportagetray/ChangeLog
index 74507c422503..47e06a1e1bc0 100644
--- a/app-portage/kportagetray/ChangeLog
+++ b/app-portage/kportagetray/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-portage/kportagetray
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/ChangeLog,v 1.13 2013/03/17 16:04:23 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/ChangeLog,v 1.14 2014/03/21 19:27:00 johu Exp $
+
+  21 Mar 2014; Johannes Huber <johu@gentoo.org> -kportagetray-0.2.4.ebuild,
+  kportagetray-0.2.4-r1.ebuild:
+  Sync with kde overlay. Bumps EAPI to 5. Migrate to newer python eclass. Remove
+  old.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/app-portage/kportagetray/kportagetray-0.2.4-r1.ebuild b/app-portage/kportagetray/kportagetray-0.2.4-r1.ebuild
index 48935774038b..eadb238c78d1 100644
--- a/app-portage/kportagetray/kportagetray-0.2.4-r1.ebuild
+++ b/app-portage/kportagetray/kportagetray-0.2.4-r1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/kportagetray-0.2.4-r1.ebuild,v 1.1 2012/03/24 19:40:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/kportagetray-0.2.4-r1.ebuild,v 1.2 2014/03/21 19:27:00 johu Exp $
 
-EAPI=4
+EAPI=5
 
 KDE_LINGUAS="pt_BR"
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-KDE_SCM="git"
-inherit kde4-base python
+inherit kde4-base python-r1
 
 EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
 
@@ -22,6 +21,7 @@ SLOT="4"
 IUSE=""
 
 DEPEND="
+	${PYTHON_DEPS}
 	dev-python/PyQt4[svg,dbus]
 	$(add_kdebase_dep pykde4)
 "
@@ -37,18 +37,3 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix_class_name.patch"
 	"${FILESDIR}/${P}-kdesu46.patch"
 )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-	kde4-base_src_prepare
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-}
diff --git a/app-portage/kportagetray/kportagetray-0.2.4.ebuild b/app-portage/kportagetray/kportagetray-0.2.4.ebuild
deleted file mode 100644
index 649814deb305..000000000000
--- a/app-portage/kportagetray/kportagetray-0.2.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/kportagetray-0.2.4.ebuild,v 1.5 2011/10/29 01:06:37 abcd Exp $
-
-EAPI=4
-
-KDE_LINGUAS="pt_BR"
-PYTHON_DEPEND="2:2.6"
-
-EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
-KDE_SCM="git"
-inherit kde4-base python
-
-DESCRIPTION="Graphical application for Portage's daily tasks"
-HOMEPAGE="http://gitorious.org/kportagetray"
-[[ ${PV} == 9999* ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="4"
-IUSE=""
-
-DEPEND="
-	dev-python/PyQt4[svg,dbus]
-	$(add_kdebase_dep pykde4)
-"
-RDEPEND="${DEPEND}
-	app-portage/eix
-	app-portage/genlop
-	$(add_kdebase_dep kdesu)
-	$(add_kdebase_dep knotify)
-	$(add_kdebase_dep konsole)
-"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-	kde4-base_src_prepare
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-}