Update mercurial live ebuild.

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

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index fb75188411fe8a8e12b7506672955ca8c4854320..92c3e9a70bdd518e0ac3a459cce4ac489f894fa2 100644 (file)
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.14 2010/06/03 19:56:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.15 2010/06/07 09:22:55 djc Exp $
+
+  07 Jun 2010; Dirkjan Ochtman <djc@gentoo.org> mercurial-9999.ebuild:
+  Update live ebuild to be more like the others.
 
   03 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> mercurial-1.5.ebuild:
   x86 stable wrt bug #314945

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 57152aaf9fd934b6884624b7fa80b7b50c13c8de..d364acd2287af5e22a2ec227fd610a2f3573becd 100644 (file)
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -9,6 +9,6 @@ EBUILD mercurial-1.5.2.ebuild 3361 RMD160 612b49ac8809bdc74046088acc2082a1d54d8e
 EBUILD mercurial-1.5.3.ebuild 3503 RMD160 ea1b4e1d968aa80ab5f2bab44e9da7ac0e79a489 SHA1 88f21b7803eb82744d0d12947571c0b1e29ecd44 SHA256 74d93ad27a4dafacc752084bdddea0af74d38213717c82c8784c97672938e254
 EBUILD mercurial-1.5.4.ebuild 3503 RMD160 1392fdcdaace90b22f09d36d823ef40d5ef8e50c SHA1 9724546fdb6595215b2066988d2bf18e98dcb102 SHA256 e668e74a2e0e0517d4719c182f906feb54b22671a93402d0c8e1b064af977b53
 EBUILD mercurial-1.5.ebuild 3363 RMD160 80899bc9f3a096e8abbb09305dbe6e7d4baeeab8 SHA1 d1c08a451cfb52b2ca27a6c1e8cc5b992c9d5d4b SHA256 f82967e9948f854774f51fd0918fec740987d4214449b17eda123d09ecb5df4c
-EBUILD mercurial-9999.ebuild 3135 RMD160 ff2350be9f8387c9962bce24dddd9dda09f85778 SHA1 4b779702bb58649f3e446899652576b8304a2659 SHA256 3c6b2eeae19e4eea393a8425dad18dca09f04f40892a6f3d4cbdf949bdf3ca08
-MISC ChangeLog 19900 RMD160 b0b966b792482c7c5512bb35ff25cbd14a0c51be SHA1 f269e8704a7ba64eb3fc0a535f9c6a59ae22851d SHA256 5b88a8977e7bf2004987e16b88cf41b5502d26d2b15c98d2b271124a0b5b2d64
+EBUILD mercurial-9999.ebuild 3342 RMD160 4b3dd7983cdd78f40a0e3dd363c1b3e779324079 SHA1 deaaf3eb7b345796d5d75fc75e7bc88d0929a8e2 SHA256 37732072b495131609dfc430debf57fbe5fef7feb584f6fccbf8dfa3712cf470
+MISC ChangeLog 20014 RMD160 6b364580a9b13a5cdbe2216e8f9e207256696877 SHA1 1c67bf5e1881ef9f6e88ff0a9892e465246de916 SHA256 c47700d46f6ae668a469df9f9c9eaca26c436916de315911ffeb9490e0edc423
 MISC metadata.xml 560 RMD160 d2c84db005e2bb001ecb78da10c1e732ca39849e SHA1 18dde8a3194320ab1fce68aada7c2bcc177c675a SHA256 279657b5c4f96eab16e370c3cabe306f2421447f0afe5ab981232bf9da83774b

diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 267377839e444e23055d8027fe11ab2d91ab2e6d..f7e27b713a08b6e99bc091b8c55bdc536bc17a0c 100644 (file)
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2010 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.3 2010/03/17 15:45:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.4 2010/06/07 09:22:55 djc Exp $
+
+EAPI=3
 
 inherit bash-completion elisp-common flag-o-matic eutils distutils mercurial
 
 DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://www.selenic.com/mercurial/"
+HOMEPAGE="http://mercurial.selenic.com/"
 EHG_REPO_URI="http://selenic.com/repo/hg"
 
 LICENSE="GPL-2"
@@ -13,15 +15,17 @@ SLOT="0"
 KEYWORDS=""
 IUSE="bugzilla emacs gpg test tk zsh-completion"
 
-CDEPEND=">=dev-lang/python-2.4"
+CDEPEND=">=dev-lang/python-2.4[threads]"
 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 )"
+               dev-python/pygments )
+       app-text/asciidoc"
 
 S="${WORKDIR}/hg"
 
@@ -39,6 +43,7 @@ src_compile() {
        fi
 
        rm -rf contrib/{win32,macosx}
+       make doc
 }
 
 src_install() {
@@ -52,21 +57,21 @@ src_install() {
        fi
 
        rm -f doc/*.?.txt
-       dodoc CONTRIBUTORS README
-       cp hgweb*.cgi "${D}"/usr/share/doc/${PF}/
+       dodoc CONTRIBUTORS README doc/*.txt
+       cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/
 
+       dobin hgeditor
        dobin contrib/hgk
-       dobin contrib/hg-relink
        dobin contrib/hg-ssh
 
-       rm -f contrib/hgk contrib/hg-relink contrib/hg-ssh
+       rm -f contrib/hgk contrib/hg-ssh
 
        rm -f contrib/bash_completion
-       cp -r contrib "${D}"/usr/share/doc/${PF}/
+       cp -r contrib "${ED}"/usr/share/doc/${PF}/
        doman doc/*.?
 
        cat > "${T}/80mercurial" <<-EOF
-HG=/usr/bin/hg
+HG="${EPREFIX}/usr/bin/hg"
 EOF
        doenvd "${T}/80mercurial"
 
@@ -78,14 +83,15 @@ EOF
 
 src_test() {
        cd "${S}/tests/"
-       rm -f *svn*             # Subversion tests fail with 1.5
+       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-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
@@ -93,6 +99,9 @@ src_test() {
                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
        local testdir="${T}/tests"
        rm -rf "${testdir}"