Port mercurial-999 to EAPI 5 and distutils-r1 eclass, bug #465630. Thanks to Nikolaj Sjujskij.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

3 files changed, 67 insertions, 57 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 2d5a055c4ea6..ab7d8dabbd54 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.118 2013/04/08 18:38:49 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.119 2013/04/17 08:52:32 maksbotan Exp $
+
+  17 Apr 2013; Maxim Koltsov <maksbotan@gentoo.org> mercurial-9999.ebuild:
+  Port mercurial-999 to EAPI 5 and distutils-r1 eclass, bug #465630. Thanks to
+  Nikolaj Sjujskij.
 
 *mercurial-2.5.4 (08 Apr 2013)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 806c6db4ff0f..f446bb23d4b8 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -11,17 +11,17 @@ EBUILD mercurial-2.4.2.ebuild 4205 SHA256 e83115c31a5188e8eaac882ddce4e5a319bfd6
 EBUILD mercurial-2.5.1.ebuild 4228 SHA256 06dc4888ea8c98dca366eb0261fd701e6a7935785f7b2f0e50826646506816a4 SHA512 cf1e1d5ac1f870b03dcea347866dd868658d2e945a872a404a9e59d0423bbe920eaae0619e1becbeaff07610a5ff4c6c255c35abdcdfb865043ec8f1366cb127 WHIRLPOOL f07047cb50a7b8952d48d4bd5f9482a2a6b03ce121dc46efdf5e921292bbf49c77e9b9ba181b0179f669eba34d65466c9d549df6878089b84efb06b075be5641
 EBUILD mercurial-2.5.2.ebuild 4326 SHA256 92086b20417cce2940d6c66d389d0120cccd3a12a156f1f4b86d3a2723694470 SHA512 f30d41bfcfe5c133dafbfbd2e33f4776f68aa0b8f2d4ea34763f418eac3b31cd0c373eae692544df3e5aa54616bb8149883cea39d3b94f7651a58961072c9ef2 WHIRLPOOL e896d22b02e025642362f3f0517f9aaed1b25e397c0782dbe8fef9b558e2bab08d92675d8fb3a654d620d6ae7f3644bc8015ebdd5729f37459fa37c736fda2f0
 EBUILD mercurial-2.5.4.ebuild 4434 SHA256 802a0947aaa8f6e007544d287adf4799cde8cbb649675a44c0626804b3e8f6e3 SHA512 59dbd1704c47309c035b92180681a15ebf1fee604b355303694e8a08d8c3bd2b62cfa3d6a14aaa4e24a58584bc26ce0fad68fd7d881cd29b40490a9a4c51d67c WHIRLPOOL e318ff12ef41f8f04ba2eb95e9b40c28d156cffcb7237ea2db56c7c4eae82d698bb3cdf3e0ef8fe6aa44834e4347a1964c73ac268dc4aa683950843a8871ec54
-EBUILD mercurial-9999.ebuild 4165 SHA256 656cc9be8410a98f80330f942476e4e7b3950d4831de83a5ea0b9a41bbba8197 SHA512 223d8d2968487ea7b19b79c47b72e8100000f969aa0d655844e5c4eb2b69af4d1990441a0d6dbb3035f590d6faf5f2110b7934b59de52d8ab3d73b7ffe38c48b WHIRLPOOL 0e0b29b4c799c8ce3d336251745a5da0e638c5b2c86369295d804c41f74b4065a9b19d0b8d56e0c2fb8fd69d353f9ccc3e3b1476253bbfdcc4fc5cdd7a414d61
-MISC ChangeLog 34417 SHA256 6d505f196ffea1d882b53ff99c2686fae95580389b2ba8418c081313dba03b49 SHA512 2c704f5bd8e24e8d9979bc13524761863e2f627dde8ca3a3df100032862dc40c25513f0f52f687104b0e8c543573283e753abcdee4d9a02b17a714fe55b71049 WHIRLPOOL 765fb46ff0c1d92e64269f112d9ad8e3963f5f11c27d267e96328aac293200340456267c45c975316fda4a90cf796ff9cc0c359cb79f0cae343a0c9947a31548
+EBUILD mercurial-9999.ebuild 4260 SHA256 5b239abb781847009e4b6b6116ef33dec80c038426621f278dd36e2ebaa83cca SHA512 021945d82dbb6ff4121be9a12fce2c610b241f90a74058b21bec0dc248646081acfc4ed44b29866fb7d1fb19aa9a30ec6a6efb4198965f901cef010f1daf1b6e WHIRLPOOL ffce0e96c7976f12c34dd66443dcee25705d70ebbcda10869c0dd3d95467c81b0b248bcf38af3006717dc2054e6980870081574564abe32605734e027df9c129
+MISC ChangeLog 34592 SHA256 a4d270695d09b6966a514ff66755a300f4cf565810388ef5516d7b6df19ccb8a SHA512 56296e850bfe1bb1590d24eb9ce0ad5a7bd2921dbb3a77527272b06e15413e2cb6822ef87f1d3e88f9482c069f0b32bb473a4bbbc790d52dbe661a26d969adea WHIRLPOOL 451f53278cfa35fdb3ac9e23f1a30510c99f734e63c3b439756288fc0ddb137b07a61a1ba8940e74d46f72fd4bf28579ce01f0f81788d7e9ed31ac3ba0a7a63b
 MISC metadata.xml 704 SHA256 76c0566b9a503099f6cf40750ffe09726dcf338e24378e780fb932cbebe1f0c1 SHA512 21a386ecca4b3d337c69019e750752df3f06137de8b8b27199b6218d4a5253bade522c5a9183340dfea61333bd783c14d60ff3f3e46cb58121c7100449722bfd WHIRLPOOL 7f64d01b4d31ae756e63e16be8add1bcba9a073961663ae481be883a5fcc6e3473d5da5f26d524502ade4eba0b2f3692934ed63f1e41bfa8d8b6a0a1532e11b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRYw7uAAoJEAmJmMX429re0tQIAJznMTU4YxsAYAZ9aDnN8nJr
