summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2008-07-07 07:12:12 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2008-07-07 07:12:12 +0000
commit94a6bd8360015ef8ac6e0dcdfcc9db121389ea32 (patch)
treec8e30ffd9f388c881412d05cc2f3f343593d96d9 /dev-util/mercurial
parentBump. Clean up ebuild, new homepage, keyword ~amd64. (diff)
downloadgentoo-2-94a6bd8360015ef8ac6e0dcdfcc9db121389ea32.tar.gz
gentoo-2-94a6bd8360015ef8ac6e0dcdfcc9db121389ea32.tar.bz2
gentoo-2-94a6bd8360015ef8ac6e0dcdfcc9db121389ea32.zip
Remove old versions.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-tuxonice-r6 x86_64)
Diffstat (limited to 'dev-util/mercurial')
-rw-r--r--dev-util/mercurial/ChangeLog8
-rw-r--r--dev-util/mercurial/files/mercurial-0.9.5-hide-passwords.diff103
-rw-r--r--dev-util/mercurial/mercurial-0.9.5-r1.ebuild81
-rw-r--r--dev-util/mercurial/mercurial-1.0.1-r1.ebuild89
-rw-r--r--dev-util/mercurial/mercurial-1.0.1.ebuild76
-rw-r--r--dev-util/mercurial/mercurial-1.0.ebuild76
6 files changed, 7 insertions, 426 deletions
diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index 51885b838c25..ab3fa7ac26df 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,12 @@
# 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.76 2008/07/05 13:39:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.77 2008/07/07 07:12:12 nelchael Exp $
+
+ 07 Jul 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+ -files/mercurial-0.9.5-hide-passwords.diff, -mercurial-0.9.5-r1.ebuild,
+ -mercurial-1.0.ebuild, -mercurial-1.0.1.ebuild,
+ -mercurial-1.0.1-r1.ebuild:
+ Remove old versions.
05 Jul 2008; Brent Baude <ranger@gentoo.org> mercurial-1.0.1-r2.ebuild:
Marking mercurial-1.0.1-r2 ppc64 for bug 230193
diff --git a/dev-util/mercurial/files/mercurial-0.9.5-hide-passwords.diff b/dev-util/mercurial/files/mercurial-0.9.5-hide-passwords.diff
deleted file mode 100644
index 1a4db2455cca..000000000000
--- a/dev-util/mercurial/files/mercurial-0.9.5-hide-passwords.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-
-# HG changeset patch
-# User Manuel Holtgrewe <purestorm@ggnore.net>
-# Date 1194290972 -3600
-# Node ID dcbda0c4c3eb8e26e01343d44fc5a8fb41138073
-# Parent 453acf64f71f72158d5ee7e1d99a5e10cea5b3b5
-Do not display passwords with pull/push/incoming/outgoing
-
-Passwords specified in the repository URL are now displayed as '***'
-when accessing the remote repository.
-
---- a/mercurial/commands.py Fri Nov 09 20:21:35 2007 -0200
-+++ b/mercurial/commands.py Mon Nov 05 20:29:32 2007 +0100
-@@ -1652,7 +1652,7 @@ def incoming(ui, repo, source="default",
- cmdutil.setremoteconfig(ui, opts)
-
- other = hg.repository(ui, source)
-- ui.status(_('comparing with %s\n') % source)
-+ ui.status(_('comparing with %s\n') % util.hidepassword(source))
- if revs:
- revs = [other.lookup(rev) for rev in revs]
- incoming = repo.findincoming(other, heads=revs, force=opts["force"])
-@@ -1962,7 +1962,7 @@ def outgoing(ui, repo, dest=None, **opts
- revs = [repo.lookup(rev) for rev in revs]
-
- other = hg.repository(ui, dest)
-- ui.status(_('comparing with %s\n') % dest)
-+ ui.status(_('comparing with %s\n') % util.hidepassword(dest))
- o = repo.findoutgoing(other, force=opts['force'])
- if not o:
- ui.status(_("no changes found\n"))
-@@ -2095,7 +2095,7 @@ def pull(ui, repo, source="default", **o
- cmdutil.setremoteconfig(ui, opts)
-
- other = hg.repository(ui, source)
-- ui.status(_('pulling from %s\n') % (source))
-+ ui.status(_('pulling from %s\n') % util.hidepassword(source))
- if revs:
- try:
- revs = [other.lookup(rev) for rev in revs]
-@@ -2142,7 +2142,7 @@ def push(ui, repo, dest=None, **opts):
- cmdutil.setremoteconfig(ui, opts)
-
- other = hg.repository(ui, dest)
-- ui.status('pushing to %s\n' % (dest))
-+ ui.status('pushing to %s\n' % util.hidepassword(dest))
- if revs:
- revs = [repo.lookup(rev) for rev in revs]
- r = repo.push(other, opts['force'], revs=revs)
---- a/mercurial/util.py Fri Nov 09 20:21:35 2007 -0200
-+++ b/mercurial/util.py Mon Nov 05 20:29:32 2007 +0100
-@@ -15,6 +15,7 @@ from i18n import _
- from i18n import _
- import cStringIO, errno, getpass, popen2, re, shutil, sys, tempfile, strutil
- import os, stat, threading, time, calendar, ConfigParser, locale, glob, osutil
-+import re, urlparse
-
- try:
- set = set
-@@ -1698,3 +1699,33 @@ def uirepr(s):
- def uirepr(s):
- # Avoid double backslash in Windows path repr()
- return repr(s).replace('\\\\', '\\')
-+
-+def hidepassword(url):
-+ '''replaces the password in the url string by three asterisks (***)
-+
-+ >>> hidepassword('http://www.example.com/some/path#fragment')
-+ 'http://www.example.com/some/path#fragment'
-+ >>> hidepassword('http://me@www.example.com/some/path#fragment')
-+ 'http://me@www.example.com/some/path#fragment'
-+ >>> hidepassword('http://me:simplepw@www.example.com/path#frag')
-+ 'http://me:***@www.example.com/path#frag'
-+ >>> hidepassword('http://me:complex:pw@www.example.com/path#frag')
-+ 'http://me:***@www.example.com/path#frag'
-+ >>> hidepassword('/path/to/repo')
-+ '/path/to/repo'
-+ >>> hidepassword('relative/path/to/repo')
-+ 'relative/path/to/repo'
-+ >>> hidepassword('c:\\\\path\\\\to\\\\repo')
-+ 'c:\\\\path\\\\to\\\\repo'
-+ >>> hidepassword('c:/path/to/repo')
-+ 'c:/path/to/repo'
-+ >>> hidepassword('bundle://path/to/bundle')
-+ 'bundle://path/to/bundle'
-+ '''
-+ url_parts = list(urlparse.urlparse(url))
-+ host_with_pw_pattern = re.compile('^([^:]*):([^@]*)@(.*)$')
-+ if host_with_pw_pattern.match(url_parts[1]):
-+ url_parts[1] = re.sub(host_with_pw_pattern, r'\1:***@\3',
-+ url_parts[1])
-+ return urlparse.urlunparse(url_parts)
-+
---- a/tests/test-doctest.py Fri Nov 09 20:21:35 2007 -0200
-+++ b/tests/test-doctest.py Mon Nov 05 20:29:32 2007 +0100
-@@ -7,3 +7,6 @@ doctest.testmod(mercurial.changelog)
-
- import mercurial.httprepo
- doctest.testmod(mercurial.httprepo)
-+
-+import mercurial.util
-+doctest.testmod(mercurial.util)
-
diff --git a/dev-util/mercurial/mercurial-0.9.5-r1.ebuild b/dev-util/mercurial/mercurial-0.9.5-r1.ebuild
deleted file mode 100644
index d7436d752fe8..000000000000
--- a/dev-util/mercurial/mercurial-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,81 +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-0.9.5-r1.ebuild,v 1.5 2008/01/21 09:36:03 nelchael 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
- epatch "${FILESDIR}/${P}-hide-passwords.diff"
-}
-
-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
-
- dodoc CONTRIBUTORS PKG-INFO README doc/*.txt
- cp hgweb*.cgi "${D}"/usr/share/doc/${PF}/
- rm -f contrib/bash_completion
- cp -r contrib "${D}"/usr/share/doc/${PF}/
- doman doc/*.?
-
- 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-r1.ebuild b/dev-util/mercurial/mercurial-1.0.1-r1.ebuild
deleted file mode 100644
index f900af1d4a6a..000000000000
--- a/dev-util/mercurial/mercurial-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,89 +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-r1.ebuild,v 1.2 2008/06/09 19:34:22 nelchael Exp $
-
-inherit bash-completion distutils elisp-common flag-o-matic
-
-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_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.ebuild b/dev-util/mercurial/mercurial-1.0.1.ebuild
deleted file mode 100644
index 916f456c4d3a..000000000000
--- a/dev-util/mercurial/mercurial-1.0.1.ebuild
+++ /dev/null
@@ -1,76 +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.ebuild,v 1.1 2008/05/25 10:56:51 nelchael Exp $
-
-inherit bash-completion distutils elisp-common flag-o-matic
-
-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_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
-
- dodoc CONTRIBUTORS PKG-INFO README doc/*.txt
- cp hgweb*.cgi "${D}"/usr/share/doc/${PF}/
- rm -f contrib/bash_completion
- cp -r contrib "${D}"/usr/share/doc/${PF}/
- doman doc/*.?
-
- 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.ebuild b/dev-util/mercurial/mercurial-1.0.ebuild
deleted file mode 100644
index 7e366cdfd11b..000000000000
--- a/dev-util/mercurial/mercurial-1.0.ebuild
+++ /dev/null
@@ -1,76 +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.ebuild,v 1.1 2008/03/25 17:23:38 nelchael Exp $
-
-inherit bash-completion distutils elisp-common flag-o-matic
-
-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_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
-
- dodoc CONTRIBUTORS PKG-INFO README doc/*.txt
- cp hgweb*.cgi "${D}"/usr/share/doc/${PF}/
- rm -f contrib/bash_completion
- cp -r contrib "${D}"/usr/share/doc/${PF}/
- doman doc/*.?
-
- 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
-}