Make Mercurial aware of cacerts by default (bug 429470).

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

4 files changed, 159 insertions, 9 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index fa63848cf5a5..cce02ba90fc5 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.92 2012/12/27 18:47:52 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.93 2012/12/30 15:21:57 djc Exp $
+
+*mercurial-2.4.1-r1 (30 Dec 2012)
+
+  30 Dec 2012; Dirkjan Ochtman <djc@gentoo.org> +mercurial-2.4.1-r1.ebuild,
+  +files/cacerts.rc:
+  Make Mercurial aware of cacerts by default (bug 429470).
 
   27 Dec 2012; Christoph Junghans <ottxor@gentoo.org> mercurial-9999.ebuild:
   mercurial.eclass respects  now
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 921e09b5dd5e..c71e1fb59bf3 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX 70mercurial-gentoo.el 76 SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44 WHIRLPOOL f4e8fa6a0400bf04314569f3d6e26e464ebf3c7a693508250e2b150919ad5e34a534af86b1b5847ff13f2964d23db531b1a77cc8bdd24e550c7f9e885c6f1682
+AUX cacerts.rc 51 SHA256 3d7c7e238ab4db22d2457e039bb1afcb02c6ac3a6c9aee8448614b0a6f414774 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90 WHIRLPOOL 12c178cf03d7d31744311fd71200efd07a2c9ab3ab3bf1c08f254d113fbd0500848ac3bb76da2baa2c567666f2174026a605dd561a3b1bc96133f314e149f289
 AUX mercurial-2.4-dont_grep_indefinitely.patch 1276 SHA256 5cee3bf5297e33656e7d61b83de185a31f30315aa6e2fa5aeef2b145d8b136a1 SHA512 34cf5f4fed8c7a723529338d2c3b194027b5622b33de408c19051e46e40aa36b65e2bde4e4c91f6e45c4346e68d05c579b74a6d52f6bb04468cc398def273c00 WHIRLPOOL 683e89d5184300dd46e570faf5d3e16b7aa6fab90621d0579611298fda8f888989b25ad4f5651eb8a31f567109236d46ceda87831759989427312e4bf5644f48
 DIST mercurial-2.1.1.tar.gz 3313261 SHA256 0f8ec2b29f1121c6cb73c17509281eb1391ddbfad757b1f720d7e06de0a25dfd SHA512 046d8f9f9510727e4c08bbcaeb7e402544b6ce5d240f44d71f73768304072f2ed1e1b856c848143ed1ccd55fc6b109a0281be305e0adad84aa0a6583bb72ddc9 WHIRLPOOL a32516377c5018ae00c241d92d693594404569bed1972c68c517d972d4ca8f8e645e9900e303406a903f6ed488add271f677c17698d386e5f8af2d985fa65ee3
 DIST mercurial-2.3.2.tar.gz 3559562 SHA256 33b4f5d4e2f0d506358cf5ee14b0b6b4ccaf52c251c60867e23f93b1116dc7e2 SHA512 3661be0fc6e90134b781b3709d7ea33ed6f81502c9980a7d3f6ab4b0c30e14ee75406207ab8a213c46906f27a4a015bde7b6ce6583238aec4b240763d8a3d9ae WHIRLPOOL 91d7f2fd59021180550aba0218b4c20df06aefba2fcc0dab22683075a7ca1b4cf6c2cbef9d5d2bffc6dfdfc33de39c98464cd7302e7652610e7fad3d76dee2e8
