Revision bump: migrate to distutils-r1 eclass. Drop old revision

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

4 files changed, 61 insertions, 47 deletions

diff --git a/x11-apps/ccsm/ChangeLog b/x11-apps/ccsm/ChangeLog
index 280782053016..06d98f9d0055 100644
--- a/x11-apps/ccsm/ChangeLog
+++ b/x11-apps/ccsm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/ccsm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ccsm/ChangeLog,v 1.26 2012/08/30 17:41:06 pinkbyte Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ccsm/ChangeLog,v 1.27 2013/05/07 15:13:32 pinkbyte Exp $
+
+*ccsm-0.8.4-r3 (07 May 2013)
+
+  07 May 2013; Sergey Popov <pinkbyte@gentoo.org> -ccsm-0.8.4-r1.ebuild,
+  +ccsm-0.8.4-r3.ebuild:
+  Revision bump: migrate to distutils-r1 eclass. Drop old revision
 
   30 Aug 2012; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Remove myself and proxy maintainer from maintainers
diff --git a/x11-apps/ccsm/Manifest b/x11-apps/ccsm/Manifest
index 967215d7602c..fc5d2c6b99b3 100644
--- a/x11-apps/ccsm/Manifest
+++ b/x11-apps/ccsm/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ccsm-0.8.4.tar.bz2 475864 SHA256 46b9da032cf29e71aec0823799861d926937ad41f4edea3be718ac6a8532c16d SHA512 1991f25ca4f04363006bacd5267cb54c7e24817b263996c7172f58180ca0acf94050220938d4fa87081c93fde23ca0b44a333f9b675950e4c5187903a03692c5 WHIRLPOOL a6730161d07a8c5158700566df31653a7adcf117e791a5b4076b67b68a4ce4c7ff3f88a5710c1fce29d38eccbbade095710f5a73277c54809e5431b3c52c1fe0
-EBUILD ccsm-0.8.4-r1.ebuild 867 SHA256 a7155bbcc595de49db0ca3ec39952baee446d5eaf76748622d38e3868797f1a2 SHA512 b1265538004ea2b3afb8e25cb3f63982b8aa7632cc5337fb77074db1cf306a055f97b78ffe4628820cdb6fb015c35657569b0af860e3d0e406e55ce72200c2e2 WHIRLPOOL 97bb6de739c5e89aeebdd643fed86b15a1197e0e2869fd0e3a74f56779b609cdf630352d848962b7e86ba07c5c9b139fb51ad670b45a1617351d15b435b06323
 EBUILD ccsm-0.8.4-r2.ebuild 801 SHA256 64e3e9a03237f0ae5a2d2dbd1bad07e388c568b5cabf1e089d6aec365fa42187 SHA512 63a87003bce26dbaa0ee87e526810874b292921dd8480bf2f0a13d3a015c07e93f9db2fb96119e5184f9d4b2beb76d14d87d3ee1931f220b1bf92b03b8f32ba0 WHIRLPOOL 59e28becc92af5a636231814db595809738d82a2eb5fd5469d57279fd767dfc2e48596b1f4812869ff0a2b867c2b4265e582777aa29d1dbf481f690fec52bf75
