Revision bump: add workaround for bug #487106, patch by Small_Penguin <dark.shadow AT gmx.at>

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 90 insertions, 11 deletions

diff --git a/x11-apps/ccsm/ChangeLog b/x11-apps/ccsm/ChangeLog
index d92287a9a53c..83ed2fd2b3b9 100644
--- a/x11-apps/ccsm/ChangeLog
+++ b/x11-apps/ccsm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/ccsm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ccsm/ChangeLog,v 1.30 2013/08/25 15:01:19 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ccsm/ChangeLog,v 1.31 2014/01/23 08:08:38 pinkbyte Exp $
+
+*ccsm-0.8.4-r5 (23 Jan 2014)
+
+  23 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> +ccsm-0.8.4-r5.ebuild,
+  +files/ccsm-0.8.4-pygobject-glib-fix.patch:
+  Revision bump: add workaround for bug #487106, patch by Small_Penguin
+  <dark.shadow AT gmx.at>
 
   25 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> -ccsm-0.8.4-r2.ebuild:
   Drop old revision
diff --git a/x11-apps/ccsm/Manifest b/x11-apps/ccsm/Manifest
index c11dbbb70d8f..6fd969b2be32 100644
--- a/x11-apps/ccsm/Manifest
+++ b/x11-apps/ccsm/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ccsm-0.8.4-pygobject-glib-fix.patch 637 SHA256 bc715963922c0819478fe4420a5fdfdaf40ad47114ec2809b6f45fb0b810efc6 SHA512 fac2a97bcb0883ab3c0a24040f88b354653a3e507c306fb89e58f1a1d1aba46d65ed92a0094b3ebe312095ffc53af717fd43e284f13a1785dd3c45b907e38672 WHIRLPOOL 67df1d229136d39be239a990b3328431fb12e3b637e3c59716ad612fe3fa357e7258d252814b2f32cf30bed4005820161919524d8808017228811970e13ec0b2
 DIST ccsm-0.8.4.tar.bz2 475864 SHA256 46b9da032cf29e71aec0823799861d926937ad41f4edea3be718ac6a8532c16d SHA512 1991f25ca4f04363006bacd5267cb54c7e24817b263996c7172f58180ca0acf94050220938d4fa87081c93fde23ca0b44a333f9b675950e4c5187903a03692c5 WHIRLPOOL a6730161d07a8c5158700566df31653a7adcf117e791a5b4076b67b68a4ce4c7ff3f88a5710c1fce29d38eccbbade095710f5a73277c54809e5431b3c52c1fe0
 EBUILD ccsm-0.8.4-r4.ebuild 1273 SHA256 691033eadba90a4dea6b16e6df7c1fa925adee8bbef7bddc2d9297e084b4e11d SHA512 465931eb47bde8accecc6d12a6ccb1bba201f4adb5b22e0b4afe121457beb864326403c9604bdc2fd72da8837f481d6f41bb181e30fcdb5b2fc3ad7e8f284a7c WHIRLPOOL 572bf19d695a3b16557a3f860223f7bb2de6632bafebf1416a937744e7e1feb88e9d1bcc32a2269cc21c7a447e030363d69c21808604657b6bcc92880ce276ab
-MISC ChangeLog 4577 SHA256 acd5b64b8fbf748be07d54c93bf24447537fb2bbb93799e18b879ef9e1982093 SHA512 c26a63ac8ddbc0f88bfa2f007bce005bc04566bee89e3f16caa598c3fd857fa48bf17eeb600611fddd36305f09c9ed5b40d535b5ed0ec28a9f62a46da17c5bac WHIRLPOOL 061abc5169515f9fb203d77bbf4d9f61e7c44cdd208149951bd61c45f2a7434db4f953aea0ea65a933cf8b4fe27deb57abe71dccb7cb2f6e3e53bf45dec16298
+EBUILD ccsm-0.8.4-r5.ebuild 1371 SHA256 86c054637df060af74989b3ca333a124d7f8fb684faaff36bcb8c3a39d9f499b SHA512 94744086469cc6075d550570071a60b24944a8347f020802ea1c72216733b0432144fe9e3f1a50265f6b1aec067080654248c85695ed8d1d876350798b34f530 WHIRLPOOL 06fa38749add9fc6b73d85b9fa3fee6751b9548b87346e2d44c615359a392a9672cb03a9e9c405c5679ae2685f07e70ce404d50873d16c34c95b4302be73a656
+MISC ChangeLog 4825 SHA256 70431c4cb655fc8393570d2b7bf51905c299c92b36335119a4ac2ee79784b4fa SHA512 5a8cb0fddf0c17c627a53cd03a95f37804c2e96f57537d3aa3de89ddb76411849436d698136e38461c08cd97f3cfc135bc064df130c0e0f7dc8b2b5fac7a253f WHIRLPOOL f25a0032a436c512c24862790255136f9ea341f2474bfbb6c610ca1c105a688f26facbf4b3c84d9e598f10830569cd66c071062dc62161f215e409306dbc987c
 MISC metadata.xml 244 SHA256 d6952c0137edd0f6d760c8fa028a7afe43fb48950e3481177b8fba498f50e76b SHA512 75b6309504f527151591f608260a7e4f082457240282c4ce7f5539ac4f6aa4ec6ae415f9c327915b43f1ca15b0d2197ae889e7a15701d918585b92ef21659ca3 WHIRLPOOL 144cf04f3600391eee4956f8749a9258a6dab042be38f989d9ce4c8a817478024d99658d65498e8e4fd5f012a97f33d6b918d790072ccfa9d5fd72a9886513c5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSGhw/AAoJECo/aRed9267Yv4H/RKWX8mm4co8dNC6dVMoB+a+
