[gentoo-commits] proj/gentoo-guis:master commit in: app-portage/kportagetray/

["Johannes Huber" <johu@gentoo.org>]

commit:     ef2e1e8e2d0c2bfd9032f51703e7e586c12c56e4
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 07:58:59 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 07:58:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=ef2e1e8e

[app-portage/kportagetray] Sync with kde overlay.

(Portage version: 2.2.0_alpha95/git/Linux i686, signed Manifest commit with key F3CFD2BD)

---
 app-portage/kportagetray/Manifest                 |   16 ++++----
 app-portage/kportagetray/kportagetray-9999.ebuild |   39 ++++++--------------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/app-portage/kportagetray/Manifest b/app-portage/kportagetray/Manifest
index d55c20c..ae969a2 100644
--- a/app-portage/kportagetray/Manifest
+++ b/app-portage/kportagetray/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-EBUILD kportagetray-9999.ebuild 1115 RMD160 88d55a450282a06584dec61804de222180808f18 SHA1 ee377e92121c424c6c35e25408840ea4761b3e4f SHA256 600a9a1fa38a362a285e53d7a6fff376f601ebc68b20a0978be5f336585a1396
+EBUILD kportagetray-9999.ebuild 902 RMD160 8acc61d7e23881377aba9e4a67c93512cdcc31fc SHA1 90f9ac38999708e0831e4a58258493d9ed07d363 SHA256 14befdbe499a7ee8dc4e9aa939cf0f713986d7f1fb267e47e7ec06c8288b9bf0
 MISC metadata.xml 382 RMD160 607e915ba3f3d9d8ec572d773e5e4e75201fd5b1 SHA1 209ff6873ba99aded82ca0f30dc207cb63cbef6d SHA256 6b29a392e4890b88f4b6acec11d4f889041af6a805585e4c3b1c54d562d3eb5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPcCE1AAoJEO+t9ga+3I3a5/sH/RavsjqCYFND2F7/rTfk/NZx
-z58zj9P0hLhslaogTZf+axB/eMoYRNSOSKyHiicqPFxbMYWDN9LCnFgeNrDLdg8s
-B3k1qwWqAFFamfVUbjbz+CBwKJ7cnGTcCqDZ5kKqTds4xgVQ83nzoOl8monMfSXo
-Mh2UErgXWUpFSTQXtmvyQW2EoE1Z3Wq8XD4EIo95WhsFFBF2/OODzuRogTzFZSiX
-OKFX6YzzROkxAeVJ4SLQl1E4YgZYnnlkECE1ge6aB6pgadoO3x+Lj/WBjIxt4ssv
-Bp107e8IjGRVFRfZ4MmUC5byG2h2c3nwHEbmOoQ2+P/9pXl9wpEoauBu369fflE=
-=HwoK
+iQEcBAEBCgAGBQJPcCHDAAoJEO+t9ga+3I3aduMH/1HosmXoYmjU6z1WcMtguu4l
+0b69jCJkuKDle42R7oiYfjKFpCb0B4ma9ZsotMzImAQq4T4oi5q9iORYjIE6MjbW
+isuSIU/qAdYVCBS8GAkWmx5f2AzOJdPjnjf66M+ZGsqGFl4Ka1Xd2Ukj+66i+ImD
+0JyQ2tw4Iew1+3E/nn4Tpyrpm7iOhzqIv+ENc1OIS9EuQ2rstxepnQQlDJNOijMp
+l/MTBDdk003JGT8USMiCbV29hxl1Wuz5TcassHrW3o7eqEBEEa6fVXjlcYamy9hQ
+6zBWs+WVj8Lw3cPT30c4BBkX17fbmCOPIO/GuM6YH+8/PfjE56FMD4nzqP5RE/s=
+=uBXs
 -----END PGP SIGNATURE-----

diff --git a/app-portage/kportagetray/kportagetray-9999.ebuild b/app-portage/kportagetray/kportagetray-9999.ebuild
index 8bc3563..19eb214 100644
--- a/app-portage/kportagetray/kportagetray-9999.ebuild
+++ b/app-portage/kportagetray/kportagetray-9999.ebuild
@@ -1,28 +1,20 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git
-	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
-fi
+EAPI=4
 
 KDE_LINGUAS="pt_BR"
 PYTHON_DEPEND="2:2.6"
 
-inherit ${SCM} kde4-base python
+KDE_SCM="git"
+inherit kde4-base python
+
+EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
 
 DESCRIPTION="Graphical application for Portage's daily tasks"
 HOMEPAGE="http://gitorious.org/kportagetray"
-
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-fi
+[[ ${PV} == 9999* ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 KEYWORDS=""
@@ -31,29 +23,22 @@ IUSE=""
 
 DEPEND="
 	dev-python/PyQt4[svg,dbus]
-	>=kde-base/pykde4-${KDE_MINIMAL}
+	$(add_kdebase_dep pykde4)
 "
 RDEPEND="${DEPEND}
 	app-portage/eix
 	app-portage/genlop
-	>=kde-base/kdesu-${KDE_MINIMAL}
-	>=kde-base/knotify-${KDE_MINIMAL}
-	>=kde-base/konsole-${KDE_MINIMAL}
+	$(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_unpack() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git_src_unpack
-	else
-		base_src_unpack
-	fi
-}
-
 src_prepare() {
 	python_convert_shebangs -r 2 .
 	kde4-base_src_prepare