@@ -10,18 +11,15 @@ DIST mercurial-2.4.tar.gz 3607276 SHA256 388785358881ceb4409baa1b8180c2c84d5f354
 EBUILD mercurial-2.1.1.ebuild 4010 SHA256 46c93140e3a84505502e5d78f703d07313daacc838a50d192901ed3a1eb47555 SHA512 bfd876d876621d745a82446cdabcee1b96c5f0c356777bcab121f5ef718a6a5797e479c56d9bebc97e34f92c58a2903d8ea9cef9d54b2c9d61d55544bb66f62d WHIRLPOOL 9cb1a7ffd2a82db0f43c01afaef8fe7d746c99af13e52ffb57d0811f0be8f9b17e9b399b70bd7de56f4385d2bdf43a5370fd6d3caddf5a3d05de3a426a3aa482
 EBUILD mercurial-2.3.2.ebuild 4027 SHA256 ead916ab309ac555c7f497ecef9b4eeb150bf2c3961ea4610f71af60cb03480f SHA512 54c08f9f45f398a7aa33ac6c84d2e3ff54e692cee406b2bfa89edfeeba45d3bfceaadb23e827a69a3cf52ccedd690323c00a816559c5abbd7c26f0567f4a85d9 WHIRLPOOL 998e7b543c366201eae8896518a1bc3b21442b58a891ad415c75a6a752212ce3c6c848b58c57591be7d440f2fa113561d44175efe425c51e50ba0264c01a4c0a
 EBUILD mercurial-2.4-r1.ebuild 4184 SHA256 dc0182c84e69271a2a59e245b7869b80f7c896107d2435c79c5b926ff9195464 SHA512 cde0e2dee845bcbdb61063f254621db1afbed084648f469d7af220425a7a231ee13e1147de2f80592cc168e3030270d4f24c554bd360391a10fa92f765f6eed6 WHIRLPOOL d7293e650d4d8981cdf526de4f6d8bb0a1a317d0beced65a3cf1e0bef0687597089fc7b223ed21cd11083ef3f3ff9d81587f649e0892ffe7c52d9c605080844d
+EBUILD mercurial-2.4.1-r1.ebuild 4162 SHA256 a241e1ff2f33888d4b3966366d7f2a6ad53ee41ea5aad4878c6a00b20e63312b SHA512 2bcec45ba542409e96efb4d1485ec56116efcba61d58865b8295f6bf638af983e40aa75cd6f01467e029ff6968f349eef12a7fe5d9a980c54a794e72dffe037f WHIRLPOOL ef0483a8ef348d85773a29bf61029208130f07d5f7e0b864675975508b97264d050b57a6a08dd226b137dbb0d2b633995cb496f5d547460fe44826652d94822a
 EBUILD mercurial-2.4.1.ebuild 4078 SHA256 c2bca49dd214d3930dd9d925b4d807afb1cdff8bc6cf994757e736a83bee34c2 SHA512 c8f614c8e60cf8c7050539580b7198691d62947527346698e4dcbb14a85d60f7e67ee93113ce38aca54d044da9e08fd6ed61943b02b8a9c4191758561721219a WHIRLPOOL ff6ade51a5578fb3a0ca9af4a13c7c783b3292f103d88db6df42351f7d73c69a97e200b642802107af6a370f24cc9d2d0cb4c217c48978775a63e3f3458f218f
 EBUILD mercurial-9999.ebuild 3476 SHA256 dc2e086731d23ca7d052d113c997a6c5fc95e3fff0ef29791903c69daf2db44c SHA512 4b4e2fe1945ed0262a3cff587f0a2af78594d24e72c1e2cac288d495267bd4d0eee754ca8528378df21c23495fd047e612e0991026560de82f2a25774d570a2a WHIRLPOOL 462190e9ae0a1790c36e35385f5e0db90f6fa1394cdfac59a7f53a706982768da7b9a599ddd28dfe552b9c0d1ff35c24979db774a41c4c4fce66558134061645
