public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-vcs/mercurial: ChangeLog mercurial-9999.ebuild
@ 2010-06-07  9:22 Dirkjan Ochtman (djc)
  0 siblings, 0 replies; 2+ messages in thread
From: Dirkjan Ochtman (djc) @ 2010-06-07  9:22 UTC (permalink / raw
  To: gentoo-commits

djc         10/06/07 09:22:55

  Modified:             ChangeLog mercurial-9999.ebuild
  Log:
  Update mercurial live ebuild.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.15                 dev-vcs/mercurial/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	3 Jun 2010 19:56:32 -0000	1.14
+++ ChangeLog	7 Jun 2010 09:22:55 -0000	1.15
@@ -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



1.4                  dev-vcs/mercurial/mercurial-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?r1=1.3&r2=1.4

Index: mercurial-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mercurial-9999.ebuild	17 Mar 2010 15:45:36 -0000	1.3
+++ mercurial-9999.ebuild	7 Jun 2010 09:22:55 -0000	1.4
@@ -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 @@
 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 @@
 	fi
 
 	rm -rf contrib/{win32,macosx}
+	make doc
 }
 
 src_install() {
@@ -52,21 +57,21 @@
 	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 @@
 
 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 @@
 		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}"






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-vcs/mercurial: ChangeLog mercurial-9999.ebuild
@ 2010-12-25 15:08 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2010-12-25 15:08 UTC (permalink / raw
  To: gentoo-commits

nelchael    10/12/25 15:08:40

  Modified:             ChangeLog mercurial-9999.ebuild
  Log:
  Run one test at a time, running mutiple tests at once causes a lot of issues, see bug #348854.
  
  (Portage version: 2.1.9.26/cvs/Linux x86_64)

Revision  Changes    Path
1.31                 dev-vcs/mercurial/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?r1=1.30&r2=1.31

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog	25 Dec 2010 15:06:26 -0000	1.30
+++ ChangeLog	25 Dec 2010 15:08:40 -0000	1.31
@@ -1,6 +1,10 @@
 # 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.30 2010/12/25 15:06:26 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.31 2010/12/25 15:08:40 nelchael Exp $
+
+  25 Dec 2010; Krzysztof Pawlik <nelchael@gentoo.org> mercurial-9999.ebuild:
+  Run one test at a time, running mutiple tests at once causes a lot of issues,
+  see bug #348854.
 
   25 Dec 2010; Krzysztof Pawlik <nelchael@gentoo.org> mercurial-1.7.ebuild,
   mercurial-1.7.1.ebuild, mercurial-1.7.2.ebuild:



1.9                  dev-vcs/mercurial/mercurial-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?r1=1.8&r2=1.9

Index: mercurial-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mercurial-9999.ebuild	24 Dec 2010 02:26:21 -0000	1.8
+++ mercurial-9999.ebuild	25 Dec 2010 15:08:40 -0000	1.9
@@ -1,6 +1,6 @@
 # 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.8 2010/12/24 02:26:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.9 2010/12/25 15:08:40 nelchael Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -111,7 +111,7 @@
 	testing() {
 		local testdir="${T}/tests-${PYTHON_ABI}"
 		rm -rf "${testdir}"
-		"$(PYTHON)" run-tests.py -j4 --tmpdir="${testdir}"
+		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
 	}
 	python_execute_function testing
 }






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-12-25 15:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-07  9:22 [gentoo-commits] gentoo-x86 commit in dev-vcs/mercurial: ChangeLog mercurial-9999.ebuild Dirkjan Ochtman (djc)
  -- strict thread matches above, loose matches on Subject: below --
2010-12-25 15:08 Krzysztof Pawlik (nelchael)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox