Bump to 0.9.4 (bug #183212) and drop all ebuilds <0.9.3

(Portage version: 2.1.2.9)

10 files changed, 32 insertions, 210 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index 98efde3b6c80..55efba1ddd50 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/mercurial
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.52 2007/06/30 07:42:01 aross Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.53 2007/07/04 08:34:39 aross Exp $
+
+*mercurial-0.9.4 (04 Jul 2007)
+
+  04 Jul 2007; Andrew Ross <aross@gentoo.org> -mercurial-0.9.ebuild,
+  -mercurial-0.9.1.ebuild, -mercurial-0.9.1-r1.ebuild,
+  -mercurial-0.9.1-r2.ebuild, +mercurial-0.9.4.ebuild:
+  Bump to 0.9.4 (bug #183212) and drop ebuilds <0.9.3
 
   30 Jun 2007; Andrew Ross <aross@gentoo.org> metadata.xml,
   mercurial-0.9.3-r1.ebuild:
diff --git a/dev-util/mercurial/files/digest-mercurial-0.9 b/dev-util/mercurial/files/digest-mercurial-0.9
deleted file mode 100644
index e7ee7552d286..000000000000
--- a/dev-util/mercurial/files/digest-mercurial-0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d4154d12dcbda78251750c2a18eae940 mercurial-0.9.tar.gz 326107
-RMD160 4ab0646abeea17bebf2262457448ef39959b5311 mercurial-0.9.tar.gz 326107
-SHA256 43de312de90ca5d155101d775c7bdaafc9ff61f179dd2940d8e22b2df5090a5b mercurial-0.9.tar.gz 326107
diff --git a/dev-util/mercurial/files/digest-mercurial-0.9.1 b/dev-util/mercurial/files/digest-mercurial-0.9.1
deleted file mode 100644
index efb7eb9b43cb..000000000000
--- a/dev-util/mercurial/files/digest-mercurial-0.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9ed3962bba640a686c37faa47739270c mercurial-0.9.1.tar.gz 401485
-RMD160 f34db5fbfcc5b3e90b2bce7577d3446f6159b057 mercurial-0.9.1.tar.gz 401485
-SHA256 60329317ed96cccf3db704ef9d2554890bcff6850c305199cc0f51cef606ebc9 mercurial-0.9.1.tar.gz 401485
diff --git a/dev-util/mercurial/files/digest-mercurial-0.9.1-r1 b/dev-util/mercurial/files/digest-mercurial-0.9.1-r1
deleted file mode 100644
index efb7eb9b43cb..000000000000
--- a/dev-util/mercurial/files/digest-mercurial-0.9.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9ed3962bba640a686c37faa47739270c mercurial-0.9.1.tar.gz 401485
-RMD160 f34db5fbfcc5b3e90b2bce7577d3446f6159b057 mercurial-0.9.1.tar.gz 401485
-SHA256 60329317ed96cccf3db704ef9d2554890bcff6850c305199cc0f51cef606ebc9 mercurial-0.9.1.tar.gz 401485
diff --git a/dev-util/mercurial/files/digest-mercurial-0.9.1-r2 b/dev-util/mercurial/files/digest-mercurial-0.9.1-r2
deleted file mode 100644
index efb7eb9b43cb..000000000000
--- a/dev-util/mercurial/files/digest-mercurial-0.9.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9ed3962bba640a686c37faa47739270c mercurial-0.9.1.tar.gz 401485
-RMD160 f34db5fbfcc5b3e90b2bce7577d3446f6159b057 mercurial-0.9.1.tar.gz 401485
-SHA256 60329317ed96cccf3db704ef9d2554890bcff6850c305199cc0f51cef606ebc9 mercurial-0.9.1.tar.gz 401485
diff --git a/dev-util/mercurial/files/digest-mercurial-0.9.4 b/dev-util/mercurial/files/digest-mercurial-0.9.4
new file mode 100644
index 000000000000..02d21ee1b761
--- /dev/null
+++ b/dev-util/mercurial/files/digest-mercurial-0.9.4
@@ -0,0 +1,3 @@
+MD5 2e5ac6ddf434534938d4fc27dc9797c9 mercurial-0.9.4.tar.gz 586918
+RMD160 bd70a49a98f53cd8bd553ca555fc25fd953ff538 mercurial-0.9.4.tar.gz 586918
+SHA256 26996df67d508e129d2f0a264e25072764e5c2d21606e1658d77c8984e6ed64a mercurial-0.9.4.tar.gz 586918
diff --git a/dev-util/mercurial/mercurial-0.9.1-r1.ebuild b/dev-util/mercurial/mercurial-0.9.1-r1.ebuild
deleted file mode 100644
index 0f5873a939b6..000000000000
--- a/dev-util/mercurial/mercurial-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.1-r1.ebuild,v 1.2 2006/09/07 20:14:12 flameeyes Exp $
-
-inherit bash-completion distutils
-
-MY_PV=${PV//_p/.}
-
-DESCRIPTION="scalable distributed SCM"
-HOMEPAGE="http://www.selenic.com/mercurial/"
-SRC_URI="http://www.selenic.com/mercurial/release/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3"
-RDEPEND="${DEPEND}"
-
-PYTHON_MODNAME="${PN} hgext"
-
-if [[ ${PV} == *_p* ]]; then
-	S=${WORKDIR}/mercurial-snapshot
-else
-	S=${WORKDIR}/${PN}-${MY_PV}
-fi
-
-src_compile() {
-	distutils_src_compile
-
-	rm -rf contrib/vim	# app-vim/hgcommand app-vim/hgmenu
-	rm -rf contrib/{win32,macosx}
-}
-
-src_install() {
-	distutils_src_install
-
-	dobashcompletion contrib/bash_completion ${PN}
-
-	dodoc CONTRIBUTORS PKG-INFO README *.txt
-	cp hgweb*.cgi ${D}/usr/share/doc/${PF}/
-	rm -f contrib/bash_completion
-	cp -r contrib ${D}/usr/share/doc/${PF}/
-	doman doc/*.?
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	bash-completion_pkg_postinst
-}
diff --git a/dev-util/mercurial/mercurial-0.9.1.ebuild b/dev-util/mercurial/mercurial-0.9.1.ebuild
deleted file mode 100644
index 8049d5aaeb42..000000000000
--- a/dev-util/mercurial/mercurial-0.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.1.ebuild,v 1.2 2006/08/08 20:46:49 agriffis Exp $
-
-inherit bash-completion distutils
-
-MY_PV=${PV//_p/.}
-
-DESCRIPTION="scalable distributed SCM"
-HOMEPAGE="http://www.selenic.com/mercurial/"
-SRC_URI="http://www.selenic.com/mercurial/release/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.3
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-
-if [[ ${PV} == *_p* ]]; then
-	S=${WORKDIR}/mercurial-snapshot
-else
-	S=${WORKDIR}/${PN}-${MY_PV}
-fi
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd doc
-		local x
-		for x in *.?.txt; do
-			asciidoc -d manpage -b docbook $x || die
-			xmlto man ${x%txt}xml || die
-			sed -nie '/./p' ${x%.*} || die
-		done
-	fi
-
-	rm -rf contrib/vim	# app-vim/hgcommand app-vim/hgmenu
-}
-
-src_install() {
-	distutils_src_install
-
-	dobashcompletion contrib/bash_completion ${PN}
-
-	dodoc CONTRIBUTORS PKG-INFO README *.txt
-	cp hgweb*.cgi ${D}/usr/share/doc/${PF}/
-	cp -r contrib ${D}/usr/share/doc/${PF}/
-	if use doc; then
-		doman doc/*.?
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	bash-completion_pkg_postinst
-}
diff --git a/dev-util/mercurial/mercurial-0.9.1-r2.ebuild b/dev-util/mercurial/mercurial-0.9.4.ebuild
index 988b582e4170..12f127a9bee5 100644
--- a/dev-util/mercurial/mercurial-0.9.1-r2.ebuild
+++ b/dev-util/mercurial/mercurial-0.9.4.ebuild
@@ -1,39 +1,33 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.1-r2.ebuild,v 1.4 2006/12/14 20:06:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.4.ebuild,v 1.1 2007/07/04 08:34:39 aross Exp $
 
 inherit bash-completion distutils elisp-common flag-o-matic
 
-MY_PV=${PV//_p/.}
-
-DESCRIPTION="scalable distributed SCM"
+DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="http://www.selenic.com/mercurial/"
-SRC_URI="http://www.selenic.com/mercurial/release/${PN}-${MY_PV}.tar.gz"
+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="emacs"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="emacs test zsh-completion"
 
-RDEPEND=">=dev-lang/python-2.3"
+RDEPEND=">=dev-lang/python-2.3
+	zsh-completion? ( app-shells/zsh )"
 DEPEND="${RDEPEND}
-	emacs? ( virtual/emacs )"
+	emacs? ( virtual/emacs )
+	test? ( app-arch/unzip )"
 
 PYTHON_MODNAME="${PN} hgext"
 
-if [[ ${PV} == *_p* ]]; then
-	S=${WORKDIR}/mercurial-snapshot
-else
-	S=${WORKDIR}/${PN}-${MY_PV}
-fi
-
 src_compile() {
 	filter-flags -ftracer -ftree-vectorize
 
 	distutils_src_compile
 
 	if use emacs; then
-		cd ${S}/contrib
+		cd "${S}"/contrib
 		elisp-compile mercurial.el || die "Emacs modules failed!"
 	fi
 
@@ -46,16 +40,21 @@ 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 *.txt
-	cp hgweb*.cgi ${D}/usr/share/doc/${PF}/
+	cp hgweb*.cgi "${D}"/usr/share/doc/${PF}/
 	rm -f contrib/bash_completion
-	cp -r contrib ${D}/usr/share/doc/${PF}/
+	cp -r contrib "${D}"/usr/share/doc/${PF}/
 	doman doc/*.?
 
 	if use emacs; then
-		insinto ${SITELISP}
+		insinto ${SITELISP}/${PN}
 		doins contrib/mercurial.el*
-		elisp-site-file-install ${FILESDIR}/70mercurial-gentoo.el
+		elisp-site-file-install "${FILESDIR}"/70mercurial-gentoo.el
 	fi
 }
 
@@ -67,7 +66,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	distutils_pkg_postrm
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
+	use emacs && elisp-site-regen
 }
diff --git a/dev-util/mercurial/mercurial-0.9.ebuild b/dev-util/mercurial/mercurial-0.9.ebuild
deleted file mode 100644
index 8c6d33f23e53..000000000000
--- a/dev-util/mercurial/mercurial-0.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.ebuild,v 1.4 2006/06/10 15:04:41 agriffis Exp $
-
-inherit bash-completion distutils
-
-MY_PV=${PV//_p/.}
-
-DESCRIPTION="scalable distributed SCM"
-HOMEPAGE="http://www.selenic.com/mercurial/"
-SRC_URI="http://www.selenic.com/mercurial/release/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.3
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-
-if [[ ${PV} == *_p* ]]; then
-	S=${WORKDIR}/mercurial-snapshot
-else
-	S=${WORKDIR}/${PN}-${MY_PV}
-fi
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd doc
-		local x
-		for x in *.?.txt; do
-			asciidoc -d manpage -b docbook $x || die
-			xmlto man ${x%txt}xml || die
-			sed -nie '/./p' ${x%.*} || die
-		done
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	dobashcompletion contrib/bash_completion ${PN}
-
-	dodoc CONTRIBUTORS PKG-INFO README *.txt
-	cp hgweb*.cgi ${D}/usr/share/doc/${PF}/
-	cp -r contrib ${D}/usr/share/doc/${PF}/
-	if use doc; then
-		doman doc/*.?
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	bash-completion_pkg_postinst
-}