Migrate to distutils-r1 (bug #483062, patch by mgorny).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 65 insertions, 45 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 3e018b77a76a..352915eca137 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.170 2013/09/12 22:37:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.171 2013/10/22 19:46:57 radhermit Exp $
+
+  22 Oct 2013; Tim Harder <radhermit@gentoo.org> pkgcore-9999.ebuild:
+  Migrate to distutils-r1 (bug #483062, patch by mgorny).
 
   12 Sep 2013; Michał Górny <mgorny@gentoo.org> pkgcore-0.8.6.ebuild,
   pkgcore-9999.ebuild:
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 55db83d6c0e6..3b3cb75149d0 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -3,25 +3,17 @@ Hash: SHA256
 
 DIST pkgcore-0.8.6.tar.bz2 446652 SHA256 05104f683bcad4fb477152c950d8ba21d8a59fe783f05e901f684c66f2c9488c SHA512 320562755c21cb1d749ea011d22313f8c09855375ea72c94910f45202d8a92bb75a0fa709a360c702c16e404dbec9d14d5ed3aff6687084418dc742a4c901955 WHIRLPOOL 611ad52a8015379de50593580c35eb1f175fd0fe3c219548911e7008c58a52185128840950d17c3fd730659196db79550762f029c8c0c199eaba8aa07a8bf9d9
 EBUILD pkgcore-0.8.6.ebuild 1038 SHA256 ad31ecc8706a5659aaee8fd8bdec045a141b94d49650bc44dd158148468094ae SHA512 8fb3b91c655ea688f68fdaff2964e45a6f4e1c6872a062023786b88fe4d413a7b0189fb6d57b65fa34b31ead6272780bc992925c4fc8ba6e401ad9df1be6690b WHIRLPOOL 09119805a58075503fb6120c1b21dfda9c637ba68d0b67080723f9d657bfadfb82362c64eedcdb6a46dad750bf90060bff7fd5a80ff6cb569cbadfa122455009
-EBUILD pkgcore-9999.ebuild 1149 SHA256 f5c9878baa1b1080d617bc041fd97f4ce1392f2d7088d21c518756310a2b38e3 SHA512 2c6b1a9fce9bbb2bd42e04f9fe4f25378add8fa996414c98d13598587c56c6a788cd6c50efe01eef18f8d46aa6f0ed1ca9bf6e4926847d9b2a4178dae7a2fe43 WHIRLPOOL a1c089a8b79d927c103cd894affb5b83aa5ec10c73cc78c4f69d9b6e24d06f18fabe63c2ba2e08edf5ab9bc1a102e67ae6fbf6b1e656c1aaa08a02e1de314230
-MISC ChangeLog 29284 SHA256 f8d973e57ae2ed4cebce86a7931735a4d1c3e9e204763952c3c93f4d899c4b2c SHA512 28302a3b053323efb325215fd5912a3bc2bf5cb42d318531b555a9f99327a78cef8020b8f3f390b7b10188df1c10bd53217adda119e2778c06ab7b06aac2ec9c WHIRLPOOL 25a0048d1d65594df50aa0360d65cefbdfdda546783b68a3b97911325d451d4efd85bdf6a9353937bce6591102b508a265c466f8ddc630036b4dc684fd69975a
+EBUILD pkgcore-9999.ebuild 1633 SHA256 ea7133ffbdc3b579f31e6ae4612ff9c1c31ec509a58c2bcaa4f59ae79bfd4d97 SHA512 fc2ce2134fc37a00cdb327e04969f77be24a9ae492681c8b9c0c4b24e3282c884c6e76b2aec4df0ab6357cc6f0cddb2486056817a3a7874601485a00dde76f37 WHIRLPOOL c1956929c6c58fbcd7d9ea1c552692151f7d4a03b810de3374765e7c1b810b70cbdaa0425d29b4d79758ed04991f5aa49a9f413033112028f1d961a40553c76f
+MISC ChangeLog 29416 SHA256 c9bdac99237b30ac011a568b8ddc5ff4f77a02b9bbca175d1c014fede9ba1ea4 SHA512 8d03a3020940d57ab83d51fc5969146b24ec52f0255585702d103fe0c2c40f113ea43d85eb520fe458f77e34e26e87b86e79420eecb9a45693e9002f19d211ba WHIRLPOOL 2ad554bf851faf58fe4a3fac321f8f1ae3171448c3152b064d61a29a4837a106eadefc7c41640f0cd616e4877e53d6935006564031f29085772ab346599add00
 MISC metadata.xml 393 SHA256 69e5553d453dc5a012f338fc7dc63104276c39f9ddfc53c2eee332fecbc1b8a8 SHA512 cce86dcd80973a363dd3613ba35ce1e68445c07313516a481e34a76896d5c261160236a8818fea5b995dda39e7d7358af833b43c38b3a2ef91e044257ea7e00d WHIRLPOOL 33b0d6aaa0497bf9d66f4284142a62621bdfbaa17de90fffbcb29197427625b617c2fdc7cf5977fcb622ae08da13eb72cf953d0f8a36d10b2d9d61814ee02263
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSMkI4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOALkQAMzd6o1ZsCuC93gfmNSTSILo
-G2lS346oTKGPSfLBTka+5fTZ7MCfmSTvW741Tp4x1mugxeOnBxgCjdDE+ut+vAgI
-5QEDoOM1foihGj4M/au1TtJo5w40r5qvBywZ17bVpTs5yg72xXuaaTbLqjIwbLma
-l3nKOpChhZ8PBKJXFcOqQ4Dnc7BQ/OKPjkencY+EKwH8jdvb91FYUiTieKHTb13Z
-jtFeYGLjp6WFQMH6wQeFrGvXap5R87Fs/ZabeQtg/+YXdNfExsqbpiMHg0OIwRqj
-RnP80JwlM7o2M4fyvKV0l/ujVF+PHwonJfXrT4mZo1E0BDESrYwoj5B+9kZLC9tJ
-wBY6arcii+Gz5pJ1CYWbLPkVlSGNFjJEeMLBSVFs9lcFBZlIwoBDN1BzkVdva66D
-TUz09DMa9gSACuEZzJVXM9/te2rJeK2u35yMJFI2VOuKbEBcRp3q7KtZ82eAfE1p
-f+jHGguoX2+/01PE8CciSr7eOQCB5gZeWWLHL7P184DCZLGlyUsctMsnq/4y/U/u
-1hH1bESrkF0faW7k6ZVk/AAY3taYi+8r8Ise3UM2wOexVJWh+lR559kBxtCs+cno
-qETnKApz/Yyyx51k1RK0A7mEGl478TL6DNHmOELnLXuda9QQd+Whhb/djo+wa5eB
-AQtvrMc7x2vnYOrdwC9g
-=YU2N
+iQEcBAEBCAAGBQJSZtY2AAoJEEqz6FtPBkyjl6QH/0c1N02f9XHAoSxY5XaCNi5H
+v4QNuVZ/WwhdlsW2+J2XvbIm5cpWjSU5H90r2ZoM43bjBYZEyWfcXD7eyWx1Avq8
+drpj1k1GsmSUKwDn+ErO/RhcXtrfCok8QOsaflFcoSBupdy1pxSR6N6UPeQLohAw
+3l+3LiSBQ5aS35QT3kfj0xjwaC+pCOl5XZHS/a5O6FR0Nhy3A65+K6KHgX677X3m
+7t/vKRYICF7HmCdgxwOi2b5GR1WQdsbHOBOxg8uXwgYfTSvgra+NV5SuVb5k4roR
+S0wcFpPJWOClW6C+sLoWjQXZLE8UM+wgyaTGTssjt9JNr1QUd5mhyYqMYEk+N+0=
+=yHeh
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index a236ba2a6572..a8ce8a94c10c 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,53 +1,78 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.12 2013/09/12 22:37:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.13 2013/10/22 19:46:57 radhermit Exp $
 
-EAPI="3"
-DISTUTILS_SRC_TEST="setup.py"
+EAPI=4
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+inherit distutils-r1
 
-EGIT_REPO_URI="https://code.google.com/p/pkgcore/"
-inherit distutils git-2
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://code.google.com/p/pkgcore/"
+	EGIT_NONSHALLOW=1
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
+fi
 
 DESCRIPTION="pkgcore package manager"
 HOMEPAGE="http://pkgcore.googlecode.com/"
-SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="+doc"
 
-RDEPEND=">=dev-lang/python-2.5
-	=dev-python/snakeoil-9999
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
+RDEPEND="=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/sphinx
-	dev-python/pyparsing"
-
-DOCS="AUTHORS NEWS"
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]"
 
 pkg_setup() {
 	# disable snakeoil 2to3 caching...
 	unset PY2TO3_CACHEDIR
-	python_pkg_setup
+
+	mydistutilsargs=(
+		build
+		--disable-html-docs
+		--disable-man-pages
+	)
+}
+
+python_compile_all() {
+	esetup.py build_man $(use doc && echo 'build_docs')
+
+	# symlinks generated manpages into source root
+	# dead symlinks are tolerated
+	ln -s "${BUILD_DIR}/sphinx/man" man || die
+	ln -s "${BUILD_DIR}/sphinx/html" html || die
 }
 
-src_compile() {
-	local x
-	distutils_src_compile $(use_enable doc html-docs)
-	# Find the first set of generated manpages, and symlink
-	# those into the source root.
-	for x in ${PYTHON_ABIS}; do
-		ln -s "${S}/build-${x}/sphinx/man" "${S}/man"
-		break
-	done
+python_test() {
+	esetup.py test
 }
 
 src_install() {
-	distutils_src_install $(use_enable doc html-docs)
+	mydistutilsargs+=(
+		install
+		--disable-html-docs
+		--disable-man-pages
+	)
+
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	local cmds=(
+		install_man
+	)
+	use doc && cmds+=(
+		install_docs --path="${ED%/}"/usr/share/doc/${PF}/html
+	)
+
+	distutils-r1_python_install "${cmds[@]}"
+	distutils-r1_python_install_all
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
 	pplugincache
 }