| 1 |
djc 12/12/31 07:52:12 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: mercurial-2.4.1-r2.ebuild |
| 5 |
Log: |
| 6 |
Build docs before emacs, add a doc use flag, add a docs dependency (bug 449336). |
| 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.95 dev-vcs/mercurial/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.95&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.95&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?r1=1.94&r2=1.95 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v |
| 20 |
retrieving revision 1.94 |
| 21 |
retrieving revision 1.95 |
| 22 |
diff -u -r1.94 -r1.95 |
| 23 |
--- ChangeLog 30 Dec 2012 15:46:31 -0000 1.94 |
| 24 |
+++ ChangeLog 31 Dec 2012 07:52:12 -0000 1.95 |
| 25 |
@@ -1,6 +1,12 @@ |
| 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.94 2012/12/30 15:46:31 djc Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.95 2012/12/31 07:52:12 djc Exp $ |
| 30 |
+ |
| 31 |
+*mercurial-2.4.1-r2 (31 Dec 2012) |
| 32 |
+ |
| 33 |
+ 31 Dec 2012; Dirkjan Ochtman <djc@g.o> +mercurial-2.4.1-r2.ebuild: |
| 34 |
+ Build docs before emacs, add a doc use flag, add a docs dependency (bug |
| 35 |
+ 449336). |
| 36 |
|
| 37 |
30 Dec 2012; Dirkjan Ochtman <djc@g.o> mercurial-2.4.1-r1.ebuild, |
| 38 |
mercurial-9999.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: mercurial-2.4.1-r2.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2012 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $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 $ |
| 52 |
|
| 53 |
EAPI=3 |
| 54 |
PYTHON_DEPEND="2" |
| 55 |
PYTHON_USE_WITH="threads" |
| 56 |
SUPPORT_PYTHON_ABIS="1" |
| 57 |
RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" |
| 58 |
|
| 59 |
inherit bash-completion-r1 elisp-common eutils distutils |
| 60 |
|
| 61 |
DESCRIPTION="Scalable distributed SCM" |
| 62 |
HOMEPAGE="http://mercurial.selenic.com/" |
| 63 |
SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz" |
| 64 |
|
| 65 |
LICENSE="GPL-2" |
| 66 |
SLOT="0" |
| 67 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 68 |
IUSE="bugzilla doc emacs gpg test tk zsh-completion" |
| 69 |
|
| 70 |
RDEPEND="bugzilla? ( dev-python/mysql-python ) |
| 71 |
gpg? ( app-crypt/gnupg ) |
| 72 |
tk? ( dev-lang/tk ) |
| 73 |
zsh-completion? ( app-shells/zsh ) |
| 74 |
app-misc/ca-certificates" |
| 75 |
DEPEND="emacs? ( virtual/emacs ) |
| 76 |
test? ( app-arch/unzip |
| 77 |
dev-python/pygments ) |
| 78 |
doc? ( app-text/asciidoc |
| 79 |
dev-python/docutils )" |
| 80 |
|
| 81 |
PYTHON_CFLAGS=( |
| 82 |
"2.* + -fno-strict-aliasing" |
| 83 |
"* - -ftracer -ftree-vectorize" |
| 84 |
) |
| 85 |
|
| 86 |
PYTHON_MODNAME="${PN} hgext" |
| 87 |
SITEFILE="70${PN}-gentoo.el" |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
distutils_src_prepare |
| 91 |
# fix up logic that won't work in Gentoo Prefix (also won't outside in |
| 92 |
# certain cases), bug #362891 |
| 93 |
sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die |
| 94 |
} |
| 95 |
|
| 96 |
src_compile() { |
| 97 |
distutils_src_compile |
| 98 |
|
| 99 |
if use doc; then |
| 100 |
make doc || die |
| 101 |
fi |
| 102 |
|
| 103 |
if use emacs; then |
| 104 |
cd "${S}"/contrib || die |
| 105 |
elisp-compile mercurial.el || die "elisp-compile failed!" |
| 106 |
fi |
| 107 |
|
| 108 |
rm -rf contrib/{win32,macosx} || die |
| 109 |
} |
| 110 |
|
| 111 |
src_install() { |
| 112 |
distutils_src_install |
| 113 |
python_convert_shebangs 2 contrib/hg-ssh |
| 114 |
|
| 115 |
newbashcomp contrib/bash_completion ${PN} || die |
| 116 |
|
| 117 |
if use zsh-completion ; then |
| 118 |
insinto /usr/share/zsh/site-functions |
| 119 |
newins contrib/zsh_completion _hg || die |
| 120 |
fi |
| 121 |
|
| 122 |
rm -f doc/*.?.txt || die |
| 123 |
dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die |
| 124 |
cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die |
| 125 |
|
| 126 |
dobin hgeditor || die |
| 127 |
dobin contrib/hgk || die |
| 128 |
dobin contrib/hg-ssh || die |
| 129 |
|
| 130 |
rm -f contrib/hgk contrib/hg-ssh || die |
| 131 |
|
| 132 |
rm -f contrib/bash_completion || die |
| 133 |
cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die |
| 134 |
doman doc/*.? || die |
| 135 |
|
| 136 |
cat > "${T}/80mercurial" <<-EOF |
| 137 |
HG="${EPREFIX}/usr/bin/hg" |
| 138 |
EOF |
| 139 |
doenvd "${T}/80mercurial" || die |
| 140 |
|
| 141 |
if use emacs; then |
| 142 |
elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" |
| 143 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
| 144 |
fi |
| 145 |
|
| 146 |
insinto /etc/mercurial/hgrc.d |
| 147 |
doins "${FILESDIR}/cacerts.rc" |
| 148 |
} |
| 149 |
|
| 150 |
src_test() { |
| 151 |
cd "${S}/tests/" || die |
| 152 |
rm -rf *svn* || die # Subversion tests fail with 1.5 |
| 153 |
rm -f test-archive || die # Fails due to verbose tar output changes |
| 154 |
rm -f test-convert-baz* || die # GNU Arch baz |
| 155 |
rm -f test-convert-cvs* || die # CVS |
| 156 |
rm -f test-convert-darcs* || die # Darcs |
| 157 |
rm -f test-convert-git* || die # git |
| 158 |
rm -f test-convert-mtn* || die # monotone |
| 159 |
rm -f test-convert-tla* || die # GNU Arch tla |
| 160 |
rm -f test-doctest* || die # doctest always fails with python 2.5.x |
| 161 |
if [[ ${EUID} -eq 0 ]]; then |
| 162 |
einfo "Removing tests which require user privileges to succeed" |
| 163 |
rm -f test-command-template || die # Test is broken when run as root |
| 164 |
rm -f test-convert || die # Test is broken when run as root |
| 165 |
rm -f test-lock-badness || die # Test is broken when run as root |
| 166 |
rm -f test-permissions || die # Test is broken when run as root |
| 167 |
rm -f test-pull-permission || die # Test is broken when run as root |
| 168 |
rm -f test-clone-failure || die |
| 169 |
rm -f test-journal-exists || die |
| 170 |
rm -f test-repair-strip || die |
| 171 |
fi |
| 172 |
|
| 173 |
testing() { |
| 174 |
local testdir="${T}/tests-${PYTHON_ABI}" |
| 175 |
rm -rf "${testdir}" || die |
| 176 |
"$(PYTHON)" run-tests.py --tmpdir="${testdir}" |
| 177 |
} |
| 178 |
python_execute_function testing |
| 179 |
} |
| 180 |
|
| 181 |
pkg_postinst() { |
| 182 |
distutils_pkg_postinst |
| 183 |
use emacs && elisp-site-regen |
| 184 |
|
| 185 |
elog "If you want to convert repositories from other tools using convert" |
| 186 |
elog "extension please install correct tool:" |
| 187 |
elog " dev-vcs/cvs" |
| 188 |
elog " dev-vcs/darcs" |
| 189 |
elog " dev-vcs/git" |
| 190 |
elog " dev-vcs/monotone" |
| 191 |
elog " dev-vcs/subversion" |
| 192 |
} |
| 193 |
|
| 194 |
pkg_postrm() { |
| 195 |
distutils_pkg_postrm |
| 196 |
use emacs && elisp-site-regen |
| 197 |
} |
Archives