From bbad958be121a40c541b0c908a9ba5fb5181cb41 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Tue, 11 Oct 2011 14:50:01 +0000 Subject: [PATCH] Version bump mercurial to 1.9.3. Package-Manager: portage-2.1.10.24/cvs/Linux x86_64 --- dev-vcs/mercurial/ChangeLog | 7 +- dev-vcs/mercurial/Manifest | 16 +-- dev-vcs/mercurial/mercurial-1.9.3.ebuild | 139 +++++++++++++++++++++++ 3 files changed, 153 insertions(+), 9 deletions(-) create mode 100644 dev-vcs/mercurial/mercurial-1.9.3.ebuild diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog index e0255da6aaae..545e727bbb49 100644 --- a/dev-vcs/mercurial/ChangeLog +++ b/dev-vcs/mercurial/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-vcs/mercurial # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.51 2011/09/09 16:50:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.52 2011/10/11 14:50:01 djc Exp $ + +*mercurial-1.9.3 (11 Oct 2011) + + 11 Oct 2011; Dirkjan Ochtman +mercurial-1.9.3.ebuild: + Version bump to 1.9.3. 09 Sep 2011; Michał Górny mercurial-1.8.2.ebuild, mercurial-1.8.3.ebuild, mercurial-1.9.ebuild, mercurial-1.9.1.ebuild, diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 325341fcad06..4f8276022aef 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab DIST mercurial-1.7.tar.gz 2468587 RMD160 1103d8033309a69ed76a29d40823f45877dee5b9 SHA1 54f5f58365c79dd897e0e490043a5b52aa50aae1 SHA256 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a @@ -7,22 +7,22 @@ DIST mercurial-1.8.2.tar.gz 2547027 RMD160 6a18f5e56928e1fbea7ac1821bdde77066f5c DIST mercurial-1.8.3.tar.gz 2550988 RMD160 5c1ac5e28014b78e1ad589acf97103d024a0890c SHA1 2a8b09e3c203f276204d93706db0582c112e6657 SHA256 a23ba5065606f798db6a8614a648af3a1b556ed7a7b3c20dad1b2b8dc9e3a824 DIST mercurial-1.9.1.tar.gz 2970705 RMD160 13d3212e3b9ffb4a4b20108241b676611bab718a SHA1 555fc13756c8e9a75b653a5337791e8ebf1319cd SHA256 f379140cfa51252845d272e5774e8cf61cb6483f3071650518fcb4fc0254c50f DIST mercurial-1.9.2.tar.gz 2972849 RMD160 fa5824a16481dd612aafc59ca99903375470b994 SHA1 3eabcaa265d2497fa0fdd6751a73061fcaeb4200 SHA256 481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa +DIST mercurial-1.9.3.tar.gz 2977205 RMD160 badc314f0a364c3e64131247665ebbc63d1533a9 SHA1 6be1b85d7cfd67283f4c76ed64570110b99a3fe1 SHA256 53d8390379b81371f60729decd15f0961777b52ed7514d29c66c1873b918d685 DIST mercurial-1.9.tar.gz 2964382 RMD160 f533234095f2028ef742dce96a23751ee023a7f1 SHA1 e7d80abf520849e1327ad5e7606a09628f646584 SHA256 711e4b1cd2924a7a88499d6c431a9122390183bf554d4e153edbb3b2f30123e0 EBUILD mercurial-1.7.ebuild 3572 RMD160 b554405532f747c724d60a0a621951679f0107e3 SHA1 25537aece6845e32bd7d07f01684f92266fa63ab SHA256 d54a330388d1d1c3437c0f9a39f6a10ba62b358c740f8b3f2d24284dbaf3cae2 EBUILD mercurial-1.8.2.ebuild 3774 RMD160 19bcea35acd398c1b81efc1da25d03c223d0d09d SHA1 33c6c73ca75c2ac2f2a4224dbe347638b8119f7b SHA256 62203d8c7c57a758841892198f8c59e60b68ae8a915f58d2a89486128fb9698b EBUILD mercurial-1.8.3.ebuild 3780 RMD160 389f6cc6bc1d8fab70529fe1b7742b0e40c6255f SHA1 d4d25d4aec0d3943bcb9a35863543a912c6db9a9 SHA256 6aea4eea2688ba120538d873a7cfd07050fdf53ba3536e0b8f4b709534b20538 EBUILD mercurial-1.9.1.ebuild 3780 RMD160 30306faaddcdff35bb6f0023b4670cc9aa7598b6 SHA1 33325246d14a30893c9d888bf2162db9001d7407 SHA256 0eae0f81d9a7c4df56395c7f5099a158dea7b31f94e123318147fac629707ff0 EBUILD mercurial-1.9.2.ebuild 3780 RMD160 250e1ef235579cfd10a4f155f55537b0badd1519 SHA1 568775dc62be89b9974cc83a13ef17b49cb17c07 SHA256 98f8c0d9a1cebbf0473c49d7a87f7192e1d68dfa65035c09fad326ded360750a +EBUILD mercurial-1.9.3.ebuild 3777 RMD160 ad890696b0d2b645ff31466023d3f472189ad9b1 SHA1 60dfc7545cf600759a15371826ae8120ea5a83c9 SHA256 41dad8336e07fb72b5dc9076ddc2e0e548543f0c5488d57fdebf5bad167f60f0 EBUILD mercurial-1.9.ebuild 3778 RMD160 39d86f7eae68d2dd562d0c40e5298b7df8bfeee8 SHA1 db1be10116ad085502e01c327ed0b0e0fb28118e SHA256 2119d42ac089616baa1492423cb30c456c31b06d620e7e4e9a3af18e7cd887a6 EBUILD mercurial-9999.ebuild 3400 RMD160 da98241f4ac161e92e1bd2edf1d376e3fa8287cc SHA1 868f8eeec559b0187e823f5de9778ca2f3f7c10f SHA256 5d2c3e7445864f34459c1cf74783ff2518cf6a3c675705ce18c515b535e094b0 -MISC ChangeLog 25189 RMD160 0c8d2e57a53297c1e3564241eddab16a84967a94 SHA1 af5bba238b17bdb01b25eb66743cde8ee80eb385 SHA256 47402a74f98a0201ae30e88472da8f629bb083c6954663a8c45e023e422b6767 +MISC ChangeLog 25317 RMD160 dab192d9b70b009128e111b2bc03c753941e6831 SHA1 2914857b9c1637de462e84c3292c6be5bcf2d477 SHA256 b9a17f9346779ec6fffcd065fd2f82e5942dcb696db4b2271b5c4884168d9668 MISC metadata.xml 537 RMD160 094da5d55adea235b0980078f03edbc1e2006af9 SHA1 f01f12737cceb293ad828c22c9b1a37a4b51306b SHA256 41fac9bbf087e7bcf85d6ae1a1892c8b0e650e85e44346287f1215e1831948f2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQEIAAYFAk59nKYACgkQfXuS5UK5QB2l1wP9HO/qkETWh4PEhzqpdaosUdW+ -Ez2krbDakIyAb6ZFtCwBkPGwp71xQ2SFxGyVptuTwtjKD+c3nF8g5PDHePEGKor4 -deJqH3BKGKlLqT2YW06UILzLvSCN7fOF0wzR/JUQc+vGiSJpn5HwgGdOV3BxboAy -lLyf+IQDIm4CcbYTmgU= -=rTQN +iEYEAREKAAYFAk6UV6QACgkQxeMuLWsGW/syGACghn23+65uUc8gjaPPIRhwq99i +mcYAoIiSHLN2EnN9Upj4KURbDBH5z7OJ +=XPo+ -----END PGP SIGNATURE----- diff --git a/dev-vcs/mercurial/mercurial-1.9.3.ebuild b/dev-vcs/mercurial/mercurial-1.9.3.ebuild new file mode 100644 index 000000000000..9ba14acebaff --- /dev/null +++ b/dev-vcs/mercurial/mercurial-1.9.3.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.9.3.ebuild,v 1.1 2011/10/11 14:50:01 djc Exp $ + +EAPI=3 +PYTHON_DEPEND="2" +PYTHON_USE_WITH="threads" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython" + +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 ~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 )" +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 + elisp-compile mercurial.el || die "elisp-compile failed!" + fi + + rm -rf contrib/{win32,macosx} +} + +src_install() { + distutils_src_install + + newbashcomp contrib/bash_completion ${PN} || die + + 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 "${ED}"/usr/share/doc/${PF}/ + + dobin hgeditor + dobin contrib/hgk + dobin contrib/hg-ssh + + rm -f contrib/hgk contrib/hg-ssh + + rm -f contrib/bash_completion + cp -r contrib "${ED}"/usr/share/doc/${PF}/ + doman doc/*.? + + cat > "${T}/80mercurial" <<-EOF +HG="${EPREFIX}/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() { + 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 + rm -f test-clone-failure + rm -f test-journal-exists + rm -f test-repair-strip + fi + + testing() { + local testdir="${T}/tests-${PYTHON_ABI}" + rm -rf "${testdir}" + "$(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 +} -- 2.26.2