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

(Portage version: 2.2.0_alpha10_p10/cvs/Linux x86_64)

3 files changed, 39 insertions, 7 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/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
+}