Use Python 2 (bug #329483).

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

7 files changed, 80 insertions, 28 deletions

diff --git a/dev-vcs/gitosis-gentoo/ChangeLog b/dev-vcs/gitosis-gentoo/ChangeLog
index cc6b190665e9..39c214ea24af 100644
--- a/dev-vcs/gitosis-gentoo/ChangeLog
+++ b/dev-vcs/gitosis-gentoo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/gitosis-gentoo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/ChangeLog,v 1.4 2010/07/22 15:59:54 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/ChangeLog,v 1.5 2011/04/06 19:39:15 arfrever Exp $
+
+  06 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gitosis-gentoo-0.2_p20080203.ebuild, gitosis-gentoo-0.2_p20080711.ebuild,
+  gitosis-gentoo-0.2_p20081028.ebuild, gitosis-gentoo-0.2_p20090515.ebuild,
+  gitosis-gentoo-0.2_p20100721.ebuild:
+  Use Python 2 (bug #329483).
 
   22 Jul 2010; Robin H. Johnson <robbat2@gentoo.org>
   -gitosis-gentoo-0.2_p20100718.ebuild:
diff --git a/dev-vcs/gitosis-gentoo/Manifest b/dev-vcs/gitosis-gentoo/Manifest
index 48bc52d62aa8..66cb1152ec9f 100644
--- a/dev-vcs/gitosis-gentoo/Manifest
+++ b/dev-vcs/gitosis-gentoo/Manifest
@@ -1,12 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gitosis-gentoo-0.2_p20100721.tar.bz2 37330 RMD160 807056f758be0a0be6449045dd01b2e6c6a9c702 SHA1 b2418fb422bfc4f8c0525fb362f2cd8eb564398f SHA256 447de9239bc8ac4a56cf074afd1f84abccf7358b46f5612f2084e5da6a812868
 DIST gitosis-gentoo-20080711-800ac5b58a60de070a10cafce609f28fc2905691.tar.bz2 35787 RMD160 927b52e3d59be5f80cf8a441081501f6955a0c82 SHA1 221e41f47ffa5b995554607edbfcf9cc2efb6b03 SHA256 78119bea1dfa3b6a7aa3aa13095939f1bb8b4740b2e3cbda3bcd95efabd81320
 DIST gitosis-gentoo-20081025-acf867e8cd12f31dcf0f9fff92f3a3c34912b751.tar.bz2 36630 RMD160 4449b991dd6706c57de0b4726c102adc79197859 SHA1 54683810416a1a115d096bcd5cb0f1b829b62402 SHA256 e84e9d40ab11c156b30ca5d781c4e6621ece0ef18e9140b9714e75373d8fa402
 DIST gitosis-gentoo-20090515-1d768c5b87bbbe7ab1f3356c98943ed099bd40f3.tar.bz2 36988 RMD160 79122dd7aaeb1ef8fd23f2d2c09e69ef28698591 SHA1 9b22baee81244069002e0660e6d2ed7d24cd98c2 SHA256 6010681dcb8aa9aaa6ed720494daf6d366ed12eb6dc65044ceb1a924fa305743
 DIST gitosis-gentoo.git-20080203-231e601545d0a09d84d3c5c2786d774f56fe9217.tar.bz2 35661 RMD160 f33f36e6984b9e601d5f632b3ee53b5617351612 SHA1 aad1cfa691274317e610f3621ead49812431f55a SHA256 7672209eb2fbf6960967ba20372bcb269ae2b539c628e6e099f9989884f34c21
-EBUILD gitosis-gentoo-0.2_p20080203.ebuild 1238 RMD160 52b195fea82d890bf15d0c8587cc5ad55f97299e SHA1 70627b6c0f3954fc92759b37426edb02e3510caa SHA256 10e3123a3ab4b6b91bf03ad8f92f837f73ae3272a4ab2d1efe4722deeb989e55
-EBUILD gitosis-gentoo-0.2_p20080711.ebuild 1237 RMD160 8822cfdd4a776bb4bd49700f1539c12e7c247f81 SHA1 203b1863576af7c6750a94a42e1c7927447eed26 SHA256 646de657d14bffa6b2f66921e5c321d78818a55d90d6d9d26aa189c6f3388571
-EBUILD gitosis-gentoo-0.2_p20081028.ebuild 1237 RMD160 0dfc049690e02c03e718f86a472a7f4baa11de24 SHA1 9537cfd3beecc546ed473185d4be77d818e8a9d8 SHA256 afd448484e0f71117a16cfab789b2937a131c6973deb31fcba7ceecbaa80e40a
-EBUILD gitosis-gentoo-0.2_p20090515.ebuild 1416 RMD160 170e1105c9d69a17fd84a04b9d05f77c26da7773 SHA1 19e7c51b6932adf80d9fecc114e69d4478c1d309 SHA256 a68d536ab2fd8ee18d257a23f7f430ade209d7ad0a313694c218803593835dd6
-EBUILD gitosis-gentoo-0.2_p20100721.ebuild 1547 RMD160 f736323693aea656264da8ea591491a03f00e780 SHA1 2374f5dedf011222a3376e48ed5911c3918ce2fa SHA256 15bdfb4935b915b22400990639b5c85f34ab36979578e4d55546efb03db5c6bc
-MISC ChangeLog 3037 RMD160 4667f192b7f187f2ec65849073f48208fc701dc0 SHA1 39a39b91581dd7d849280e73370858d101fe4ce8 SHA256 62366f1303964500ddf69e6d14e76b46c8ce4403158a4b3a8cc72f39f8769c3f
+EBUILD gitosis-gentoo-0.2_p20080203.ebuild 1339 RMD160 4fef3df4f926d0818ae67c6e2a5afdffecf40139 SHA1 f19f1b8acd7cd366ae16c50820240903fcedc33e SHA256 2158b357b568c5e39892e55fdb63d819072440ed5889c96a8fe8c25662611900
+EBUILD gitosis-gentoo-0.2_p20080711.ebuild 1338 RMD160 c6203728f0042b6013cdc089a41bc13f365214b3 SHA1 a8445982984a02cb5075b47d7a4f23e6685e0034 SHA256 3c2c332bf8c4da5d4641e6bb15cccc8f811b16231853ccf23f05b991781a44df
+EBUILD gitosis-gentoo-0.2_p20081028.ebuild 1338 RMD160 03e94f9f18af9bc6d64d55adb06c81797c5b3181 SHA1 557e97e6170b4241722ab831d38335405b99d627 SHA256 0a60b32ab14ea1ad033b54864f6d63d2b061eb612f7308b4c13a1a391ad89e32
+EBUILD gitosis-gentoo-0.2_p20090515.ebuild 1494 RMD160 407a57ced58ab19d6e2995234a4c10759f0df983 SHA1 ce28c437bb1b110156885e40b1d6317afcb813aa SHA256 f0f0d44f2aa82e9a262f0a6fe4c8fb3b151ffba4a8d2fedb054ffcf97f697d4d
+EBUILD gitosis-gentoo-0.2_p20100721.ebuild 1617 RMD160 2aaa614369a1c322d36e08be7bd2e0665e0ac7a6 SHA1 a5019c3dd26a891b80f5a9bd2d35cda223cad33c SHA256 789834ce0c04b47fd0c880c122ab99938c6156949ad40ea9e3e9d6922b1b6528
+MISC ChangeLog 3333 RMD160 14f52e9ba3eca928326f3568de754c2ea3de3e41 SHA1 74f6d1087e99a756878414ada09e06cee604056e SHA256 941eacd225eb8470a2b2c637250d46ea5d635cd1d210b75b07cc068dfd1acc75
 MISC metadata.xml 377 RMD160 74cab863bd42cd43f0c07276c4be096e5fa38291 SHA1 c05576f5fc0e51708a151d73f8db0f04d3d36f8c SHA256 ea6084f3ae1cc0247c58bceae2259e7eb800e94f39678c2d004cfd4ae6c42b70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNnMF0AAoJENgZr6v6gHY0upkP/RTmDDg2EMmXLcm9NAFNgV78
+0Bza1GSmGX/PpqxkBp8h6INQDIbsAoI7ROgEIvu9lWTIWhFSkUN1RmoVRVk+0aLD
+Jh2ocbLtgkmnNK3+LI+WFatrwQ4oKGW460Vk64bWLDpUSaRdxnlogs2/adb+mphR
+sqWrOVGaEcimLYN70fUqRKuPcXIM0O7l85bFPKNPsMgfAEalSAleVTFL7zwF/98q
+nPBNvQ78IPOShI5ICKB9G30Df8zVqIctouHkv4zKxqT4EQaIlP7esAhFlMRJ4+6z
+EbPdyr/uXwWOZMurxmpEWZIFV4jxyDTDIcnepI29v3XDiJyRXssqgfiiFFXPu0Ks
+BkSBUduMQ+P6P6QlaRz+QaUmXebDFqiiKbCJ0X5hwkes8aeGKfoNSAESCMKs4iYM
+Rtr49i1fSdgWRTQ190c5Nv2fXn7x6pPfUZZCZXSkQke5dZTZTlisEGM4YTFNOiEl
+O9ea6XZQIoABj1e+i8GtqGObMm0vlxJI5p/n5JCbR5FFKNqHmiaNtIprclQN100G
+URjStomcuTly0MLkrC7ea9fN+HJ9VKfSc0dkEzsS8YrrKM9LcTHcVhloPYQKPNwi
+8MjosS6QMKoxPJtBb6Oz4wmVst1lHRGpMdGH45ZmK5TuN17dufUA+ZtsoROS0VWJ
+gWW9YxuNnXgvGz7h7Ba2
+=V9Pf
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080203.ebuild b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080203.ebuild
index 6ef3ec8df9c5..8da70b851d29 100644
--- a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080203.ebuild
+++ b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080203.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080203.ebuild,v 1.1 2010/06/19 16:19:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080203.ebuild,v 1.2 2011/04/06 19:39:15 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit eutils distutils
 
@@ -23,8 +26,12 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/gitosis-gentoo
 
 DOCS="example.conf gitweb.conf lighttpd-gitweb.conf TODO.rst"
+PYTHON_MODNAME="gitosis"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
 	enewgroup git
 	enewuser git -1 /bin/sh /var/spool/gitosis git
 }
diff --git a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080711.ebuild b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080711.ebuild
index b14883eba83a..cd605ee5f2ce 100644
--- a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080711.ebuild
+++ b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080711.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080711.ebuild,v 1.1 2010/06/19 16:19:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20080711.ebuild,v 1.2 2011/04/06 19:39:15 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit eutils distutils
 
@@ -23,8 +26,12 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/${MY_P}
 
 DOCS="example.conf gitweb.conf lighttpd-gitweb.conf TODO.rst"
+PYTHON_MODNAME="gitosis"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
 	enewgroup git
 	enewuser git -1 /bin/sh /var/spool/gitosis git
 }