-pX46V8E8qUAEfjmDhWZm9r/H6YqqhxfUoS1AqVMm0lQxMSTukgb7jM7WgW4t575e
-w+A63vLfjS8TwzyoZqCxqMqV0jCPigbq9FuwJ5I2Do+KqKc7Is+LYQDLb+lXU6Fn
-oiqvOim/s6t76/PkhoBPDjlMjUIRmnb72USvrnFei8iCXfsh5NwsS+m8E495epHl
-X3ogURjnq70ysuamGNoASXxSbI/eqZNOJkLs2KiNUdxZmIHwjiEjgAMuwDnkE9dq
-s8ocGLxZIKTBrACVf+SnSVSeBiJbh+rqtoGwXGHDLVIqsbp+lQUlI2Ii0Fivw58=
-=HTUA
+iQEcBAEBCAAGBQJS4M4CAAoJECo/aRed9267ZzMH/15dXRiJlP4fXjSpjknCU1WV
+daWx6diZ1piB4MH3/OQuyfZtUNreowrt+SW9urJVokHy+ZbQ8jXoSy5o0r5ugpEr
+GyixWDaXWi6GIqxfH9YgbgD5ZYoQKfaZC+Lz9xC6zHUd6CwazEmdDzAyjbtBBLpk
+mo2oaDDUYrsXOMsW8bi0MS2oIxmlMnzjrHKSUii5Ume2kPAOmFQGUEat6IZyvo4m
+bZhfIoKkt+OTdDCd8FMN19PI7MSki+574vVih6H1yP1Zu4JBEccn9Hkv0ifDq29r
+eDkAJhzQWdWGE6eCUhPD6S4++0Q5E27TE6IfttuSgd0PJwU76V0SqsFhaSyKICU=
+=hp4F
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/ccsm/ccsm-0.8.4-r5.ebuild b/x11-apps/ccsm/ccsm-0.8.4-r5.ebuild
new file mode 100644
index 000000000000..8bfe76d903d7
--- /dev/null
+++ b/x11-apps/ccsm/ccsm-0.8.4-r5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ccsm/ccsm-0.8.4-r5.ebuild,v 1.1 2014/01/23 08:08:38 pinkbyte Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+DESCRIPTION="Compizconfig Settings Manager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/compizconfig-python-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
+	gnome-base/librsvg
+"
+
+# missing icons and text fix, bug #487106
+PATCHES=( "${FILESDIR}/${P}-pygobject-glib-fix.patch" )
+
+DOCS=( AUTHORS )
+
+python_prepare_all() {
+	# return error if wrong arguments passed to setup.py
+	sed -i -e 's/raise SystemExit/\0(1)/' setup.py || die 'sed on setup.py failed'
+	# fix desktop file
+	sed -i \
+		-e '/Categories/s/Compiz/X-\0/' \
+		-e '/Encoding/d' \
+		ccsm.desktop.in || die 'sed on ccsm.desktop.in failed'
+
+	# correct gettext behavior
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd po ; echo *po | sed 's/\.po//g') ; do
+		if ! has ${i} ${LINGUAS} ; then
+			rm po/${i}.po || die
+		fi
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	#set prefix
+	mydistutilsargs=( build --prefix=/usr )
+}
diff --git a/x11-apps/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch b/x11-apps/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch
new file mode 100644
index 000000000000..9b325af7f341
--- /dev/null
+++ b/x11-apps/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch
@@ -0,0 +1,16 @@
+Fix missing icon and text with new PyGObject
+Gentoo bugreport - https://bugs.gentoo.org/show_bug.cgi?id=487106
+Patch by  Small_Penguin <dark.shadow AT gmx.at>
+
+diff -Naur ccsm-0.8.4~/ccm/Utils.py ccsm-0.8.4/ccm/Utils.py
+--- ccsm-0.8.4~/ccm/Utils.py	2009-10-14 03:05:30.000000000 +0200
++++ ccsm-0.8.4/ccm/Utils.py	2013-10-05 10:16:10.050030522 +0200
+@@ -184,7 +184,7 @@
+         if has_focus:
+             self.unset_flags (gtk.HAS_FOCUS)
+ 
+-        ret = super (PrettyButton, self).do_expose_event (self, event)
++        ret = gtk.Button.do_expose_event (self, event)
+ 
+         if has_focus:
+             self.set_flags (gtk.HAS_FOCUS)