| 1 |
djc 12/12/31 08:11:55 |
| 2 |
|
| 3 |
Modified: ChangeLog mercurial-9999.ebuild |
| 4 |
mercurial-2.4.1-r2.ebuild |
| 5 |
Log: |
| 6 |
Synchronize mercurial ebuilds some more. |
| 7 |
|
| 8 |
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.96 dev-vcs/mercurial/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.96&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.96&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?r1=1.95&r2=1.96 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v |
| 20 |
retrieving revision 1.95 |
| 21 |
retrieving revision 1.96 |
| 22 |
diff -u -r1.95 -r1.96 |
| 23 |
--- ChangeLog 31 Dec 2012 07:52:12 -0000 1.95 |
| 24 |
+++ ChangeLog 31 Dec 2012 08:11:55 -0000 1.96 |
| 25 |
@@ -1,6 +1,10 @@ |
| 26 |
# ChangeLog for dev-vcs/mercurial |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.95 2012/12/31 07:52:12 djc Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.96 2012/12/31 08:11:55 djc Exp $ |
| 30 |
+ |
| 31 |
+ 31 Dec 2012; Dirkjan Ochtman <djc@g.o> mercurial-2.4.1-r2.ebuild, |
| 32 |
+ mercurial-9999.ebuild: |
| 33 |
+ Synchronize ebuilds some more. |
| 34 |
|
| 35 |
*mercurial-2.4.1-r2 (31 Dec 2012) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.15 dev-vcs/mercurial/mercurial-9999.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.15&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.15&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?r1=1.14&r2=1.15 |
| 45 |
|
| 46 |
Index: mercurial-9999.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v |
| 49 |
retrieving revision 1.14 |
| 50 |
retrieving revision 1.15 |
| 51 |
diff -u -r1.14 -r1.15 |
| 52 |
--- mercurial-9999.ebuild 30 Dec 2012 15:46:31 -0000 1.14 |
| 53 |
+++ mercurial-9999.ebuild 31 Dec 2012 08:11:55 -0000 1.15 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2012 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.14 2012/12/30 15:46:31 djc Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.15 2012/12/31 08:11:55 djc Exp $ |
| 59 |
|
| 60 |
EAPI=3 |
| 61 |
PYTHON_DEPEND="2" |
| 62 |
@@ -17,7 +17,7 @@ |
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="0" |
| 65 |
KEYWORDS="" |
| 66 |
-IUSE="bugzilla emacs gpg test tk zsh-completion" |
| 67 |
+IUSE="bugzilla doc emacs gpg test tk zsh-completion" |
| 68 |
|
| 69 |
RDEPEND="bugzilla? ( dev-python/mysql-python ) |
| 70 |
gpg? ( app-crypt/gnupg ) |
| 71 |
@@ -27,7 +27,8 @@ |
| 72 |
DEPEND="emacs? ( virtual/emacs ) |
| 73 |
test? ( app-arch/unzip |
| 74 |
dev-python/pygments ) |
| 75 |
- app-text/asciidoc" |
| 76 |
+ doc? ( app-text/asciidoc |
| 77 |
+ dev-python/docutils )" |
| 78 |
|
| 79 |
PYTHON_CFLAGS=( |
| 80 |
"2.* + -fno-strict-aliasing" |
| 81 |
@@ -39,7 +40,6 @@ |
| 82 |
|
| 83 |
src_prepare() { |
| 84 |
distutils_src_prepare |
| 85 |
- |
| 86 |
# fix up logic that won't work in Gentoo Prefix (also won't outside in |
| 87 |
# certain cases), bug #362891 |
| 88 |
sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die |
| 89 |
@@ -48,13 +48,16 @@ |
| 90 |
src_compile() { |
| 91 |
distutils_src_compile |
| 92 |
|
| 93 |
+ if use doc; then |
| 94 |
+ make doc || die |
| 95 |
+ fi |
| 96 |
+ |
| 97 |
if use emacs; then |
| 98 |
cd "${S}"/contrib || die |
| 99 |
elisp-compile mercurial.el || die "elisp-compile failed!" |
| 100 |
fi |
| 101 |
|
| 102 |
rm -rf contrib/{win32,macosx} || die |
| 103 |
- make doc || die |
| 104 |
} |
| 105 |
|
| 106 |
src_install() { |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
1.2 dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild |
| 111 |
|
| 112 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild?rev=1.2&view=markup |
| 113 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild?rev=1.2&content-type=text/plain |
| 114 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild?r1=1.1&r2=1.2 |
| 115 |
|
| 116 |
Index: mercurial-2.4.1-r2.ebuild |
| 117 |
=================================================================== |
| 118 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild,v |
| 119 |
retrieving revision 1.1 |
| 120 |
retrieving revision 1.2 |
| 121 |
diff -u -r1.1 -r1.2 |
| 122 |
--- mercurial-2.4.1-r2.ebuild 31 Dec 2012 07:52:12 -0000 1.1 |
| 123 |
+++ mercurial-2.4.1-r2.ebuild 31 Dec 2012 08:11:55 -0000 1.2 |
| 124 |
@@ -1,6 +1,6 @@ |
| 125 |
# Copyright 1999-2012 Gentoo Foundation |
| 126 |
# Distributed under the terms of the GNU General Public License v2 |
| 127 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild,v 1.1 2012/12/31 07:52:12 djc Exp $ |
| 128 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild,v 1.2 2012/12/31 08:11:55 djc Exp $ |
| 129 |
|
| 130 |
EAPI=3 |
| 131 |
PYTHON_DEPEND="2" |
| 132 |
@@ -104,18 +104,18 @@ |
| 133 |
rm -rf *svn* || die # Subversion tests fail with 1.5 |
| 134 |
rm -f test-archive || die # Fails due to verbose tar output changes |
| 135 |
rm -f test-convert-baz* || die # GNU Arch baz |
| 136 |
- rm -f test-convert-cvs* || die # CVS |
| 137 |
+ rm -f test-convert-cvs* || die # CVS |
| 138 |
rm -f test-convert-darcs* || die # Darcs |
| 139 |
rm -f test-convert-git* || die # git |
| 140 |
- rm -f test-convert-mtn* || die # monotone |
| 141 |
- rm -f test-convert-tla* || die # GNU Arch tla |
| 142 |
+ rm -f test-convert-mtn* || die # monotone |
| 143 |
+ rm -f test-convert-tla* || die # GNU Arch tla |
| 144 |
rm -f test-doctest* || die # doctest always fails with python 2.5.x |
| 145 |
if [[ ${EUID} -eq 0 ]]; then |
| 146 |
einfo "Removing tests which require user privileges to succeed" |
| 147 |
rm -f test-command-template || die # Test is broken when run as root |
| 148 |
rm -f test-convert || die # Test is broken when run as root |
| 149 |
- rm -f test-lock-badness || die # Test is broken when run as root |
| 150 |
- rm -f test-permissions || die # Test is broken when run as root |
| 151 |
+ rm -f test-lock-badness || die # Test is broken when run as root |
| 152 |
+ rm -f test-permissions || die # Test is broken when run as root |
| 153 |
rm -f test-pull-permission || die # Test is broken when run as root |
| 154 |
rm -f test-clone-failure || die |
| 155 |
rm -f test-journal-exists || die |
Archives