From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Tue, 6 Jul 2010 16:55:16 +0000 (+0000)
Subject: Use Python 2 (bug #308321).
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4da3eecd71de539f18db1e4f90531825742490ba;p=gentoo.git

Use Python 2 (bug #308321).
Package-Manager: portage-HEAD/cvs/Linux x86_64
---

diff --git a/app-cdr/cdemu/ChangeLog b/app-cdr/cdemu/ChangeLog
index b151474c3802..6ba0cc73f7c0 100644
--- a/app-cdr/cdemu/ChangeLog
+++ b/app-cdr/cdemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdemu
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.21 2010/02/01 20:22:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.22 2010/07/06 16:55:16 arfrever Exp $
+
+  06 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  cdemu-1.2.0.ebuild:
+  Use Python 2 (bug #308321).
 
   01 Feb 2010; Peter Volkov <pva@gentoo.org> -cdemu-0.8.ebuild,
   -cdemu-1.1.0.ebuild, -cdemu-1.1.0-r1.ebuild, cdemu-1.2.0.ebuild:
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 8e6deed7d18e..fe81df84bad7 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,4 +1,4 @@
 DIST cdemu-client-1.2.0.tar.bz2 94066 RMD160 18c3dbb47cd384fdaa028dba3d22f78b3ee7c5d3 SHA1 ceee8c59ee09c034ce8e4c8561e10a7c8fe7ddd2 SHA256 e92c422e9283837e5d8a72b7815d127262d73c63e043675994f73e4bda227d33
-EBUILD cdemu-1.2.0.ebuild 1028 RMD160 0b17c6613944bb7c90cada3d0022e8ad8e95234b SHA1 eeb44866396437164194cfecc015cebe38c567b8 SHA256 daf47810917d172e67e7bde13c8ff3e41ca2d7dd2bac756169ea948374991f1f
-MISC ChangeLog 3331 RMD160 86a30132fa0346aaef0701504917d326202b2316 SHA1 27f4f89889f907286b7e02a3851bc73f304d3e3a SHA256 62543ac72702135b696fee206ab2725c07ef3c3790f37e9c58246120d910dee0
+EBUILD cdemu-1.2.0.ebuild 1021 RMD160 9301099cac73c5705293c1965754080486fa2d5f SHA1 b6cbde3fc991d3922b6ab3cf80a9b37efb3a3bba SHA256 cd27f17d471852488359347842a5f01f7b906c0379748390dfb4fa5d4d4527fc
+MISC ChangeLog 3462 RMD160 ffc3d3d46b8c2cdfab1a56a845ce2796b63c0acd SHA1 000210e508b67ccff3cdfe2caecad2596f1ff1b7 SHA256 c5de5267669b2a411d3e6caa70945a16044d06421ca0e37b0ae6237a91db8a6f
 MISC metadata.xml 225 RMD160 461e7786d6f2b4ad0796cdbd8da127d2aa1d9c88 SHA1 7e14b4551dd441a467b812e3b4c4f3fd795e5a58 SHA256 1c4c96d3ac062761d9e938c233751ff32b23e2c21aff1e38df6a37ffa0e97cb1
diff --git a/app-cdr/cdemu/cdemu-1.2.0.ebuild b/app-cdr/cdemu/cdemu-1.2.0.ebuild
index fe1764e51436..5adbc03e82e0 100644
--- a/app-cdr/cdemu/cdemu-1.2.0.ebuild
+++ b/app-cdr/cdemu/cdemu-1.2.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-1.2.0.ebuild,v 1.3 2010/02/01 20:22:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-1.2.0.ebuild,v 1.4 2010/07/06 16:55:16 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 
-NEED_PYTHON="2.4"
-inherit multilib python
+inherit python
 
 DESCRIPTION="Client of cdemu suite, which mounts all kinds of cd images"
 HOMEPAGE="http://cdemu.org"
@@ -23,6 +23,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/cdemu-client-${PV}
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	# disable compilation of python modules
 	rm py-compile && \
@@ -35,10 +40,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize "$(python_get_sitedir)/cdemu"
+	python_mod_optimize cdemu
 	python_need_rebuild
 }
 
 pkg_postrm() {
-	python_mod_cleanup "/usr/$(get_libdir)/python*/site-packages/cdemu"
+	python_mod_cleanup cdemu
 }