diff options
| -rw-r--r-- | dev-vcs/mercurial/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-vcs/mercurial/Manifest | 12 | ||||
| -rw-r--r-- | dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild | 14 | ||||
| -rw-r--r-- | dev-vcs/mercurial/mercurial-9999.ebuild | 63 |
4 files changed, 57 insertions, 38 deletions
diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog index cce02ba90fc5..54a234c0946c 100644 --- a/dev-vcs/mercurial/ChangeLog +++ b/dev-vcs/mercurial/ChangeLog @@ -1,6 +1,10 @@ # 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.93 2012/12/30 15:21:57 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.94 2012/12/30 15:46:31 djc Exp $ + + 30 Dec 2012; Dirkjan Ochtman <djc@gentoo.org> mercurial-2.4.1-r1.ebuild, + mercurial-9999.ebuild: + Bring 2.4.1-r1 and 9999 versions closer together. *mercurial-2.4.1-r1 (30 Dec 2012) diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index c71e1fb59bf3..369ceb3dea0a 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -11,15 +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-r1.ebuild 4203 SHA256 abd0fbb8769e7de4bb97dbbbf11fc2d3b96e7feb226f833f9eedacda293902a6 SHA512 1e58312057bbb8f05c9d46be47c5bad6f809fbeb89002c8a0c345130493800a6c01f290150cb4fae1f0dad50dd8c09e7391c0b3eb2cebe423780dda29938cd1c WHIRLPOOL c7286deff1f741ac7f865f0702f73fd270f57aa3185ac16460b86a4b291e5409b093ed6d7cc57432e197db779fe1d93f8c0d61f619fb319b8425f97950d9731a 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 30900 SHA256 ba41d17647d24afa2f6ddc860131698cb5e5d603c2500a1da9260476b9404f3e SHA512 1e4009786bc61ac6a32773d7d878832bd28197d73ac21c9b7d38d00c9d9b222ffd8f7dac7d926714ea10ee6523e1284919770cf24ff73cd1946d8c0ad336311d WHIRLPOOL bf6377953c070f400f9af215792a6208d6bcdaf768d425fe78cfe3ba227e4bcf39fbe5c8e6dba42fb7029b24e95b2344f6400fc516cdc14da607e7e85268e115 +EBUILD mercurial-9999.ebuild 3970 SHA256 eb156d5294b82b01ce6dfe5c375defa3b07562b8ef33f7c8249ee46e983fc770 SHA512 c07a3e7156ef749a06a158bbc5189fb7523103ea4d15e96043b7037351a160b09aaa9a3b62d875ea052bcf155bbcbb9da7996c93759af7282f2540b5c6c607b8 WHIRLPOOL dab08937ca9e29b34f76d239666ee560a8011efe025c48bcffedc695f6d6724974dbf24375e6aacfc96f04ae53e0a5be35c13b0a4ee7037b5980e507b1a1eb9b +MISC ChangeLog 31053 SHA256 8205fa5c3c96b3005dcce500b8c07e6f3d1cfd4c4531fde48b27082a88595524 SHA512 9ffb6b258e33466cdbfad5992140a1298bc1588aee3437271beed14cb1f4bf308241bc601a80fa01f8bd22ee40d6f08a8807a30394e9f514264946ec74a8676b WHIRLPOOL 20463937bf72d5efbee0897ea4249b76a85340dbebf48fa0dea4bb714a0e3922d1b9bbdc4e37c3858b7b64c5709d5c2516e0e8ad15efc1bce3ffe04b7a5b400e MISC metadata.xml 537 SHA256 44b0f25f7c2d2559b289caa0f843be24585036650b1db7f88edc9febbf648146 SHA512 7a4e6a17557580cf7d74628da3b9788d1c94dc5100bb3eb86f1411f32859293c13949ece56359214bfcc6e2ced88be2f5627a516ad59d59e4134708de20e38cd WHIRLPOOL 1a94fcda312a2345dea0f47183abe5ec18fabcccbd1fb0599586d98c567a89898c2265fde58e7774dbb584ccb2cb2cb133df15b1f15327eba8e71ded6cd3da9d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlDgXBkACgkQxeMuLWsGW/tElwCdEFdrDW4pZ40yPVvc0gUSVf2h -DjUAn0anYU+xwB97HzfmI8uJp2A+7i/T -=q9Br +iEYEAREIAAYFAlDgYhEACgkQxeMuLWsGW/s6TQCgpqnaaLyX/KVxGy8yCSP1Wa5z +a/AAoJcIPjaFye2e+LmT7NDWCxClDDjY +=bdIh -----END PGP SIGNATURE----- diff --git a/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild b/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild index 5cd7c84df9c7..8cd59f11fafd 100644 --- a/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild +++ b/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild,v 1.2 2012/12/30 15:46:31 djc Exp $ EAPI=3 PYTHON_DEPEND="2" @@ -26,7 +26,8 @@ RDEPEND="bugzilla? ( dev-python/mysql-python ) app-misc/ca-certificates" DEPEND="emacs? ( virtual/emacs ) test? ( app-arch/unzip - dev-python/pygments )" + dev-python/pygments ) + app-text/asciidoc" PYTHON_CFLAGS=( "2.* + -fno-strict-aliasing" @@ -53,6 +54,7 @@ src_compile() { fi rm -rf contrib/{win32,macosx} || die + make doc || die } src_install() { @@ -96,19 +98,19 @@ EOF 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 -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 + 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-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 diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index 88ad341ea6db..376808750b4d 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.13 2012/12/27 18:47:52 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.14 2012/12/30 15:46:31 djc Exp $ EAPI=3 PYTHON_DEPEND="2" @@ -22,7 +22,8 @@ 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 )" + zsh-completion? ( app-shells/zsh ) + app-misc/ca-certificates" DEPEND="emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments ) @@ -36,6 +37,14 @@ PYTHON_CFLAGS=( 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 @@ -44,12 +53,13 @@ src_compile() { elisp-compile mercurial.el || die "elisp-compile failed!" fi - rm -rf contrib/{win32,macosx} + rm -rf contrib/{win32,macosx} || die make doc || die } src_install() { distutils_src_install + python_convert_shebangs 2 contrib/hg-ssh newbashcomp contrib/bash_completion ${PN} || die @@ -58,17 +68,17 @@ src_install() { newins contrib/zsh_completion _hg || die fi - rm -f doc/*.?.txt - dodoc CONTRIBUTORS README doc/*.txt || die + 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 + rm -f contrib/hgk contrib/hg-ssh || die - rm -f contrib/bash_completion + rm -f contrib/bash_completion || die cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die doman doc/*.? || die @@ -81,34 +91,37 @@ EOF 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* # 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 -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 # 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 + 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}" + rm -rf "${testdir}" || die "$(PYTHON)" run-tests.py --tmpdir="${testdir}" } python_execute_function testing |