Version bump, remove old versions.

(Portage version: 2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64)

4 files changed, 26 insertions, 160 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index 9c1793ecb0a6..0d241b8956de 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/mercurial
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.86 2008/12/29 13:19:17 yngwin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.87 2009/01/08 22:20:31 nelchael Exp $
+
+*mercurial-1.1.2 (08 Jan 2009)
+
+  08 Jan 2009; <nelchael@gentoo.org>
+  -files/mercurial-1.0.1-87c704ac92d4-git-patch.patch,
+  -mercurial-1.0.1-r2.ebuild, -mercurial-1.0.1-r3.ebuild,
+  +mercurial-1.1.2.ebuild:
+  Version bump, remove old versions.
 
 *mercurial-1.1.1 (29 Dec 2008)
 
diff --git a/dev-util/mercurial/files/mercurial-1.0.1-87c704ac92d4-git-patch.patch b/dev-util/mercurial/files/mercurial-1.0.1-87c704ac92d4-git-patch.patch
deleted file mode 100644
index fd3b029d1bea..000000000000
--- a/dev-util/mercurial/files/mercurial-1.0.1-87c704ac92d4-git-patch.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-changeset:   6758:87c704ac92d4
-user:        Brendan Cully <brendan@kublai.com>
-date:        Wed Jun 25 14:13:20 2008 -0700
-summary:     Check that git patches only touch files under root
-
-diff -r 55c71226eceb -r 87c704ac92d4 mercurial/patch.py
---- a/mercurial/patch.py	Thu Jun 26 18:44:54 2008 -0500
-+++ b/mercurial/patch.py	Wed Jun 25 14:13:20 2008 -0700
-@@ -1039,9 +1039,12 @@ def applydiff(ui, fp, changed, strip=1, 
-                 continue
-         elif state == 'git':
-             gitpatches = values
-+            cwd = os.getcwd()
-             for gp in gitpatches:
-                 if gp.op in ('COPY', 'RENAME'):
--                    copyfile(gp.oldpath, gp.path)
-+                    src, dst = [util.canonpath(cwd, cwd, x)
-+                                for x in [gp.oldpath, gp.path]]
-+                    copyfile(src, dst)
-                 changed[gp.path] = (gp.op, gp)
-         else:
-             raise util.Abort(_('unsupported parser state: %s') % state)
-diff -r 55c71226eceb -r 87c704ac92d4 tests/test-import
---- a/tests/test-import	Thu Jun 26 18:44:54 2008 -0500
-+++ b/tests/test-import	Wed Jun 25 14:13:20 2008 -0700
-@@ -261,3 +261,15 @@ hg status
- hg status
- cat a
- cd ..
-+
-+echo % 'test paths outside repo root'
-+mkdir outside
-+touch outside/foo
-+hg init inside
-+cd inside
-+hg import - <<EOF
-+diff --git a/a b/b
-+rename from ../outside/foo
-+rename to bar
-+EOF
-+cd ..
-diff -r 55c71226eceb -r 87c704ac92d4 tests/test-import.out
---- a/tests/test-import.out	Thu Jun 26 18:44:54 2008 -0500
-+++ b/tests/test-import.out	Wed Jun 25 14:13:20 2008 -0700
-@@ -260,3 +260,6 @@ adding a
- adding a
- applying patch from stdin
- bb
-+% test paths outside repo root
-+applying patch from stdin
-+abort: ../outside/foo not under root
-
diff --git a/dev-util/mercurial/mercurial-1.0.1-r2.ebuild b/dev-util/mercurial/mercurial-1.0.1-r2.ebuild
deleted file mode 100644
index b0be8b7f196e..000000000000
--- a/dev-util/mercurial/mercurial-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.1-r2.ebuild,v 1.5 2008/07/05 13:39:21 ranger Exp $
-
-inherit bash-completion distutils elisp-common flag-o-matic eutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://www.selenic.com/mercurial/"
-SRC_URI="http://www.selenic.com/mercurial/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bugzilla cvs darcs emacs git gpg subversion test zsh-completion"
-
-CDEPEND=">=dev-lang/python-2.3"
-RDEPEND="${CDEPEND}
-	bugzilla? ( dev-python/mysql-python )
-	cvs? ( dev-util/cvs )
-	darcs? ( || ( dev-python/celementtree dev-python/elementtree ) )
-	git? ( dev-util/git )
-	gpg? ( app-crypt/gnupg )
-	subversion? ( dev-util/subversion )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-	emacs? ( virtual/emacs )
-	test? ( app-arch/unzip )"
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_unpack() {
-	distutils_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-87c704ac92d4-git-patch.patch"
-}
-
-src_compile() {
-	filter-flags -ftracer -ftree-vectorize
-
-	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
-
-	dobashcompletion contrib/bash_completion ${PN}
-
-	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 "${D}"/usr/share/doc/${PF}/
-
-	dobin contrib/hgk
-	dobin contrib/hg-relink
-	dobin contrib/hg-ssh
-
-	rm -f contrib/hgk contrib/hg-relink contrib/hg-ssh
-
-	rm -f contrib/bash_completion
-	cp -r contrib "${D}"/usr/share/doc/${PF}/
-	doman doc/*.?
-
-	cat > "${T}/80mercurial" <<-EOF
-HG=/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
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/mercurial/mercurial-1.0.1-r3.ebuild b/dev-util/mercurial/mercurial-1.1.2.ebuild
index 94f68f3f654e..6bb0de3e4f8d 100644
--- a/dev-util/mercurial/mercurial-1.0.1-r3.ebuild
+++ b/dev-util/mercurial/mercurial-1.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.1-r3.ebuild,v 1.2 2008/09/15 20:13:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.1.2.ebuild,v 1.1 2009/01/08 22:20:31 nelchael Exp $
 
-inherit bash-completion distutils elisp-common flag-o-matic eutils
+inherit bash-completion elisp-common flag-o-matic eutils distutils
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://www.selenic.com/mercurial/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.selenic.com/mercurial/release/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="bugzilla emacs gpg test zsh-completion"
 
 CDEPEND=">=dev-lang/python-2.3"
@@ -26,12 +26,6 @@ DEPEND="${CDEPEND}
 PYTHON_MODNAME="${PN} hgext"
 SITEFILE="70${PN}-gentoo.el"
 
-src_unpack() {
-	distutils_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-87c704ac92d4-git-patch.patch"
-}
-
 src_compile() {
 	filter-flags -ftracer -ftree-vectorize
 
@@ -81,6 +75,8 @@ EOF
 }
 
 src_test() {
+	local testdir="${T}/tests"
+	mkdir -p -m1777 "${testdir}" || die
 	cd "${S}/tests/"
 	rm -f *svn*		# Subversion tests fail with 1.5
 	rm -f test-convert-baz*		# GNU Arch baz
@@ -89,8 +85,17 @@ src_test() {
 	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 ! has userpriv ${FEATURES}; 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
+	fi
 	einfo "Running Mercurial tests ..."
-	python run-tests.py || die "test failed"
+	python run-tests.py --tmpdir="${testdir}" || die "test failed"
 }
 
 pkg_postinst() {