Remove FEATURES test, version bump.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 149 insertions, 11 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index 1c68cd9a11db..51d728cb2fc5 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/mercurial
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.100 2009/07/07 18:51:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.101 2009/07/25 10:02:01 nelchael Exp $
+
+*mercurial-1.3.1 (25 Jul 2009)
+
+  25 Jul 2009; Krzysiek Pawlik <nelchael@gentoo.org> mercurial-1.2.1.ebuild,
+  mercurial-1.3.ebuild, +mercurial-1.3.1.ebuild, mercurial-9999.ebuild:
+  Remove FEATURES test, version bump.
 
   07 Jul 2009; Jeroen Roovers <jer@gentoo.org> mercurial-1.2.1.ebuild:
   Stable for HPPA (bug #268205).
diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest
index 7fa7a0fb4e85..e6e82439a8ad 100644
--- a/dev-util/mercurial/Manifest
+++ b/dev-util/mercurial/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
 DIST mercurial-1.2.1.tar.gz 1269393 RMD160 37c94e5ef9cdc639fe23622ddaf97b2230ec2216 SHA1 f40282bbb17fedb08b16aa7a4eeb1da7b6a6f1cb SHA256 03187464bccfbd82b78d5c55d708447181745085a62f491a206f5143376eb47e
+DIST mercurial-1.3.1.tar.gz 1770585 RMD160 1e43d8697e4d269fdc065ee82c48e1cf132f6d6f SHA1 a9537fab7c7ead501a6414d1900f46e0ae3e48b8 SHA256 ff928b557f41374974171df1b0384e33161aff97c5fe1c856a7b91bf3b154a62
 DIST mercurial-1.3.tar.gz 1768227 RMD160 20032f18a2bbe1d60969567299bb9ca3392fe6d9 SHA1 af1bfc2817e0719124593e4ec03f0056a4b2870c SHA256 f25feec95586b60b939c60a1dfc0d20d69ebe0f1eca38dc3a8edbcba5b6dfd47
-EBUILD mercurial-1.2.1.ebuild 3312 RMD160 b892b695ab0c724b2aa6ed9f1093e9eacd9d0e19 SHA1 00ca2d19809182771d94963544cfc71619971712 SHA256 fa1b450bb46b6d5d5af83f9da8b2076fc64c9f65411dc77f32db50e4016191c4
-EBUILD mercurial-1.3.ebuild 3315 RMD160 8ed8ceaeeca85c84657909643ea060c55061c8d7 SHA1 a6b7b99fd6b93239ea662a613cc00c8e9f8d1892 SHA256 675ce415eb8106e2a7c44bb48df50283dada3529e3da904da6d29d31fe49be4c
-EBUILD mercurial-9999.ebuild 3165 RMD160 3ff5b21d844377548ad5dc68950c370b9f41ef9b SHA1 145c13ffe39e573123c4276970863d8a63219470 SHA256 0655699036124e8ab44d550bc61e7d1fef69a6634b24aa86e826be3f726fd4d5
-MISC ChangeLog 14790 RMD160 3607f6e6364fa011bbffd19bd167e75264d9cfa6 SHA1 1f4b216d7dd0b3206f805ba3614edcd247d40e36 SHA256 d8ea092475b404fb32c1c25a39e559ba05f1b2e8aaeafa854abe6744b23d7b56
+EBUILD mercurial-1.2.1.ebuild 3310 RMD160 3abb4ed52612913b961359a6fc0daef44726989d SHA1 1afb3c50bc6ba54383a3117ce2a26b1bff3c8240 SHA256 e7965f3d9a24d67bc491d23bb758783c84560e31ac29f9a1adb1adf0f65f20b2
+EBUILD mercurial-1.3.1.ebuild 3310 RMD160 ff90554a4b83c4b341ab7b3889d7d80223bd7e4f SHA1 029aa80d41cef979ea70298eddc8968d032c4de5 SHA256 189606fb0975cf2266ce821f097bbf7076ee4081943d003dc586d3db04f53b3d
+EBUILD mercurial-1.3.ebuild 3308 RMD160 c18b182062ecf27e936145abf392a3baf8cfc563 SHA1 a7526c11f0af1e3ff69c808a7004488a17976172 SHA256 4e4045dc7234350dee192814fcfe8760d8bcb64c181596bd8d11d117d01ee577
+EBUILD mercurial-9999.ebuild 3158 RMD160 04718a15eb01f18430a98b79df32dd613161cb6e SHA1 93ac08665f39fd7aeca6c9d7abd3e1f78b0bd239 SHA256 d664695ed5414963e822576934cf7d65cb47462cf4250171d94a9fe17cf75f99
+MISC ChangeLog 15015 RMD160 b12b1afc9345a17bd36c7522d08e57e51da88ea5 SHA1 5b1d763bafa9335b5407cb0a919e84c8f4d43081 SHA256 cf560561eab02d9f8a3679ec48f2a08fb93f87c3cdb76081311d02ebe5a8dc10
 MISC metadata.xml 539 RMD160 fbe167f52fa1a7d5f11906d4cf04996ef2a2a31b SHA1 f30c026001c6ee934469be3deb2d9da83e0b686c SHA256 7a03917e14d17d241edbf848f5c1c8481185c3a18c7e9534947ae285f9f04fa4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpq2B8ACgkQgo/w9rxVVVErMACeOpes4vHj2joBykSkZ4ku0vMv
+rEoAnRHzDNI9W5YdnVlgbs6FMQiE/2am
+=zUCM
+-----END PGP SIGNATURE-----
diff --git a/dev-util/mercurial/mercurial-1.2.1.ebuild b/dev-util/mercurial/mercurial-1.2.1.ebuild
index 4a85a53b7df2..edf12c600f95 100644
--- a/dev-util/mercurial/mercurial-1.2.1.ebuild
+++ b/dev-util/mercurial/mercurial-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.2.1.ebuild,v 1.6 2009/07/07 18:51:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.2.1.ebuild,v 1.7 2009/07/25 10:02:01 nelchael Exp $
 
 inherit bash-completion elisp-common flag-o-matic eutils distutils
 
@@ -88,7 +88,7 @@ src_test() {
 	rm -f test-convert-mtn*		# monotone
 	rm -f test-convert-tla*		# GNU Arch tla
 	rm -f test-doctest*			# doctest always fails with python 2.5.x
-	if ! has userpriv ${FEATURES}; then
+	if [[ ${EUID} -eq 0 ]]; then
 		einfo "Removing tests which require user privileges to succeed"
 		rm -f test-command-template	# Test is broken when run as root
 		rm -f test-convert			# Test is broken when run as root
diff --git a/dev-util/mercurial/mercurial-1.3.1.ebuild b/dev-util/mercurial/mercurial-1.3.1.ebuild
new file mode 100644
index 000000000000..6738d48918fe
--- /dev/null
+++ b/dev-util/mercurial/mercurial-1.3.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.3.1.ebuild,v 1.1 2009/07/25 10:02:01 nelchael Exp $
+
+inherit bash-completion elisp-common flag-o-matic eutils distutils
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="http://mercurial.selenic.com/"
+SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bugzilla emacs gpg test tk zsh-completion"
+
+CDEPEND=">=dev-lang/python-2.4"
+RDEPEND="${CDEPEND}
+	bugzilla? ( dev-python/mysql-python )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${CDEPEND}
+	emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments )"
+
+PYTHON_MODNAME="${PN} hgext"
+SITEFILE="70${PN}-gentoo.el"
+
+src_compile() {
+	filter-flags -ftracer -ftree-vectorize
+
+	distutils_src_compile
+
+	if use emacs; then
+		cd "${S}"/contrib
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+
+	rm -rf contrib/{win32,macosx}
+}
+
+src_install() {
+	distutils_src_install
+
+	dobashcompletion contrib/bash_completion ${PN}
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg
+	fi
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt
+	cp hgweb*.cgi "${D}"/usr/share/doc/${PF}/
+
+	dobin contrib/hgk
+	dobin contrib/hg-relink
+	dobin contrib/hg-ssh
+
+	rm -f contrib/hgk contrib/hg-relink contrib/hg-ssh
+
+	rm -f contrib/bash_completion
+	cp -r contrib "${D}"/usr/share/doc/${PF}/
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG=/usr/bin/hg
+EOF
+	doenvd "${T}/80mercurial"
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+}
+
+src_test() {
+	local testdir="${T}/tests"
+	mkdir -p -m1777 "${testdir}" || die
+	cd "${S}/tests/"
+	rm -rf *svn*				# Subversion tests fail with 1.5
+	rm -f test-archive			# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-doctest*			# doctest always fails with python 2.5.x
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-command-template	# Test is broken when run as root
+		rm -f test-convert			# Test is broken when run as root
+		rm -f test-lock-badness		# Test is broken when run as root
+		rm -f test-permissions		# Test is broken when run as root
+		rm -f test-pull-permission	# Test is broken when run as root
+	fi
+	einfo "Running Mercurial tests ..."
+	python run-tests.py --tmpdir="${testdir}" || die "test failed"
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	use emacs && elisp-site-regen
+	bash-completion_pkg_postinst
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-util/cvs"
+	elog "  dev-util/darcs"
+	elog "  dev-util/git"
+	elog "  dev-util/monotone"
+	elog "  dev-util/subversion"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/mercurial/mercurial-1.3.ebuild b/dev-util/mercurial/mercurial-1.3.ebuild
index 4d297dc46327..34b50195103a 100644
--- a/dev-util/mercurial/mercurial-1.3.ebuild
+++ b/dev-util/mercurial/mercurial-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.3.ebuild,v 1.1 2009/07/02 20:09:24 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.3.ebuild,v 1.2 2009/07/25 10:02:01 nelchael Exp $
 
 inherit bash-completion elisp-common flag-o-matic eutils distutils
 
@@ -88,7 +88,7 @@ src_test() {
 	rm -f test-convert-mtn*		# monotone
 	rm -f test-convert-tla*		# GNU Arch tla
 	rm -f test-doctest*			# doctest always fails with python 2.5.x
-	if ! has userpriv ${FEATURES}; then
+	if [[ ${EUID} -eq 0 ]]; then
 		einfo "Removing tests which require user privileges to succeed"
 		rm -f test-command-template	# Test is broken when run as root
 		rm -f test-convert			# Test is broken when run as root
diff --git a/dev-util/mercurial/mercurial-9999.ebuild b/dev-util/mercurial/mercurial-9999.ebuild
index 03535e90c2d2..135a09c0cb95 100644
--- a/dev-util/mercurial/mercurial-9999.ebuild
+++ b/dev-util/mercurial/mercurial-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-9999.ebuild,v 1.1 2009/03/09 20:07:03 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-9999.ebuild,v 1.2 2009/07/25 10:02:01 nelchael Exp $
 
 inherit bash-completion elisp-common flag-o-matic eutils distutils mercurial
 
@@ -88,7 +88,7 @@ src_test() {
 	rm -f test-convert-mtn*		# monotone
 	rm -f test-convert-tla*		# GNU Arch tla
 	rm -f test-doctest*		# doctest always fails with python 2.5.x
-	if ! has userpriv ${FEATURES}; then
+	if [[ ${EUID} -eq 0 ]]; then
 		einfo "Removing tests which require user privileges to succeed"
 		rm -f test-command-template	# Test is broken when run as root
 		rm -f test-convert			# Test is broken when run as root