Add several improvements, thanks to Andreas Sturmlechner in bug 405893

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 221 insertions, 2 deletions

diff --git a/app-portage/kportagetray/ChangeLog b/app-portage/kportagetray/ChangeLog
index 3e4d89b5d54e..c7d2cfa0f43f 100644
--- a/app-portage/kportagetray/ChangeLog
+++ b/app-portage/kportagetray/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-portage/kportagetray
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/ChangeLog,v 1.11 2011/10/29 01:06:37 abcd Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/kportagetray/ChangeLog,v 1.12 2012/03/24 19:40:56 dilfridge Exp $
+
+*kportagetray-0.2.4-r1 (24 Mar 2012)
+
+  24 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kportagetray-0.2.4-r1.ebuild,
+  +files/kportagetray-0.2.4-fix_class_name.patch,
+  +files/kportagetray-0.2.4-kdesu46.patch:
+  Add several improvements, thanks to Andreas Sturmlechner in bug 405893
 
   29 Oct 2011; Jonathan Callen <abcd@gentoo.org> kportagetray-0.2.4.ebuild:
   Bump to EAPI=4; cleanup
diff --git a/app-portage/kportagetray/files/kportagetray-0.2.4-fix_class_name.patch b/app-portage/kportagetray/files/kportagetray-0.2.4-fix_class_name.patch
new file mode 100644
index 000000000000..d9db9c368ccb
--- /dev/null
+++ b/app-portage/kportagetray/files/kportagetray-0.2.4-fix_class_name.patch
@@ -0,0 +1,24 @@
+From 2eebbc5b89f40b2ecaf4c3a9e08b8846bace5b4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?"David=20E.=20Narv=C3=A1ez"?= <david.narvaez@computer.org>
+Date: Tue, 31 Jan 2012 09:17:51 -0500
+Subject: [PATCH] Fixing class name to use Konsole namespace
+
+---
+ KPT_MainWindow.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/KPT_MainWindow.py b/KPT_MainWindow.py
+index 08a416d..c713f4f 100644
+--- a/KPT_MainWindow.py
++++ b/KPT_MainWindow.py
+@@ -137,7 +137,7 @@ class KPT_MainWindow(QtGui.QMainWindow):
+ 
+ 		# Load Konsole KPART.
+ 		konsoleFactory = KLibLoader.self().factory("libkonsolepart")
+-		konsolePart = konsoleFactory.create(self, "KonsolePart")
++		konsolePart = konsoleFactory.create(self, "Konsole::Part")
+ 		self.ui.konsoleLayout.addWidget(konsolePart.widget())
+ 		konsolePart.openUrl(KUrl.fromPath(os.environ['HOME']))
+ 
+-- 
+1.7.6
diff --git a/app-portage/kportagetray/files/kportagetray-0.2.4-kdesu46.patch b/app-portage/kportagetray/files/kportagetray-0.2.4-kdesu46.patch
new file mode 100644
index 000000000000..a9240b0c2d95
--- /dev/null
+++ b/app-portage/kportagetray/files/kportagetray-0.2.4-kdesu46.patch
@@ -0,0 +1,133 @@
+From 4ad89230ee0cd035d3d05f3745382212bbf552a2 Mon Sep 17 00:00:00 2001
+From: MacJariel <MacJariel@gmail.com>
+Date: Mon, 14 Mar 2011 13:21:12 +0100
+Subject: [PATCH] Updated scripts to work with kdesu 4.6.
+
+---
+ scripts/depClean.sh        |    2 +-
+ scripts/dispatchConf.sh    |    2 +-
+ scripts/editFile.sh        |    2 +-
+ scripts/etcUpdate.sh       |    2 +-
+ scripts/merge.sh           |    2 +-
+ scripts/revdepRebuild.sh   |    2 +-
+ scripts/syncPortageTree.sh |    2 +-
+ scripts/unmerge.sh         |    2 +-
+ scripts/upgrade.sh         |    2 +-
+ scripts/upgradePortage.sh  |    2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/scripts/depClean.sh b/scripts/depClean.sh
+index 14d2425..7805feb 100755
+--- a/scripts/depClean.sh
++++ b/scripts/depClean.sh
+@@ -5,5 +5,5 @@
+ # Script called to execute dep-clean process.
+ # It performs a emerge -va --depclean on a console.
+ 
+-kdesu "konsole --noclose -p LocalTabTitleFormat=%w -e emerge -va --depclean"
++kdesu -- konsole --noclose -p LocalTabTitleFormat=%w -e emerge -va --depclean
+ 
+diff --git a/scripts/dispatchConf.sh b/scripts/dispatchConf.sh
+index 1d9fbbe..49a2167 100755
+--- a/scripts/dispatchConf.sh
++++ b/scripts/dispatchConf.sh
+@@ -5,5 +5,5 @@
+ # Script called to execute dispatch-conf.
+ # It runs dispatch-conf on a console.
+ 
+-kdesu "konsole --noclose -p LocalTabTitleFormat=%w -e dispatch-conf"
++kdesu -- konsole --noclose -p LocalTabTitleFormat=%w -e dispatch-conf
+ 
+diff --git a/scripts/editFile.sh b/scripts/editFile.sh
+index 8c28d7b..3d1abd2 100755
+--- a/scripts/editFile.sh
++++ b/scripts/editFile.sh
+@@ -20,5 +20,5 @@ then
+ 	exit 1
+ fi
+ 
+-kdesu "konsole --noclose -p LocalTabTitleFormat=%w -e ${EDITOR} $1"
++kdesu -- konsole --noclose -p LocalTabTitleFormat=%w -e ${EDITOR} $1
+ 
+diff --git a/scripts/etcUpdate.sh b/scripts/etcUpdate.sh
+index 3de1654..78061a0 100755
+--- a/scripts/etcUpdate.sh
++++ b/scripts/etcUpdate.sh
+@@ -5,5 +5,5 @@
+ # Script called to execute etc-update.
+ # It performs a etc-update on a console.
+ 
+-kdesu "konsole --noclose -p LocalTabTitleFormat=%w -e etc-update"
++kdesu -- konsole --noclose -p LocalTabTitleFormat=%w -e etc-update
+ 
+diff --git a/scripts/merge.sh b/scripts/merge.sh
+index cb18d32..e81e68c 100755
+--- a/scripts/merge.sh
++++ b/scripts/merge.sh
+@@ -11,5 +11,5 @@ then
+ 	exit 1
+ fi
+ 
+-kdesu "konsole --noclose -p LocalTabTitleFormat=%w -e emerge -va $@"
++kdesu -- konsole --noclose -p LocalTabTitleFormat=%w -e emerge -va $@
+ 
+diff --git a/scripts/revdepRebuild.sh b/scripts/revdepRebuild.sh
+index f466c3b..51ecb79 100755
+--- a/scripts/revdepRebuild.sh
++++ b/scripts/revdepRebuild.sh
+@@ -5,5 +5,5 @@
+ # Script called to execute revdep-rebuild process.
+ # It performs a revdep-rebuild on a console.
+ 
+-kdesu "konsole --noclose -p LocalTabTitleFormat=%w -e revdep-rebuild -i"
++kdesu -- konsole --noclose -p LocalTabTitleFormat=%w -e revdep-rebuild -i
+ 
+diff --git a/scripts/syncPortageTree.sh b/scripts/syncPortageTree.sh
+index 8825be1..a4f67f1 100755
+--- a/scripts/syncPortageTree.sh
++++ b/scripts/syncPortageTree.sh
+@@ -15,7 +15,7 @@ TMP_FILE=$1
+ # Create the temporary file.
+ touch ${TMP_FILE}
+ 
+-kdesu -t 'emerge --sync --color=y 2>&1 && cp -v /var/cache/eix /var/cache/eix.previous && eix-update 2>&1 && echo "Process Finished"' >> ${TMP_FILE}
++kdesu -t -c 'emerge --sync --color=y 2>&1 && cp -v /var/cache/eix /var/cache/eix.previous && eix-update 2>&1 && echo "Process Finished"' >> ${TMP_FILE}
+ 
+ # Remove the temporary file.
+ rm ${TMP_FILE}
+diff --git a/scripts/unmerge.sh b/scripts/unmerge.sh
+index b0c0882..133ff7a 100755
+--- a/scripts/unmerge.sh
++++ b/scripts/unmerge.sh
+@@ -11,5 +11,5 @@ then
+ 	exit 1
+ fi
+ 
+-kdesu "konsole --noclose -p LocalTabTitleFormat=%w -e emerge -va --unmerge $@"
++kdesu -- konsole --noclose -p LocalTabTitleFormat=%w -e emerge -va --unmerge $@
+ 
+diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
+index da14027..3691587 100755
+--- a/scripts/upgrade.sh
++++ b/scripts/upgrade.sh
+@@ -5,5 +5,5 @@
+ # Script called to upgrade the world set.
+ # It performs a emerge -vaNDU world on a console.
+ 
+-kdesu "konsole --noclose -p LocalTabTitleFormat=%w -e emerge -vaNDu world"
++kdesu -- konsole --noclose -p LocalTabTitleFormat=%w -e emerge -vaNDu world
+ 
+diff --git a/scripts/upgradePortage.sh b/scripts/upgradePortage.sh
+index cac5bb2..aaea771 100755
+--- a/scripts/upgradePortage.sh
++++ b/scripts/upgradePortage.sh
+@@ -5,5 +5,5 @@
+ # Script called to upgrade the portage.
+ # It performs a emerge -va portage on a console.
+ 
+-kdesu "konsole --noclose -p LocalTabTitleFormat=%w -e emerge -va portage"
++kdesu -- konsole --noclose -p LocalTabTitleFormat=%w -e emerge -va portage
+ 
+-- 
+1.7.9.2
+
diff --git a/app-portage/kportagetray/kportagetray-0.2.4-r1.ebuild b/app-portage/kportagetray/kportagetray-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..48935774038b
--- /dev/null
+++ b/app-portage/kportagetray/kportagetray-0.2.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 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 $
+
+EAPI=4
+
+KDE_LINGUAS="pt_BR"
+PYTHON_DEPEND="2:2.6"
+
+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"
+[[ ${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)
+"
+
+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
+}