Security bump (bug #544332). Removed old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 843b0552b018a588692cffbfc900460bf9c931fc..a198c9c4fbfc4880ba48583815a3f8f6fae19dd4 100644 (file)
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.172 2015/02/02 10:04:06 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.173 2015/03/24 17:32:12 polynomial-c Exp $
+
+*mercurial-3.3.2 (24 Mar 2015)
+
+  24 Mar 2015; Lars Wendler <polynomial-c@gentoo.org> -mercurial-3.2.4.ebuild,
+  -mercurial-3.3.ebuild, +mercurial-3.3.2.ebuild:
+  Security bump (bug #544332). Removed old.
 
 *mercurial-3.3 (02 Feb 2015)
 

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 1389f47582bcf9dea184fc79a1bcd75dca453cab..56b65beada8a83436f6637ff493c6b8b5e6b402f 100644 (file)
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -5,28 +5,26 @@ AUX 70mercurial-gentoo.el 76 SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d74412
 AUX cacerts.rc 51 SHA256 3d7c7e238ab4db22d2457e039bb1afcb02c6ac3a6c9aee8448614b0a6f414774 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90 WHIRLPOOL 12c178cf03d7d31744311fd71200efd07a2c9ab3ab3bf1c08f254d113fbd0500848ac3bb76da2baa2c567666f2174026a605dd561a3b1bc96133f314e149f289
 AUX mercurial-3.0.1-po_fixes.patch 1396 SHA256 e111e7e609edec0cb13be1d89d6558bc41785c48266b3f1aca9bc6572c0d884e SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7 WHIRLPOOL e9ed6368f9a633fcb919c9466b9a613f5f4db62fbed3ac9427e2628ad882320415e851620d609b5ba5c3ee1d96f3d191bc579fdb645765e65f83043b2355bbc8
 DIST mercurial-3.2.3.tar.gz 4078011 SHA256 c4369320e276d78aada1b5936e96c7bbbbb8154cfba725ef4e8757dcedeaf1ef SHA512 eba8e9a1f807132614d2229a6ed38840aa55a80859a504c8fa7c500572e73a1b8a33d4a26ec0e1b9c0202f5ec592d29bf4b6bd1d95f069d2ecda342d28e31569 WHIRLPOOL 586743d7960673f97cf88232a529528ce0a6e3fd2a94256ba5b528a292669111d06a9f3ecc95f10ad590374691dbdb18538f927e7b6510c3b965973646585837
-DIST mercurial-3.2.4.tar.gz 4078698 SHA256 08d4169d02fd24819a7b3203ba85ccf5037dc646e082eb1b21b3c87ed576f6bc SHA512 20f39489ca8c3a619f86e9a4c81908fe38890d55908d8194f61ea697770cbe48425b5aedf5483fa08a5297c52a746c8efde524930fb45c4f8fd778d8278557c9 WHIRLPOOL a4472a0611b427269391cdb62902d41559910146857ba6c4a63a3574cff61823ef5f99f71096469e1151bf2804f09ac04f1cb1fb3712c302c14af41f86e9cc79
-DIST mercurial-3.3.tar.gz 4162147 SHA256 306a084b166ab3d01a0d8a2e1b80208fd7c7f71dc46d485d47a9c5c021e9dc77 SHA512 96d3ad32b51d3a32a0610e36d410b5370b06c7f0746cee3d3b119c2faf864e0cc089b0e0992c6dd4c660a727e22b9e13ce94fcc98ab9b2a57b8e521d8e4a678e WHIRLPOOL fcde79dea587923e94235bc297c13bfdf0947554af9d14e67b76ac2343c548f8a7b16a15ac2977590b5dbb5b62c7901789f1bda1ef964622daaaa2e6d1a5e1a3
+DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6c36e5d3fb2ccad0dc02361527fa SHA512 f151ea3187b70d70a82f643aaacd2742d0ce5f996590eab008332a7f28df5a19e99634ff33b0509ad38d2b6b411627413a457255df8a8e45025246beebb6fcc1 WHIRLPOOL 740b1ebb68f7c8baf3e6a9b023be2423677e3189221dc302c0601b514193e27eaaf73985c9536c6aa03fa0c5b9be8c092cd7b3eaca5f77ee24bfa276bbb6109c
 EBUILD mercurial-3.2.3.ebuild 3779 SHA256 7967a094b810435e35bd546c42bf42922419b59c370e82525264300e2c873054 SHA512 80f52e4d4028159d1d27acb9965dfbd25102b27eeea2339f4d4d5ca7b1dce21ab95ac287645058a55ece003f721ea2815f68199b82837bfba5404a4ac970bd18 WHIRLPOOL 7a8d3db018084a69e137664197643fdc84bf5db2a187d7630029d5fee27d7284037bc11af91651156cce7974feba2ae4de538a3a236e470bece5a6d412f88aeb
-EBUILD mercurial-3.2.4.ebuild 3782 SHA256 5378f97e29167f5c244f68ccf565ec21e624213ac728ecfbdd79dff6a2e671e7 SHA512 dab38f2aea8cf99b833848883eee033823c386e6f090eec962bf3fd4ede75464a6213cafdaacd5a63c169f6ab1b5202911e113de9e55906dcb05790f21dab41a WHIRLPOOL 2a9af1d2c1fb3908fd2a034ee61908f679f27bd44c3780564a286d3b0cf67eddcc3facf551e4f2c8cdb5d3b043d9b02d6f984702c0f42323c4a8c2bcdd7feb94
-EBUILD mercurial-3.3.ebuild 3780 SHA256 dc8ec1e32220f2d75ca64395b238f8993e334513df641d2223a1b17e3492d44f SHA512 e52f60c4adb92bb79e0634747c9903d7dc3796e0d328d31d8017b3c6fe0bf381afce216238c12538ec3a0ce6bf964e93ded0c2aa21dca02d49614010715b196d WHIRLPOOL 9f50a7e38c2019825e57effe31fe501627eac8f79d304211fc46673e346b0998051c61af8ec41a5d4600f1bffb44e905f0e43328eadbc4601f61d931a400eea3
+EBUILD mercurial-3.3.2.ebuild 3791 SHA256 88b516e2d2860da8883e96531b8c5ef450fd0abe67bd39f2a9fbbff99df552e5 SHA512 bbf060b78c3ea1c51cbf85c9f3accf29855359dc74af9d5c2a0eadb89286cb84885a1598fee24876f40cce00e2da592de7c873bb3cb2f04531671b5c434b669d WHIRLPOOL f23dd8f8615a5cb13999883fc58eeda6bb2a3450a46035f132ed68239ebd1705a3cc9e4365f9f9a36636f50c0456dca7472eb03da0e32e45f2062b259fbdf1e4
 EBUILD mercurial-9999.ebuild 4250 SHA256 b35d261d682f3c0e399ed54809dc074fcdf3056a653b318023e8f2bcbacd4e67 SHA512 2a783f6345b2338e9073a0a562e48a97e517ce3865fc7c84768e6aa3b0ee9c1d97f3dbca42c29538b2c9d49206b16f680ca43ecdc1accbea32895be31e55c7ff WHIRLPOOL 7e9bdf8eed29d66fedc32ad929038e0334de6c5f608b8116854a5893e1b7f8ff41334caca61c23b8eef95e871376459a72d3bf0d5f4b62839674d47d13cc7900
-MISC ChangeLog 41917 SHA256 821551331b18749f71903ec27d82284b825b33030fb080ee5c548aaa7fc20c20 SHA512 349c8ed7dc5f7dc72721940e568961670f5f33b2518cd1b997e70d5a0b4f2da6e766efc03d71cf1dfcef279962cfc0e961b765a2537784ea7b3f8703622c3ce7 WHIRLPOOL 245e48e58e2ba61b8238c0c65465129ef26f79643ac4d20a1d27109d646dc1d1008995b094066ac186131873cc5d6ebe166626a2cdae11d85be69a3bcc8d7958
+MISC ChangeLog 42132 SHA256 a00266aada3d64f155ef6b4e44f0e389d3c038bb4c056ec4c6ac43a97fdc4937 SHA512 ad501955c481a5d8306085b8e0d9d6c338e41e94ed1bfe721275657e45ff5e00ae5b186f9a5fec0cb07ca43da88a4cadedecbc1a25740bdf98fd4debe41ba097 WHIRLPOOL c01d67d195289d65815c062f85a9211561086a006e993315f0ec2eb2e447d192177382880e48738e40d373e6806fc733ff1d565bf3b7f3a186d56d0ccb09f2b8
 MISC metadata.xml 704 SHA256 480f335881782bc8d66eb715a3f36afd00ee91e815e01af3c2e0e04e132b8aa5 SHA512 c821612c8f09223e4d3790734040727872cfcdeffcea6afd6d3ce8245bb263aa5707a9d892a8e3308e05ab00c18a911f2c0a3549b350eab4a3a794051d974d0b WHIRLPOOL d0ca9e9a0db527bcf2e7bf41118ffe967015d740269ada1dfc1ae92118fe53e5588a824fedd2fb7bc77077902e9f1de5d50ca0366744bf6059486a62859f03d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUz0uvAAoJEJ+WuSkwOAOB5VgP/jG8esOQ2DEOddXmlkDg47oj
-H6lEq4yKofL5JufeRBhpzqTdecn+yMxJS6MQ93bKQAZC43wBTnf5iwh4uDAMkzHm
-zuhb3sRs7Je+4e0Za46Oim6Sn+uLK6fQ9nHMAkGY6Vz9X6rBB4XYEJvIff/6dqNv
-eCR2QoilKOveCim0bot0jEI+VxTQZncJVuKOXo6I6SzqBrp8l8HQS/q77NCQXpWu
-69TwUR4xdGiwptPmRaNS/PrwUXDJMnKqbSn8oU56WcBIXyxFSdCfvUbFbF5/zhOq
-IyKq9JCwc7ZCagjdivsz4KO7uFf7BSLD7pmfh5wuY5XwXT5VxIL/lCc6WBEAixFP
-JY0/hipKqLFjbAFDiCgBVCPvaDH+r9GSuAHRJp8MfKCDgOKsFnT2+rYanahjCnXB
-yn4jqWfvw63pfHbm3hW1cpwZdM7vJNahetyFVaPrwTclljYtWiGvKTuT3/sdBVZy
-8r935vxobekmRL/E7hWQjLdrbCx3RGGvPDP/jzIOv+TzqHjfr4V7GpnR9w18iA5J
-bo/zbBtGEvVzzBn1e9eKDD2uiUr/bdyIdtGsnNJFaZ9g1Q9kGbjIVEM+OeIgtHun
-2APYndvy8VOV/cCP3SY+BwlLg9usuSbzeafNt2vrNr2HQJKyjWsP12XNgy+KNO2V
-pII5gS/3HYnZli78GAaO
-=o3KQ
+iQIcBAEBCAAGBQJVEZ+dAAoJEPiazRVxLXTFcr4P/2Q04LuET4B1E9/Qp6ftwJd4
+tSB3itQ9YetWJlHSSrDXO+PLufGfrj4Y8/lTc9Row4i+K4BEFw4yHeSFG8iU6RUI
+yF83RCtWXAbNdzdDvkoWxGFPBHwPsT3riyf3Ltx9TE8RmhwhVcSbpzwMJsks2PVo
+OlqbF6J6BM3oiGOHANB/ntT2lSX9GAEaGR6d6zdLURnJw0oCufE692Nq72A18nzF
+6TB/UGeurCSo2XMROPJ6cM1NbDR+qMPZrMYNtzA9PI539zdM6Jxzqqc+i2ojL79u
+03vNLSoRqjIjY5Pg58u0i/m+IGQFR0mB1LmtkKkQnILqVW3FF1LC53M66E0kqQl8
+8UZQovFlNjQn8zu0R10N6qXjf0IdsWZvpl5Lss161oghVGgHdgIAMwlvw009okLE
+S8FR2i2iCPcEBWsm1W10F5yZKA5U9tWLDT5C0t9ihvrYw3kUWoAxowZ3m2+p36Sk
+vssYgBX76RAE0MkS0RppCk8UvawiOHS4LHpMzU58EpjKxVBdIdVTzZ+KUD9sFnaQ
+1vMyzwgMK53g4Mz1/C0d9XpjSIr5UJedNPzaHsWsMJLgxY98LeyKnW+M7K7fAeHp
+5JZfTf19T3UEkQu7TpVXr66m7QcDOJv49KtL4U9mPISw/02drrR0Mhva5m6ckE8I
+3vFkj96irCptgPo4C7lO
+=1fPN
 -----END PGP SIGNATURE-----

diff --git a/dev-vcs/mercurial/mercurial-3.2.4.ebuild b/dev-vcs/mercurial/mercurial-3.3.2.ebuild
similarity index 98%
rename from dev-vcs/mercurial/mercurial-3.2.4.ebuild
rename to dev-vcs/mercurial/mercurial-3.3.2.ebuild
index 6819593f958120225ac50fcabfc5eaf5eee6c70e..8fe78b5b930654ea364732a8292da7edffb2c844 100644 (file)
--- a/dev-vcs/mercurial/mercurial-3.2.4.ebuild
+++ b/dev-vcs/mercurial/mercurial-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.2.4.ebuild,v 1.1 2015/01/11 09:36:42 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.3.2.ebuild,v 1.1 2015/03/24 17:32:12 polynomial-c Exp $
 
 EAPI=5
 

diff --git a/dev-vcs/mercurial/mercurial-3.3.ebuild b/dev-vcs/mercurial/mercurial-3.3.ebuild
deleted file mode 100644 (file)
index c0c6644..0000000
--- a/dev-vcs/mercurial/mercurial-3.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.3.ebuild,v 1.1 2015/02/02 10:04:06 djc Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
-
-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-       gpg? ( app-crypt/gnupg )
-       tk? ( dev-lang/tk )
-       app-misc/ca-certificates"
-DEPEND="emacs? ( virtual/emacs )
-       test? ( app-arch/unzip
-               dev-python/pygments[${PYTHON_USEDEP}] )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
-
-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
-}
-
-python_compile_all() {
-       rm -r contrib/{win32,macosx} || die
-       if use emacs; then
-               cd contrib || die
-               elisp-compile mercurial.el || die "elisp-compile failed!"
-       fi
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-
-       newbashcomp contrib/bash_completion hg
-
-       insinto /usr/share/zsh/site-functions
-       newins contrib/zsh_completion _hg
-
-       rm -f doc/*.?.txt
-       dodoc CONTRIBUTORS
-       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
-
-       local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-                         *.el mercurial.spec)
-       for f in ${RM_CONTRIB[@]}; do
-               rm -r contrib/$f || die
-       done
-
-       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"
-
-       insinto /etc/mercurial/hgrc.d
-       doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-       pushd tests &>/dev/null || die
-       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
-       rm -f test-largefiles*          # tends to time out
-
-       popd &>/dev/null || 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() {
-       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() {
-       use emacs && elisp-site-regen
-}