Convert to distutils-r1.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 29 insertions, 42 deletions

diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 850260afe88b..0666eb32f7fd 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.29 2013/01/04 08:23:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.30 2013/02/09 19:16:01 floppym Exp $
+
+  09 Feb 2013; Mike Gilbert <floppym@gentoo.org> tortoisehg-9999.ebuild:
+  Convert to distutils-r1.
 
   04 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> tortoisehg-2.6.2.ebuild:
   Use official upstream tarball.
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index ace6b934c275..865c782d377c 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -10,23 +10,13 @@ EBUILD tortoisehg-2.4.3.ebuild 1733 SHA256 c9ce919fd0a7302e857d9f9255cacdf6f53a3
 EBUILD tortoisehg-2.5.1.ebuild 1624 SHA256 1a4b538b73a0404e9264de5ef9ea4f0b5e5245a2d37e95c6a7df2ec13f90350d SHA512 d7b1f946e2dd223357b6e7637327310eb410da83d2659218e05885882e57453ef57b5c18df0b9893183e4c1d658b8248793375d2bab4eed41ea39e2890b21e6e WHIRLPOOL 7d6327a45a14e65808d5a64a7b34d2acc2ee9c3479f2716b825b58be0adc65e14fffcfb29ecb2021a8db0a79664f30097083c018570faa045fd8fb5791ba7daa
 EBUILD tortoisehg-2.6.1.ebuild 2097 SHA256 2d03c4b6151b0a71c978a5c02efb931ade16964c842949574d1432ec985de9c5 SHA512 c2b3a1c3c1fb0c15b86a74ade0d2f53847222f94d2017a67713beb17d6ee0b557dd1da405d2e92ccac57e4cc290c78865031bfb4e3cacc14c321047e3047275b WHIRLPOOL 0c80c09513621d3bba189b5b072759397b0a726aa381b23d223bcbae1ccaf920e018afa3268c76eab961f6f6db500ae7cc1a20ff78e67d28ee087e4c1771cae4
 EBUILD tortoisehg-2.6.2.ebuild 1820 SHA256 f0a2a8d67866e72224ef49329a28efb245d53f434298b564f9837cee44add253 SHA512 4ad5d090dfd3e42734e2f8278883f6a7b6b067da65edfc6fb95369877a185e1531cb66f056cf533add35f01c970fce25319b21fb4d79caccf0be2f3e4f113136 WHIRLPOOL f344266e152175f908d8772955972d686246dabe626d63803bb05a6276f0b2bcbe948755746d6d1a03315817a78c66c3cea7bb8338e5f6de8a9594e6dea5c7bf
-EBUILD tortoisehg-9999.ebuild 1815 SHA256 07af3ea0806ffed1135e95e0811c135a8f55194cf3d3ff69a43ad93c3dcebf24 SHA512 46126a172e0a8b3a384cbe549e4b2547c34cc8680f2be936406868943e23b8a0e019e17a6fb74e646faf9c888158b8d7bef70fb9654114507f3774a62a5f0708 WHIRLPOOL b3fc2a36fa079122551ea38e2e2ddda6cce3418c95aa8744c24b3b50f8e78706a3aa6d6877183d1078012b10a6feca090cebc33e65e5c4632a237edd34e0bb39
-MISC ChangeLog 4872 SHA256 0451df0fdd241584d5765c4d9d4cc76dc2e48482a0b06fc70620587c3187e455 SHA512 0faf2499a23248fe4762297ce79a299d6a3ee75218d257ef0c83bc45e89881295bc35fcd93f694257b5a5891d01e7ea8d9fbfc3296a27e7ca025afe8b19ecedf WHIRLPOOL da3db26ef071debc9d68eaa131209bdba935f09afa2a6390be11da75faca33c283a193863210eba0805294a7dd5d873f800d249ce9cb7416069891ce155565cb
+EBUILD tortoisehg-9999.ebuild 1879 SHA256 b9473ee26ba04c4f38b0e89c9b511a1b7167db0834d35927391db7b9ce327f27 SHA512 9c161010ff323263362c5efcf77ce9c46b14227bcc1cdf38a845c451f71fbb1d8c1122ba3dcc28388503a3fa19d3f620d492c236df050c82cb5aac63dd2ec0eb WHIRLPOOL e531ff989c14c530a28d56ce86dbda8aa6c393f699088d51f51c0d539efba62c74edd710582a864bbc08d65ec837aadb9c1e5708f6adfc5efda04bbe07e2f65c
+MISC ChangeLog 4968 SHA256 4a1e42e5b2ae433562727f6a8381ecbe5795fdc098a9f16d17860541f32d7d9c SHA512 f15db2520dd9abd98908a503ed9652dc03b1713b83d434c8a0fc4462bd93b249caa6171fae9883530554f180456f6763e764e9b02909358105dae01fefa88625 WHIRLPOOL dd0b71ce293f49575d99b8b7a94d338f514ac1a42bf8eb198f151c96ee4d83b37c6ee2ff7e25ad0b649d460012f1430bf89348cf062ac8bcff0120c242edf046
 MISC metadata.xml 330 SHA256 d7ad48468c73b97db8462532efe7a2b1858883ed765e9c62b60dd9ab51fe9793 SHA512 6ea38fb93b6f671785062726c2a62ed042d270475e7657763bcda1ccd94ca8fa14396c7e0fde65ed8b827638d0a190e0c0699673359a5bf95e4fa965d6ca8e4c WHIRLPOOL 2dd5a5d00e461b1e47c674a185554b25bd28b923167f877d0a097c498a8f652a1302c18f5a475b9b0ca7b028184635a76e3ea03789fce2e4a82b8ed55ce7081a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ5pGeAAoJEPiazRVxLXTFsscQAJwyuzpsiS3B4aM+Ez5Tlhu6
