Revision bump. Add patch which uses subprocess call routine in qt4 interface for newer Python

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

4 files changed, 96 insertions, 3 deletions

diff --git a/x11-apps/fusion-icon/ChangeLog b/x11-apps/fusion-icon/ChangeLog
index cc12e9df7e1a..0e1430e2b678 100644
--- a/x11-apps/fusion-icon/ChangeLog
+++ b/x11-apps/fusion-icon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/fusion-icon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fusion-icon/ChangeLog,v 1.13 2012/08/31 11:39:48 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fusion-icon/ChangeLog,v 1.14 2012/09/07 08:25:35 pinkbyte Exp $
+
+*fusion-icon-0.1-r3 (07 Sep 2012)
+
+  07 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> +fusion-icon-0.1-r3.ebuild,
+  +files/fusion-icon-0.1-qt4-interface-subprocess-call.patch:
+  Revision bump. Add patch which uses subprocess call routine in qt4 interface
+  for newer Python
 
   31 Aug 2012; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Remove myself and proxy maintainer from maintainers
diff --git a/x11-apps/fusion-icon/Manifest b/x11-apps/fusion-icon/Manifest
index c07d1249a28d..83dedb6369b6 100644
--- a/x11-apps/fusion-icon/Manifest
+++ b/x11-apps/fusion-icon/Manifest
@@ -1,4 +1,6 @@
-DIST fusion-icon-0.1.tar.gz 30508 SHA256 2e6757fd4fb8ed7d1640fcabfbe10a39f36cf41504eda0dd13605db70273fe79
+AUX fusion-icon-0.1-qt4-interface-subprocess-call.patch 1078 SHA256 24460447499d9236f35b8d5fdcdcdb19e0fd2d8020e3f37aae250b7e51403ad8 SHA512 f144178a25dc3d22a6e5d43f939a77215f8b6b9be99366043567e3e9a1b1969fc7d45f376d8879fc6636295b8a2a090068ffcac56150bc0309c79b2c762326e7 WHIRLPOOL 17721dcde13e5fa0403ed34b51917b0519e15969eb0716ea5bf2be713794c72acdb342dc70e1605acc371b0751625e14d76b6646653cc311550303a8a3864c6b
+DIST fusion-icon-0.1.tar.gz 30508 SHA256 2e6757fd4fb8ed7d1640fcabfbe10a39f36cf41504eda0dd13605db70273fe79 SHA512 0c22d0c7a22a9c20f1285114f8b785aff6cf863d4fe3ea1198618b13d7144f459f131dccf885442908fcd82ab4ff69e5fc42e95314836725b0e51fa3190c2bcc WHIRLPOOL 7534f46df3965aa963a95b4ec796c5ef99980c9640a6d0ced6a542d5b22430b9c996d11236bbdf1c8f9f9b00bcf4346e9aaca85da571a81c16777c4e33b3b719
 EBUILD fusion-icon-0.1-r2.ebuild 1220 SHA256 ea12909a7489fb546c72d1c8742d82c1848369d30e41577c92a2ed3f7b8b1768 SHA512 538fd04204a4162191f4515479e094ced0298efc384af81b14e05e0a19b84c6f58e0234a12ef0a639fff293e0641fd653e1f5f3800049428ca58062cb814a20c WHIRLPOOL d8920ffba79476be039b3badfe3b76558d935fd9a0aa86f2eedc87fd5791c60858768af6d7850f5df7f052656ec51d65dff92103050fe4ac8173f8d62faffb50
