Version bump, small fixes by upstream developers

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 19 insertions, 64 deletions

diff --git a/app-portage/kportagetray/ChangeLog b/app-portage/kportagetray/ChangeLog
index 05baab165b1c..6973a0d6f953 100644
--- a/app-portage/kportagetray/ChangeLog
+++ b/app-portage/kportagetray/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/kportagetray
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/ChangeLog,v 1.5 2010/03/17 12:57:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/ChangeLog,v 1.6 2010/03/31 21:59:40 tampakrap Exp $
+
+*kportagetray-0.2.3 (31 Mar 2010)
+
+  31 Mar 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  -kportagetray-0.2.ebuild, -kportagetray-0.2.1.ebuild,
+  -kportagetray-0.2.2.ebuild, +kportagetray-0.2.3.ebuild:
+  Version bump, small fixes by upstream developers
 
 *kportagetray-0.2.2 (17 Mar 2010)
 
diff --git a/app-portage/kportagetray/kportagetray-0.2.2.ebuild b/app-portage/kportagetray/kportagetray-0.2.2.ebuild
deleted file mode 100644
index fcbd2ec373bd..000000000000
--- a/app-portage/kportagetray/kportagetray-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/kportagetray-0.2.2.ebuild,v 1.1 2010/03/17 12:57:25 ssuominen Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="pt_BR"
-PYTHON_DEPEND="2:2.6"
-
-inherit kde4-base python
-
-DESCRIPTION="Graphical application for Portage's daily tasks"
-HOMEPAGE="https://sourceforge.net/projects/kportagetray/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE=""
-
-DEPEND="
-	dev-python/PyQt4[svg,dbus]
-	>=kde-base/pykde4-${KDE_MINIMAL}
-"
-RDEPEND="${DEPEND}
-	app-portage/eix
-	app-portage/genlop
-	>=kde-base/kdesu-${KDE_MINIMAL}
-	>=kde-base/knotify-${KDE_MINIMAL}
-	>=kde-base/konsole-${KDE_MINIMAL}
-"
diff --git a/app-portage/kportagetray/kportagetray-0.2.1.ebuild b/app-portage/kportagetray/kportagetray-0.2.3.ebuild
index b3f09130ac70..3a2f3e425d1e 100644
--- a/app-portage/kportagetray/kportagetray-0.2.1.ebuild
+++ b/app-portage/kportagetray/kportagetray-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/kportagetray-0.2.1.ebuild,v 1.1 2010/03/14 17:58:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/kportagetray-0.2.3.ebuild,v 1.1 2010/03/31 21:59:40 tampakrap Exp $
 
 EAPI="2"
 
@@ -29,3 +29,13 @@ RDEPEND="${DEPEND}
 	>=kde-base/knotify-${KDE_MINIMAL}
 	>=kde-base/konsole-${KDE_MINIMAL}
 "
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-base_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+	kde4-base_src_prepare
+}
diff --git a/app-portage/kportagetray/kportagetray-0.2.ebuild b/app-portage/kportagetray/kportagetray-0.2.ebuild
deleted file mode 100644
index c95ee62f2083..000000000000
--- a/app-portage/kportagetray/kportagetray-0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/kportagetray-0.2.ebuild,v 1.2 2010/03/10 23:33:47 abcd Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="pt_BR"
-PYTHON_DEPEND="2:2.6"
-
-inherit kde4-base python
-
-DESCRIPTION="Graphical application for Portage's daily tasks"
-HOMEPAGE="https://sourceforge.net/projects/kportagetray/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE=""
-
-DEPEND="
-	dev-python/PyQt4[svg,dbus]
-	>=kde-base/pykde4-${KDE_MINIMAL}
-"
-RDEPEND="${DEPEND}
-	app-portage/eix
-	app-portage/genlop
-	>=kde-base/kdesu-${KDE_MINIMAL}
-	>=kde-base/knotify-${KDE_MINIMAL}
-	>=kde-base/konsole-${KDE_MINIMAL}
-"