-qtw/xiBR/jOXF4dfN61NX1mjftxdMyizzgwORBYGgyAIqLXkHTxM8eDgDiI4u7SW
-XBQWBhYvcE0Ysc8z3kf4l3VDN/4HEfB/8XQI93kXQzPxEmOe10xepH9z4jcWUCjv
-jMWdxPBSExgXX6StWsu6nnKPbhM/HgtjzUKAvXNlpu3lYD6TyV+aLhuF+FWp/xZw
-kDRWj6R5IvGJEMD8OqL6K2QnCMlkk8b66kofRwRn9rDsGXy4i7f5o7u6+KxSD0cv
-rPZQZyoPYmG/7YZBPakhblXanFJ39gf1JRXJciXzrv2LDm+sCCxI6ztxKDsBr/0=
-=kL5Y
+iQEcBAEBCAAGBQJRbmMKAAoJEAmJmMX429rewQAIAIR3P1ZUrteutuZW6zKDyjjr
+FTYBcpNjgcq8h+davh1zRrWyDmn9AFTchOIdMkxumHOvCvE0C1jtnxIJxjd+YsXx
+qDUcktQjK7Vd5S06InaiYaJ6XjTMws2dFU39uCJfCUqW4fXqNQ1VVFWVLXxWPU4V
+IMMLvJU8u+PS3b4cWU8xSuy3dnhhFMh9faqultg62jVY5VQ77+e2GbI+awY3jHGR
+sJMXTP7hL9LJSoX9Y8qxVRTzWqzUCaakxTIlMvBDZSG9DzR1xRMliiqg+Dvm3K9G
+dY6uBYu4hepIb4fAIrlltKHz5iRmPe23kDpFfYpAa061nmUH0v48kzFe+KJgozg=
+=CzWp
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index a114b0dff5be..c97beaad4c57 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.18 2013/04/08 18:38:49 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.19 2013/04/17 08:52:32 maksbotan Exp $
 
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+EAPI=5
 
-inherit bash-completion-r1 elisp-common eutils distutils mercurial
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial flag-o-matic
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://mercurial.selenic.com/"
@@ -20,86 +19,87 @@ SLOT="0"
 KEYWORDS=""
 IUSE="bugzilla emacs gpg test tk zsh-completion"
 
-RDEPEND="bugzilla? ( dev-python/mysql-python )
+RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )
 	zsh-completion? ( app-shells/zsh )
 	app-misc/ca-certificates"
 DEPEND="emacs? ( virtual/emacs )
 	test? ( app-arch/unzip
-		dev-python/pygments )
-	app-text/asciidoc
-	dev-python/docutils"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
+		dev-python/pygments[${PYTHON_USEDEP}] )
+	dev-python/docutils[${PYTHON_USEDEP}]"
 
-PYTHON_MODNAME="${PN} hgext"
 SITEFILE="70${PN}-gentoo.el"
 
-src_prepare() {
-	distutils_src_prepare
+python_prepare_all() {
 	# fix up logic that won't work in Gentoo Prefix (also won't outside in
 	# certain cases), bug #362891
 	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON}" setup.py build_mo || die
 }
 
-src_compile() {
-	distutils_src_compile
-	make doc || die
+python_compile_all() {
+	rm -r contrib/{win32,macosx} || die
+	emake doc
 	if use emacs; then
-		cd "${S}"/contrib || die
+		cd contrib || die
 		elisp-compile mercurial.el || die "elisp-compile failed!"
 	fi
-	rm -rf contrib/{win32,macosx} || die
 }
 
-src_install() {
-	distutils_src_install
-	python_convert_shebangs 2 contrib/hg-ssh
+python_install_all() {
+	distutils-r1_python_install_all
 
-	newbashcomp contrib/bash_completion ${PN} || die
+	newbashcomp contrib/bash_completion ${PN}
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg || die
+		newins contrib/zsh_completion _hg
 	fi
 
 	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS README doc/*.txt || die
+	dodoc CONTRIBUTORS doc/*.txt
 	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
 
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
+
 	if use emacs; then
 		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
-	dobin hgeditor || die
-	dobin contrib/hgk || die
-	dobin contrib/hg-ssh || die
-
 	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-		              *.el mercurial.spec)
+	                  *.el mercurial.spec)
 	for f in ${RM_CONTRIB[@]}; do
 		rm -rf contrib/$f || die
 	done
 
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
-	doman doc/*.? || die
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
 
 	cat > "${T}/80mercurial" <<-EOF
 HG="${EPREFIX}/usr/bin/hg"
 EOF
-	doenvd "${T}/80mercurial" || die
+	doenvd "${T}/80mercurial"
 
 	insinto /etc/mercurial/hgrc.d
 	doins "${FILESDIR}/cacerts.rc"
 }
 
 src_test() {
-	cd "${S}/tests/" || die
+	cd tests || die
 	rm -rf *svn* || die					# Subversion tests fail with 1.5
 	rm -f test-archive* || die			# Fails due to verbose tar output changes
 	rm -f test-convert-baz* || die		# GNU Arch baz
@@ -122,16 +122,23 @@ src_test() {
 		rm -f test-repair-strip* || die
 	fi
 
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}" || die
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
+	cd .. || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
 	use emacs && elisp-site-regen
 
 	elog "If you want to convert repositories from other tools using convert"
@@ -144,6 +151,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	distutils_pkg_postrm
 	use emacs && elisp-site-regen
 }