-MISC ChangeLog 2321 SHA256 2debff278abaf6faabee9be74945d202a537eb44f8b9c57be5ee027f73d7e090 SHA512 03385d4cd083d1500248c3bc33c4bc12d597f6f07c558916d8a9430e934db64f34b8a1f9b79117bd75701db2fb6d5612c61cad7ddf938a1193de9f80f1e1ce2a WHIRLPOOL 66dd3748656aaf3075a986d47331f6a5bec04fefcd193e26b0fc1b3b0d08267dfe319a5a58c2ea3d32f9c9f61652c4c59db94c70f7fc53cb18eed82ecb15ef6e
+EBUILD fusion-icon-0.1-r3.ebuild 1335 SHA256 44cfc192b70ee90798fe451b3798b180bd779af38a594b7c287d4e035db7b002 SHA512 7602e2bcfe4fc0fd609d993cea10731f936dac3ef0fdbbe3e774ecdff3b57fd02b13c779cf1502fb655141461b501133b358eaed0f6e60675f075cc544f41b84 WHIRLPOOL a217d6206c0f61629dcd3d4e5ecd2e6977c6c5e555dff3a5aa923862a35a572a699a6e7be240e7ea0df7eee66625115fdcd7915e8e39e6b9c55a1696ddb4d227
+MISC ChangeLog 2595 SHA256 950fbc55602455bf827eb0ea5a4806c00d5e36564ba725e4aa835f08cf176b12 SHA512 27cb29a5fb2726c55e5889d75432a6a483853f1a97c8cf875973c0539187366aa77b458c8fd438705b671f363c0e94f4d0873c16001790705f28bd449c799a36 WHIRLPOOL 7dcc2340219835f6df5ae100509b43f7069b99d4d8e26fb83cc095c2726231d09869a6eff93ef212df9847573e6a2a85ae3f08033109c7c59e649fa9b85dc140
 MISC metadata.xml 250 SHA256 a058d216394b2fa94c85fbacc52889f48102f22aad3a916879cc816f8e6f8f8a SHA512 4b421fe6cfef7b1544a1c5db999b74651478d1f670211c5c40fadcfed85abf523a791a1b94a44a188d64bd86ce36177c637c9017f5d5ea628b220f8a280cdc3f WHIRLPOOL 8e546729d4a39665a353a9033ce7d79aca3b77b81e33ce16c935bd594158530cb990091d31685b8268dfe13ac270bdf4d04129669bebe390d02129728ae0d285
diff --git a/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch b/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch
new file mode 100644
index 000000000000..4829e18e60e6
--- /dev/null
+++ b/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch
@@ -0,0 +1,22 @@
+--- FusionIcon/interface_qt4/main.py.orig	2012-06-05 17:54:13.000000000 +0400
++++ FusionIcon/interface_qt4/main.py		2012-06-05 18:01:13.000000000 +0400
+@@ -19,6 +19,7 @@
+ import sys, os, time
+ from PyQt4 import QtGui, QtCore
+ from FusionIcon.start import wms, apps, options, decorators, init
++import subprocess
+ 
+ class Build(QtGui.QApplication):
+ 	def reload_wm(self):
+@@ -63,9 +64,9 @@
+ 				actionWD.setChecked(True)
+ 		self.Tray.menu = QtGui.QMenu()
+ 		if 'ccsm' in apps:
+-			self.Tray.menu.addAction(apps['ccsm'].label, lambda: run(['ccsm']))
++			self.Tray.menu.addAction(apps['ccsm'].label, lambda: subprocess.call(['ccsm']))
+ 		if 'emerald theme manager' in apps:
+-			self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: run(apps['emerald theme manager'].command))
++			self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: subprocess.call(apps['emerald theme manager'].command))
+ 		if 'ccsm' in apps or 'emerald theme manager' in apps:
+ 			self.Tray.menu.addSeparator()
+ 		self.Tray.menu.addAction("Reload Window Manager", self.reload_wm)
diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild
new file mode 100644
index 000000000000..2ed690d5d912
--- /dev/null
+++ b/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild,v 1.1 2012/09/07 08:25:35 pinkbyte Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit distutils eutils gnome2-utils
+
+MINIMUM_COMPIZ_RELEASE=0.6.0
+
+DESCRIPTION="Compiz Fusion Tray Icon and Manager"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk qt4"
+
+REQUIRED_USE="|| ( gtk qt4 )"
+
+RDEPEND="
+	>=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE}
+	>=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE}
+	x11-apps/xvinfo
+	gtk? ( >=dev-python/pygtk-2.10:2 )
+	qt4? ( dev-python/PyQt4[X] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PYTHON_MODNAME="FusionIcon"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qt4-interface-subprocess-call.patch
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+
+	use gtk || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_gtk"
+	use qt4 || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_qt4"
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+
+	use gtk && gnome2_icon_cache_update
+}