Use Python 2, use python_mod_optimize() and python_mod_cleanup() (bug #312197).

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

4 files changed, 42 insertions, 10 deletions

diff --git a/dev-libs/newt/ChangeLog b/dev-libs/newt/ChangeLog
index c633e01d2fe7..c5734cac1374 100644
--- a/dev-libs/newt/ChangeLog
+++ b/dev-libs/newt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/newt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.65 2010/08/30 23:51:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.66 2010/12/27 22:30:03 arfrever Exp $
+
+  27 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  newt-0.52.10-r1.ebuild, newt-0.52.12.ebuild:
+  Use Python 2, use python_mod_optimize() and python_mod_cleanup() (bug #312197).
 
 *newt-0.52.12 (30 Aug 2010)
 
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 04cc48b38cf0..25b375c61cef 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,7 +1,7 @@
 AUX newt-CVE-2009-2905.patch 466 RMD160 a8a9738005c782ea332de00ebfeb6fc0f7987a65 SHA1 d07a05abf3e9653b6169382939d4c82ae9c03db9 SHA256 4efb6f8d3df83e25576536110092cd1a85b3ba5bae5be7eea05f226c45542cd0
 DIST newt-0.52.10.tar.gz 170739 RMD160 d24463b61bb7bcd71a87075f02dbe1590d4d8017 SHA1 7a5a0d2251ff913c45691b7c6c1ee0c17c086742 SHA256 da0e6963ba376741d80de8b869dc014cadfc5b0d735cc4f2aa1ff902f1c92892
 DIST newt-0.52.12.tar.gz 178027 RMD160 0d34b278e72c1b1305fc110e491e3bc96b42a374 SHA1 6952115806c7b1dbc36858eb4ca0596b235cf6f4 SHA256 2ba88dc3d118daf509c58e3707c43ad57dd3415d8164054e93fe76439f348529
-EBUILD newt-0.52.10-r1.ebuild 1722 RMD160 0365aa503f8a8d65c57c57f079785b7d74adb0d4 SHA1 72ad54f44aa3cec74a972de324e544644ebb5c50 SHA256 43ff4319939bd6a057cf659bd633fc3a46ecc4c155117bb1b634c8e642dc9bd2
-EBUILD newt-0.52.12.ebuild 1485 RMD160 3631f4a8b2a281ae0e05ae683752eb7686dbd4f2 SHA1 6588c3b2db1aa4d10b36c2d978ed5ea98d32b473 SHA256 43ac099489fe1f443db4ccc746f09a5137db261c74cb3e444d06aca0a87e299f
-MISC ChangeLog 9403 RMD160 2e56fc3be1756577bf09aa67383fec24717e9367 SHA1 1f8a38a4a750136856b2e00cba3bed454132dc9b SHA256 c0437457345dbe0c2af96b43668cee05f507018ee30cfcc22fa32e501f0e0249
+EBUILD newt-0.52.10-r1.ebuild 1894 RMD160 d55fd9e982cbfcc05b0590c7dcc06af09cd4a7d6 SHA1 cdc89febb859fc3a1e1438abf6a739b26d65a91a SHA256 11309800874c9db77ba89a6a8350a29ee11577f8cc93d3a76a886f36d9d51be4
+EBUILD newt-0.52.12.ebuild 1630 RMD160 ab24d62b0682c09ff54b840e679bfa49d4fedb8c SHA1 67ac9516c47acd8ad39b3dfbacaebf7624f5c206 SHA256 5138d33aedd3bd16b7cb71de7e9744b77093f5f4b9cb27106e098034d7683fc4
+MISC ChangeLog 9611 RMD160 7003387fdc8a2cb13d982bd8f3d5e4a3b83d74f6 SHA1 6b1a9aa1f839be1db8c851a01629f2c44fa99a62 SHA256 44f8084247984caf3d17f6e0413cc7363f61f64c560b4ac46ab4d17966d0aca9
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
diff --git a/dev-libs/newt/newt-0.52.10-r1.ebuild b/dev-libs/newt/newt-0.52.10-r1.ebuild
index 6b210b0a5894..4ef17270beae 100644
--- a/dev-libs/newt/newt-0.52.10-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.10-r1.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.10-r1.ebuild,v 1.8 2010/06/02 20:29:39 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.10-r1.ebuild,v 1.9 2010/12/27 22:30:03 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit python toolchain-funcs eutils rpm
 
@@ -15,7 +18,6 @@ IUSE="gpm tcl nls"
 
 RDEPEND="=sys-libs/slang-2*
 	>=dev-libs/popt-1.6
-	dev-lang/python
 	elibc_uclibc? ( sys-libs/ncurses )
 	gpm? ( sys-libs/gpm )
 	tcl? ( =dev-lang/tcl-8.5* )
@@ -23,6 +25,11 @@ RDEPEND="=sys-libs/slang-2*
 
 DEPEND="${RDEPEND}"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A}
 	#rpm_src_unpack
@@ -70,3 +77,11 @@ src_install () {
 	dodoc peanuts.py popcorn.py tutorial.sgml
 	doman whiptail.1
 }
+
+pkg_postinst() {
+	python_mod_optimize snack.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup snack.py
+}
diff --git a/dev-libs/newt/newt-0.52.12.ebuild b/dev-libs/newt/newt-0.52.12.ebuild
index 244e7f8148e0..6d8b69926dcf 100644
--- a/dev-libs/newt/newt-0.52.12.ebuild
+++ b/dev-libs/newt/newt-0.52.12.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.12.ebuild,v 1.1 2010/08/30 23:48:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.12.ebuild,v 1.2 2010/12/27 22:30:03 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit eutils multilib python
 
@@ -17,7 +18,6 @@ IUSE="gpm tcl nls"
 
 RDEPEND="=sys-libs/slang-2*
 	>=dev-libs/popt-1.6
-	dev-lang/python
 	elibc_uclibc? ( sys-libs/ncurses )
 	gpm? ( sys-libs/gpm )
 	tcl? ( =dev-lang/tcl-8.5* )
@@ -25,6 +25,11 @@ RDEPEND="=sys-libs/slang-2*
 
 DEPEND="${RDEPEND}"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	# bug 73850
 	if use elibc_uclibc; then
@@ -45,7 +50,7 @@ src_configure() {
 	econf \
 		$(use_with gpm gpm-support) \
 		$(use_with tcl) \
-		$(use_enable nls) || die "econf failed"
+		$(use_enable nls)
 }
 
 src_compile() {
@@ -60,3 +65,11 @@ src_install () {
 	dodoc peanuts.py popcorn.py tutorial.sgml
 	doman whiptail.1
 }
+
+pkg_postinst() {
+	python_mod_optimize snack.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup snack.py
+}