diff --git a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20081028.ebuild b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20081028.ebuild
index 3ae093567262..1c506caab63b 100644
--- a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20081028.ebuild
+++ b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20081028.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20081028.ebuild,v 1.1 2010/06/19 16:19:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20081028.ebuild,v 1.2 2011/04/06 19:39:15 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit eutils distutils
 
@@ -23,8 +26,12 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/${MY_P}
 
 DOCS="example.conf gitweb.conf lighttpd-gitweb.conf TODO.rst"
+PYTHON_MODNAME="gitosis"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
 	enewgroup git
 	enewuser git -1 /bin/sh /var/spool/gitosis git
 }
diff --git a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20090515.ebuild b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20090515.ebuild
index 5c763aa573ef..48d1cd524da6 100644
--- a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20090515.ebuild
+++ b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20090515.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20090515.ebuild,v 1.1 2010/06/19 16:19:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20090515.ebuild,v 1.2 2011/04/06 19:39:15 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit eutils distutils
 
@@ -23,17 +26,16 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${PN}"
 
 DOCS="example.conf gitweb.conf lighttpd-gitweb.conf TODO.rst"
+PYTHON_MODNAME="gitosis"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
 	enewgroup git
 	enewuser git -1 /bin/sh /var/spool/gitosis git
 }
 
