Migrate 9999 to distutils-r1 fix bad header commited to 2.2.0.1

(Portage version: 2.2.0_alpha179_p5/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)

3 files changed, 17 insertions, 33 deletions

diff --git a/app-portage/mirrorselect/ChangeLog b/app-portage/mirrorselect/ChangeLog
index 70137df485a8..0401827b7a30 100644
--- a/app-portage/mirrorselect/ChangeLog
+++ b/app-portage/mirrorselect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/mirrorselect
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.118 2013/06/16 16:14:09 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.119 2013/06/16 16:50:41 dolsen Exp $
+
+  16 Jun 2013; Brian Dolbec <dolsen@gentoo.org> mirrorselect-2.2.0.1.ebuild,
+  mirrorselect-9999.ebuild:
+  Migrate to distutils-r1, fix bad header on 2.2.0.1.
 
 *mirrorselect-2.2.0.1 (16 Jun 2013)
 
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
index d80fc4480916..1682452f0429 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild,v 1.2 2013/06/16 16:50:41 dolsen Exp $
 
 EAPI="5"
 
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index f8a04f4735fe..597fc24215ec 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.3 2012/12/16 06:12:56 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.4 2013/06/16 16:50:41 dolsen Exp $
 
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.1"
-PYTHON_USE_WITH="xml"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+EAPI="5"
 
-EGIT_MASTER="master"
-#EGIT_BRANCH="master"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE="xml"
 
-inherit distutils python git-2 prefix
+inherit eutils distutils-r1 git-2 prefix
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mirrorselect.git"
+EGIT_MASTER="master"
 
 DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
@@ -25,33 +22,16 @@ IUSE=""
 
 KEYWORDS=""
 
-# Note: dev-lang/python dependencies are so emerge will print a blocker if any
-# installed slot of python is not built with +xml.  This is used since
-# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
 RDEPEND="
-	>=dev-lang/python-2.6[xml]
-	!>=dev-lang/python-2.6[-xml]
 	dev-util/dialog
 	net-analyzer/netselect
 	"
-#	virtual/python-argparse"
 
-src_prepare() {
+python_prepare_all()  {
+	python_export_best
 	eprefixify setup.py mirrorselect/main.py
-}
-
-distutils_src_compile_pre_hook() {
-	echo Now setting version... VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
-	VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
-}
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	python_convert_shebangs -r "" build-*/scripts-*
-	distutils_src_install
+	echo Now setting version... VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
 }
 
 pkg_postinst() {