-wQmJb4La6/CXtmqHJn59aIA2UuZhQb/ByD7np/1UEphox+7t7MHl1mnJFo/tMxWL
-F60SvxZIvGr/k/icq4WO6uZBzaCkpqHuxjUf9qJaRxJdHJShw5Mq5L3GEnYXlQmT
-3m4FcItXRLvQGbfh7XUNXPxUMjDDRg/JnQW2tIN716x8EDuLRV48Kf8wMZ1Y61rz
-OSamBi7OHpxHhK29SACq1HR505RNnbWQSwPYB++/wouA7pQ5P+TZ2/AiUlSrUeJ7
-fleeqJxH1iX3I2GUywLzqvB9tv7av8FfI0CQ4niN9C7LWzoZcRX+oHd5aP2g04TB
-wpfT/NvWwaxpeAPKcZqyX7GUBkDsIpf7dvMAUXQfiWXvOxGrLRGz3pnPe5rNODDm
-tLzReh8c3QtwI317/HKgWDeLgZnW3HOh4q93q5kGYc//12xWjdT/hvtmRx1HDD6s
-q9/YvMdHwznxd5bwbt1FNJphbdffO0qKW8rWpNOc1/HjhKAFjjZaxOHsy/eaTJ8O
-EEStc1puE/GVwATiEhEkELpHKfg22BAmWPtzdkLXpVkD60lBEpI/7x5K/3ahbF0E
-uGHbjJl3pr9z9W3gsqTrUTtQ/VW5TOLWp6sESwCtvHRWxdCSB/jF3cFxsOcBa8dU
-2eev+7119jDvgnyrvPML
-=E4X/
+iF4EAREIAAYFAlEWoHIACgkQC77qH+pIQ6SWCAD/Z0ldSO5FQM2JjkMqDyCSIEGe
+g6Dli82/KAGYGDNQlzEBAMZYkXir1dTX+vzSBpH4HuzL1raF/LqpBY7DR/qh+Azb
+=3AbF
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index a66ed5713814..44a573f82e8c 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,14 +1,11 @@
-# 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/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.13 2012/11/24 22:37:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.14 2013/02/09 19:16:01 floppym Exp $
 
-EAPI=4
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*"
-
-inherit distutils eutils
+inherit distutils-r1 eutils
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
@@ -17,6 +14,7 @@ if [[ ${PV} != *9999* ]]; then
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
 	KEYWORDS=""
 	SRC_URI=""
 	HG_DEPEND="dev-vcs/mercurial"
@@ -30,16 +28,19 @@ SLOT="0"
 IUSE="doc"
 
 RDEPEND="${HG_DEPEND}
-	dev-python/iniparse
-	dev-python/pygments
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/PyQt4
 	dev-python/qscintilla-python"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
 
-src_prepare() {
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
 	if [[ ${LINGUAS+set} ]]; then
-		pushd i18n/tortoisehg > /dev/null || die
+		cd i18n/tortoisehg || die
 		local x y keep
 		for x in *.po; do
 			keep=false
@@ -51,28 +52,21 @@ src_prepare() {
 			done
 			${keep} || rm "${x}" || die
 		done
-		popd > /dev/null || die
+		cd "${S}" || die
 	fi
-
-	distutils_src_prepare
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		emake -C doc html
-	fi
+python_compile_all() {
+	use doc && emake -C doc html
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	dodoc doc/ReadMe*.txt doc/TODO
-
 	if use doc ; then
-		dohtml -r doc/build/html
+		dohtml -r doc/build/html/
 	fi
-
 	newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
 	domenu contrib/${PN}.desktop
 }