-src_compile() {
-	pwd
-	distutils_src_compile
-}
-
 src_install() {
 	distutils_src_install
 	keepdir /var/spool/gitosis
@@ -46,5 +48,6 @@ src_install() {
 #}
 
 pkg_postinst() {
+	distutils_pkg_postinst
 	einfo "If you need to actually use gitosis, you must unlock the git user."
 }
diff --git a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20100721.ebuild b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20100721.ebuild
index b80e6893a743..918ce05664dc 100644
--- a/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20100721.ebuild
+++ b/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20100721.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20100721.ebuild,v 1.1 2010/07/21 15:47:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitosis-gentoo/gitosis-gentoo-0.2_p20100721.ebuild,v 1.2 2011/04/06 19:39:15 arfrever Exp $
 
 EAPI=3
+PYTHON_DEPEND="2"
+
 inherit eutils distutils
 
 DESCRIPTION="gitosis -- software for hosting git repositories, Gentoo fork"
@@ -25,17 +27,16 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 DOCS="example.conf gitweb.conf lighttpd-gitweb.conf TODO.rst"
+PYTHON_MODNAME="gitosis"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
 	enewgroup git
 	enewuser git -1 /bin/sh /var/spool/gitosis git
 }
 
-src_compile() {
-	pwd
-	distutils_src_compile
-}
-
 src_install() {
 	distutils_src_install
 	keepdir /var/spool/gitosis
@@ -48,5 +49,6 @@ src_install() {
 #}
 
 pkg_postinst() {
+	distutils_pkg_postinst
 	einfo "If you need to actually use gitosis, you must unlock the git user."
 }