-MISC ChangeLog 30711 SHA256 2e649df3e40f8c584ba2c07252413fcfb5ebe703993c16cd66da7a9bed8aaeb7 SHA512 a6f4b8ee91c76cf2bc22683900572a4254ec0fe28ef1809e55f7a4ac56f598681398774387c5c48a2df2297201223d75a6a6c520cf8fccc70996b83ba02c06ce WHIRLPOOL 6c6eadd19425aca89dd49d5ad3b2b9a2969f6572163e0e1235d9636db0fb0de6666b237e7b2b7f2b763092abbad81d61f58c4fa0d20822642c63746affc0574d
+MISC ChangeLog 30900 SHA256 ba41d17647d24afa2f6ddc860131698cb5e5d603c2500a1da9260476b9404f3e SHA512 1e4009786bc61ac6a32773d7d878832bd28197d73ac21c9b7d38d00c9d9b222ffd8f7dac7d926714ea10ee6523e1284919770cf24ff73cd1946d8c0ad336311d WHIRLPOOL bf6377953c070f400f9af215792a6208d6bcdaf768d425fe78cfe3ba227e4bcf39fbe5c8e6dba42fb7029b24e95b2344f6400fc516cdc14da607e7e85268e115
 MISC metadata.xml 537 SHA256 44b0f25f7c2d2559b289caa0f843be24585036650b1db7f88edc9febbf648146 SHA512 7a4e6a17557580cf7d74628da3b9788d1c94dc5100bb3eb86f1411f32859293c13949ece56359214bfcc6e2ced88be2f5627a516ad59d59e4134708de20e38cd WHIRLPOOL 1a94fcda312a2345dea0f47183abe5ec18fabcccbd1fb0599586d98c567a89898c2265fde58e7774dbb584ccb2cb2cb133df15b1f15327eba8e71ded6cd3da9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3JfeAAoJEOeBhlrCAAWGoc8H/jrhkWO569rH68Q4TnteciFK
-HYKGnKttGD78Dg3o6Qvkwu9LnohbtR66ttS6SYNgN6NC367NTM+i/oJClPkZVK4+
-DML90qQUbPeglJNKNllQJtfEn9e6wkVNASp6WyklY6AlfzSPB0iyi/tBaQSIeNJ6
-lqVLg+yXdHxxqPv2tHCKwZr+MNduFfRfL/mZR6Ysnny0TzLQAEjdJiAPJKIuj2k4
-DlUwYeqqS1UgBqNoMwrZ/8jNXylkK27vV21hQH0tnfqrpfY5UPo/tpnRmfS9gUZn
-rnasCSAcZhxprc51Qsf4fjRQCc7YdcIS2/kefGg78PYl4JwKzUtND8tnz1aUztA=
-=SsSq
+iEYEAREIAAYFAlDgXBkACgkQxeMuLWsGW/tElwCdEFdrDW4pZ40yPVvc0gUSVf2h
+DjUAn0anYU+xwB97HzfmI8uJp2A+7i/T
+=q9Br
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/files/cacerts.rc b/dev-vcs/mercurial/files/cacerts.rc
new file mode 100644
index 000000000000..240261c53668
--- /dev/null
+++ b/dev-vcs/mercurial/files/cacerts.rc
@@ -0,0 +1,2 @@
+[web]
+cacerts = /etc/ssl/certs/ca-certificates.crt
diff --git a/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild b/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..5cd7c84df9c7
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild,v 1.1 2012/12/30 15:21:57 djc Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit bash-completion-r1 elisp-common 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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk zsh-completion"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python )
+	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 )"
+
+PYTHON_CFLAGS=(
+	"2.* + -fno-strict-aliasing"
+	"* - -ftracer -ftree-vectorize"
+)
+
+PYTHON_MODNAME="${PN} hgext"
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# 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
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use emacs; then
+		cd "${S}"/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
+
+	newbashcomp contrib/bash_completion ${PN} || die
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg || die
+	fi
+
+	rm -f doc/*.?.txt || die
+	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor || die
+	dobin contrib/hgk || die
+	dobin contrib/hg-ssh || die
+
+	rm -f contrib/hgk contrib/hg-ssh || die
+
+	rm -f contrib/bash_completion || die
+	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
+	doman doc/*.? || die
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial" || die
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	cd "${S}/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
+	rm -f test-convert-cvs*	|| die		# CVS
+	rm -f test-convert-darcs* || die	# Darcs
+	rm -f test-convert-git* || die		# git
+	rm -f test-convert-mtn*	|| die		# monotone
+	rm -f test-convert-tla*	|| die		# GNU Arch tla
+	rm -f test-doctest* || die		# 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 || die	# Test is broken when run as root
+		rm -f test-convert || die		# Test is broken when run as root
+		rm -f test-lock-badness	|| die		# Test is broken when run as root
+		rm -f test-permissions	|| die		# Test is broken when run as root
+		rm -f test-pull-permission || die	# Test is broken when run as root
+		rm -f test-clone-failure || die
+		rm -f test-journal-exists || die
+		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
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}