Use Python 2 (bug #311775).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/app-portage/etc-proposals/ChangeLog b/app-portage/etc-proposals/ChangeLog
index 3637e4a023364899ee5113ced497a91536dead31..53352ecd1d18ce5a41ab7e50f10ce0cc2ab88458 100644 (file)
--- a/app-portage/etc-proposals/ChangeLog
+++ b/app-portage/etc-proposals/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-portage/etc-proposals
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/ChangeLog,v 1.11 2010/03/09 21:08:40 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/ChangeLog,v 1.12 2010/07/06 17:58:20 arfrever Exp $
+
+  06 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  etc-proposals-1.4.3.ebuild, etc-proposals-1.4.3-r1.ebuild,
+  etc-proposals-1.4.3-r2.ebuild:
+  Use Python 2 (bug #311775).
 
 *etc-proposals-1.4.3-r2 (09 Mar 2010)
 

diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest
index 7806bc78240b0cbb03302b3bcd4c99628d135019..8125d192bb2c10af45aef3627253af0197a17e56 100644 (file)
--- a/app-portage/etc-proposals/Manifest
+++ b/app-portage/etc-proposals/Manifest
@@ -1,6 +1,6 @@
 DIST etc-proposals-1.4.3.tar.gz 53696 RMD160 991d77b5e63c5a61189e2f8e6add0f7c56b3915e SHA1 1137556dc28a5e03bb37f06a691ae780daed988e SHA256 42c2b117e141d0e69a8717e98e9ddc9dffd2ed27533c6296e87e810c631e71c7
-EBUILD etc-proposals-1.4.3-r1.ebuild 1139 RMD160 614ea6c5500de3f4f025200c3eb9f220c0ee8f70 SHA1 60d72b8cd29632876daba525121383ca3c02d83d SHA256 2b282628918e0b7b091e76f642b447bf9596d9e4d4d1ddf9f99a057491cdce85
-EBUILD etc-proposals-1.4.3-r2.ebuild 1375 RMD160 b3fac78f2ead1bb9b5c6cc8f6599863a8b8f1a9c SHA1 62668e24a9041f31b7c6fbd1a014028ad05ebd55 SHA256 57b65b94ce5ccec690422533389ae343b408de0ebb7607b960e11823b779ee1c
-EBUILD etc-proposals-1.4.3.ebuild 1118 RMD160 c02d6ee3b4712aeffa6354eb441b4ef744caf7fa SHA1 10d7fd7fa9440382f272b909700886e601eb0761 SHA256 d67601eba692ff0649b04ba18562e1b94496a2484ff8277c10c87858bf89f414
-MISC ChangeLog 1956 RMD160 11fdbc320ab62e4bdfa7e8f6700c67c3e1b741ea SHA1 6986c891606cc770434e465ad5f034d16b59dde2 SHA256 f4e170e9cbac3c8b82b1d44531afb223e610b004abac2108aa46f802d4b57706
+EBUILD etc-proposals-1.4.3-r1.ebuild 1141 RMD160 c2445e41610304c2a7807b3e7cc669e23bf80cbb SHA1 bf226dae8d21217c0f7e557086287994aeea81c1 SHA256 24eec3cc6348d044370d694cc3a036d8cf888976d2af786207faa62a978364f8
+EBUILD etc-proposals-1.4.3-r2.ebuild 1502 RMD160 ffab4c7f323e3f623287558788044d40c4687f2e SHA1 f74773adc3dbfed1eafecc775dea9cd6fecf078d SHA256 e1026ba828b0272062cad1c41f36f1875ad05112e1ea85da1d96914c105fa5d3
+EBUILD etc-proposals-1.4.3.ebuild 1124 RMD160 7d32f0d07873a9097489a947da16625240c5094e SHA1 6919b64f663215be3d420e8680436a034a8dce37 SHA256 d6ca2e6e5345faae56103815aa2188a333e4cc7e1acc238a38ded408a8bb1908
+MISC ChangeLog 2158 RMD160 e6e6247acb96d2d710c615917430a5292c3ab7eb SHA1 5141a61af4fa70e9ccc9f0219af794517f752a69 SHA256 0640706b9994f778fe577fb3b7c6101f55a4f0a12a19d80bd605518fd9b60e2d
 MISC metadata.xml 256 RMD160 7ba7e5dfce95b75377cf4a30745dcc4dbde95086 SHA1 f94dd3063baa0db02c98317f36dc243ffd2bbb50 SHA256 f4325cb611d6c7b7e2f87f8c89d325eb086df309605b53de578d6f8bc62b07ae

diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r1.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r1.ebuild
index a3ca7043c8a2dc13f77ba60df3d8984b556d80f1..a5e70fa5b6d709e1af253c885304895aebdf4730 100644 (file)
--- a/app-portage/etc-proposals/etc-proposals-1.4.3-r1.ebuild
+++ b/app-portage/etc-proposals/etc-proposals-1.4.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3-r1.ebuild,v 1.1 2009/07/10 21:37:11 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3-r1.ebuild,v 1.2 2010/07/06 17:58:20 arfrever Exp $
 
 EAPI=2
 
-NEED_PYTHON="2.5"
+PYTHON_DEPEND="2:2.5"
 
 inherit distutils
 

diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild
index 9e1c28370510d3c0a705374ef0a1192b7cd32797..fa5c272caf4b36eb172b2cc66391b4175a729b2c 100644 (file)
--- a/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild
+++ b/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild,v 1.1 2010/03/09 21:08:40 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild,v 1.2 2010/07/06 17:58:20 arfrever Exp $
 
-EAPI=2
+EAPI=3
 
-NEED_PYTHON="2.5"
+PYTHON_DEPEND="2:2.5"
 
 inherit distutils
 
@@ -21,6 +21,13 @@ DEPEND="gtk? ( >=dev-python/pygtk-2.10 )
                qt4? ( >=dev-python/PyQt4-4.1.1[X] )"
 RDEPEND="${DEPEND}"
 
+PYTHON_MODNAME="etcproposals"
+
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+}
+
 src_install(){
        distutils_src_install
        dosbin "${D}"/usr/bin/etc-proposals
@@ -32,6 +39,7 @@ src_install(){
 }
 
 pkg_postinst() {
+       distutils_pkg_postinst
        elog "The configuration file has been installed to /etc/etc-proposals.conf"
        elog "If you are installing etc-proposals for the first time or updating"
        elog "from a version < 1.3 you should run the following command once:"

diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3.ebuild
index fb179803fa128a488301e064abbc0db40a28dc74..25b74b878bdd24d88bb01c69e23beeaaa5914031 100644 (file)
--- a/app-portage/etc-proposals/etc-proposals-1.4.3.ebuild
+++ b/app-portage/etc-proposals/etc-proposals-1.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2007-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3.ebuild,v 1.5 2009/01/12 20:37:32 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3.ebuild,v 1.6 2010/07/06 17:58:20 arfrever Exp $
 
-NEED_PYTHON="2.5"
+PYTHON_DEPEND="2:2.5"
 
 inherit distutils