-MISC ChangeLog 3854 SHA256 91d370cf96e8b2ace622d1824d7926f7bc79542d882ae72379f43231368ca256 SHA512 252a400ffe88c165a04c3f264b5fc2960a65e75d01a0090b67ffdeb1959ebdf1d332482cf8c549856fec3756ba7907874fbbbd6bb84c8a65c3aef15100e5dbff WHIRLPOOL e80fa07be5a3f5304bb72a312bf30c19d8c216f22cf293a8ebc5f49f7813224adc1a8aeeaa1b8d576062166b4cd4fb9b1bebc57ecbbe3ef50dacf39d498a1b58
+EBUILD ccsm-0.8.4-r3.ebuild 998 SHA256 f11edbe24a66ee1f091ba35d7e019472f93eb4bc6c128d5de1d4c2ba83eba549 SHA512 4badeacf5d71f557705b464a7fc2589a5fe2992672481ca9bd130d84f8b687600e5a08040abf0927267908a3553bcb9a018089096100cf54ef9767ef95d2ebd0 WHIRLPOOL a2451c0d31d4069f472c1548f931844ac57d1ddde0971b5898bd0a511f0bf2c0e49d90cf1a427e2084248d32643ecaa059c8047b339808d89ef5edb743ad51a3
+MISC ChangeLog 4050 SHA256 89947651b1651b3a315fc25da2c49f80cfcc2fd6dbff7224d07a54462942da1f SHA512 5f72758bf6fcb42df59759d95f89b2aab44ef6935554e3a2541e4fe9a7335184738adc2b8d990a250e62a57c1248027e18924458d28b321364531d7daf5fa0ea WHIRLPOOL 2edf1b4d939c1df81719c725c24c5a2fd0e29e0eb4bc6b6ab230b2970b009f23404acb8cc9fab1526ac33bb788cd0784c446bd5aad406265858f8762d459d7fc
 MISC metadata.xml 244 SHA256 d6952c0137edd0f6d760c8fa028a7afe43fb48950e3481177b8fba498f50e76b SHA512 75b6309504f527151591f608260a7e4f082457240282c4ce7f5539ac4f6aa4ec6ae415f9c327915b43f1ca15b0d2197ae889e7a15701d918585b92ef21659ca3 WHIRLPOOL 144cf04f3600391eee4956f8749a9258a6dab042be38f989d9ce4c8a817478024d99658d65498e8e4fd5f012a97f33d6b918d790072ccfa9d5fd72a9886513c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRiRodAAoJECo/aRed92675p4IAKQwW9pMFAbhl+4nQN/4qsG4
+fmPNChUNEMlEY+gkxPSEDBpYUCg2biLnK6dGSpFzU5icUgGyLrkrQrYwd4Hb5CCo
+oT8ovztaSZYxlEumIY6i4NaoVzM6/KyAeG7iiI1vsZkzDFJ0O6F3P3TBmcvKC67O
+JCBsSOFqFXTZR3eIXZwHkLufiHyJmzr92NYDo6O8RslAvQpiVYyDK0aQUr0fIuv3
+2UGjXSXLOoZyb2rK44nxLX70Cp9wst5xY42/1WfVLwXImAFh3bagwTKg9CYPv5Vn
+oadsvlVF5QYeUf/IVVK0Ywmz3Gg/n4jmuP0jXsYpMOMegGObAzQY0bs5wD5eO7A=
+=E6kd
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild b/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild
deleted file mode 100644
index ec6e45ce35f4..000000000000
--- a/x11-apps/ccsm/ccsm-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.5 2012/08/29 10:14:37 naota Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils
-
-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"
-IUSE=""
-
-DEPEND="
-	>=dev-python/compizconfig-python-${PV}
-	>=dev-python/pygtk-2.12:2
-	gnome-base/librsvg
-"
-RDEPEND="${DEPEND}
-	x11-themes/hicolor-icon-theme"
-DEPEND="${DEPEND}
-	dev-util/intltool"
-
-DOCS="AUTHORS"
-PYTHON_MODNAME="ccm"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_compile() {
-	distutils_src_compile --prefix=/usr
-}
-
-src_install() {
-	distutils_src_install --prefix=/usr
-}
diff --git a/x11-apps/ccsm/ccsm-0.8.4-r3.ebuild b/x11-apps/ccsm/ccsm-0.8.4-r3.ebuild
new file mode 100644
index 000000000000..cc4c793752c6
--- /dev/null
+++ b/x11-apps/ccsm/ccsm-0.8.4-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/05/07 15:13:32 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
+"
+
+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'
+
+	distutils-r1_python_prepare_all
+}