Use Python 2 (bug #316987), delete useless "gtk" USE flag, improve usage of gnome2-utils.eclass.

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

3 files changed, 52 insertions, 13 deletions

diff --git a/x11-apps/simple-ccsm/ChangeLog b/x11-apps/simple-ccsm/ChangeLog
index ceded4ae055e..a5eeffed1b9d 100644
--- a/x11-apps/simple-ccsm/ChangeLog
+++ b/x11-apps/simple-ccsm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/simple-ccsm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/simple-ccsm/ChangeLog,v 1.10 2010/04/03 05:28:03 jmbsvicetto Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/simple-ccsm/ChangeLog,v 1.11 2011/04/11 20:14:39 arfrever Exp $
+
+  11 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  simple-ccsm-0.8.4-r1.ebuild:
+  Use Python 2 (bug #316987), delete useless "gtk" USE flag, improve usage of
+  gnome2-utils.eclass.
 
 *simple-ccsm-0.8.4-r1 (03 Apr 2010)
 
diff --git a/x11-apps/simple-ccsm/Manifest b/x11-apps/simple-ccsm/Manifest
index 1340b0868e0c..76e160f46b5a 100644
--- a/x11-apps/simple-ccsm/Manifest
+++ b/x11-apps/simple-ccsm/Manifest
@@ -1,5 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST simple-ccsm-0.8.4.tar.bz2 62423 RMD160 b1733b2fa5c20718ff73a364da3c918f9d07d600 SHA1 92509689c463d34eb3b7aed5a357d99d46d74ad8 SHA256 15b24408be48f1e3c69735362dd65ea6b3ddded80e63b87ec40268e2f0f652a3
-EBUILD simple-ccsm-0.8.4-r1.ebuild 790 RMD160 4e4fe9639d8823d8116c5542a60097e8dfa1b26d SHA1 d630648b84b08d36bbb0d6675e74ddb97b44f9b1 SHA256 9cc39a5360e0a10690e79c2dfa7f66e139d93480dbdcd7e0863061aeed3eee83
-EBUILD simple-ccsm-0.8.4.ebuild 780 RMD160 1d5610f4f4f86c70b2b4b1cce26282ca5a90c4cd SHA1 31084fcc4576047ad64e6b5205820b717207008c SHA256 317528e8d524831f323bb2aba281b09ca8062381dc88d0e362482412198b7aa2
-MISC ChangeLog 1949 RMD160 37041f88681665c6a40aa5320b492278a1a6adb5 SHA1 ef004ddc19a6a5bd37cbcbfb673b309fd105f5e3 SHA256 b8c1090b741011dbba8d28d4643fb7be87340a65d5bd21d99fb3a60fbac0775a
+EBUILD simple-ccsm-0.8.4-r1.ebuild 963 RMD160 d03cb363d59e7b7c92f77a7df0993189dc0bdc93 SHA1 2cdec8835dff8eb47c860e76b941b92feecd4140 SHA256 65989e7def1792abc45c21582869e0b60503f72e5e300a57b6c83165dcc3e358
+MISC ChangeLog 2152 RMD160 35bff81acd46970e6b9cd73af67715ee5586e7f9 SHA1 a382b318535f128b4fb33ee935b0e672b36df4c9 SHA256 271be69c49202ef4649e7727097bc4d450d18bc88508906e668ef2d70bad7292
 MISC metadata.xml 255 RMD160 a1a8eef7cff85e1b1ffb1d293c9773bb349037a7 SHA1 2313ef46b82544b3daedd71fa70bfa6d9947ad70 SHA256 a4c3551cf0b0da4948c63ed8757a9b6ad8b9f0942c36a06dce78ed6b4eccf5ff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNo2FDAAoJENgZr6v6gHY0ojwP/j4YOC/bXWWTCo+JwyHLXUpa
+4Ecksxj5+S9qTgqK3hTYgGNGmHKFay0p3dRz5E7VqXsF8ioXvMzBACIJfo00kd1b
+34JK32HBviMQ8nbySqXXnmkkg1nEBzKWLMuly/iYdg6Ca6+ZQORScrxAPAJuEzkP
+bzS7cOPmOEVQLknFVLMzZiAaCc1UGAVo16OXEsL6AUdJFL2y5yWdS1zWanbIiqn7
+cZndiWdG8k8Eq7RH6fOZvCuiEbeAZEN4QHnFrL4/F/NEVH5zsqEtiTR3NXSuf1iU
+bP1CkBZG07WX5LtObfag14Ohxv2NVj1VoPZwzkhMSnOba15X5Bz5noutpXWVCL0s
+7FVWMcoLBEzYh1CIzpA0dTYaBoS90obrHdDMONJil2lqdJGBClUupH3vlKgL8SzL
+XL2gQcFZ2SW4EF/9H3VioM8vFIeca6b+xEE/jiDlv061BDWN9zDYL0EkMXA9Uc3X
+Zz/ajtroCnCdw6/EMppA9ziP+qMY/faxyk+Uym63TLK//yfQn6ar2WkEtiDp/Cwl
+wDUhH2Q/CUqxOQ/WPlzejnQ27KIaOyGStyADuaS6WV1Fi93D6hi6vZnT4X0EC9RM
+UllB+MWdKOX3BjYKDAt19QEMNU6zn/UD/kITxlUx9lWL9EMqocTL5XLMgYVKaQ/A
+UHMOfRDMehE3iphA6x6k
+=oupP
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/simple-ccsm/simple-ccsm-0.8.4-r1.ebuild b/x11-apps/simple-ccsm/simple-ccsm-0.8.4-r1.ebuild
index 0496c15fc804..dbf206f42da3 100644
--- a/x11-apps/simple-ccsm/simple-ccsm-0.8.4-r1.ebuild
+++ b/x11-apps/simple-ccsm/simple-ccsm-0.8.4-r1.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/simple-ccsm/simple-ccsm-0.8.4-r1.ebuild,v 1.1 2010/04/03 05:28:03 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/simple-ccsm/simple-ccsm-0.8.4-r1.ebuild,v 1.2 2011/04/11 20:14:39 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit distutils gnome2-utils
 
@@ -11,14 +14,19 @@ SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
+IUSE=""
 
 RDEPEND="
 	>=dev-python/compizconfig-python-${PV}
-	>=dev-python/pygtk-2.10
+	>=dev-python/pygtk-2.10:2
 	>=x11-apps/ccsm-${PV}
 "
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_compile() {
 	distutils_src_compile --prefix=/usr
 }
@@ -27,9 +35,16 @@ src_install() {
 	distutils_src_install --prefix=/usr
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
-	if use gtk; then
-		gnome2_icon_savelist
-		gnome2_icon_cache_update
-	fi
+	distutils_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	gnome2_icon_cache_update
 }