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

Package-Manager: portage-2.1.2.9

11 files changed, 44 insertions, 244 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/Manifest b/dev-util/mercurial/Manifest
index f9257138b718..849b05bfd8c5 100644
--- a/dev-util/mercurial/Manifest
+++ b/dev-util/mercurial/Manifest
@@ -2,21 +2,8 @@ AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA
 MD5 5c6cb663ce1dd8c0a06aab7f9e661268 files/70mercurial-gentoo.el 76
 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa files/70mercurial-gentoo.el 76
 SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab files/70mercurial-gentoo.el 76
-DIST mercurial-0.9.1.tar.gz 401485 RMD160 f34db5fbfcc5b3e90b2bce7577d3446f6159b057 SHA1 a1f9ed5ee96660ee9f6cff6d65c8ad8e3495702e SHA256 60329317ed96cccf3db704ef9d2554890bcff6850c305199cc0f51cef606ebc9
 DIST mercurial-0.9.3.tar.gz 530289 RMD160 9a25e508ebbe8e1827f26f6731ab085ce535f73a SHA1 a91c769ea78bffc15017a2157d05b87b9218ca40 SHA256 48485e6b16d304ef67f747c956ad257139796359ebfba9a66aede5cc0f550e86
-DIST mercurial-0.9.tar.gz 326107 RMD160 4ab0646abeea17bebf2262457448ef39959b5311 SHA1 d633a9fee89ed8aee22d5a52138c673e01feed7f SHA256 43de312de90ca5d155101d775c7bdaafc9ff61f179dd2940d8e22b2df5090a5b
-EBUILD mercurial-0.9.1-r1.ebuild 1187 RMD160 e60eaf7ce72f8654505b1938bbb632a1ad674538 SHA1 f9b99f6f969104d14d9c3bc9c668e171eec9658f SHA256 764bdfde3c4a907a40560f7c398ee73c18c9cc3a5861e437679d9a8225948e78
-MD5 25820b6157875c98dd4632bb5ea728ca mercurial-0.9.1-r1.ebuild 1187
-RMD160 e60eaf7ce72f8654505b1938bbb632a1ad674538 mercurial-0.9.1-r1.ebuild 1187
-SHA256 764bdfde3c4a907a40560f7c398ee73c18c9cc3a5861e437679d9a8225948e78 mercurial-0.9.1-r1.ebuild 1187
-EBUILD mercurial-0.9.1-r2.ebuild 1720 RMD160 2911bb9af98fcab3caa037f52aa59cbece0256ce SHA1 8ad196b981db698df718191e4e978f88a520ea0f SHA256 47244075467bf929c9181d9c32e312c1bb4e94e7fe75742d61d6134e853c82e3
-MD5 1d327bba53fe84e69ee41960bdc02906 mercurial-0.9.1-r2.ebuild 1720
-RMD160 2911bb9af98fcab3caa037f52aa59cbece0256ce mercurial-0.9.1-r2.ebuild 1720
-SHA256 47244075467bf929c9181d9c32e312c1bb4e94e7fe75742d61d6134e853c82e3 mercurial-0.9.1-r2.ebuild 1720
-EBUILD mercurial-0.9.1.ebuild 1317 RMD160 7366d23e2c975d19b72862e3cbb6e1a17b99a2fe SHA1 d77b018286a722bebd8e18e29ea333d3d6fa894f SHA256 3ced050bf79faeba309b1262305641842a08c7967bc8740c59eadf615e91da27
-MD5 d333517900fe3306090e137c3d078839 mercurial-0.9.1.ebuild 1317
-RMD160 7366d23e2c975d19b72862e3cbb6e1a17b99a2fe mercurial-0.9.1.ebuild 1317
-SHA256 3ced050bf79faeba309b1262305641842a08c7967bc8740c59eadf615e91da27 mercurial-0.9.1.ebuild 1317
+DIST mercurial-0.9.4.tar.gz 586918 RMD160 bd70a49a98f53cd8bd553ca555fc25fd953ff538 SHA1 8dbebd76ab59611177b8385bbb97c9a40fe71683 SHA256 26996df67d508e129d2f0a264e25072764e5c2d21606e1658d77c8984e6ed64a
 EBUILD mercurial-0.9.3-r1.ebuild 1687 RMD160 31106fab8455edeb6d6b46f734a0edda5eecf4ee SHA1 6c9a9102aa3e94e6d9a08b7741298dafac263ba2 SHA256 3a8fd93db3cae31fa127a72b80377c1e4ee7deb319355b61e96a01c063752fad
 MD5 f5a86f9f7912368c84b5f6c59e52dde3 mercurial-0.9.3-r1.ebuild 1687
 RMD160 31106fab8455edeb6d6b46f734a0edda5eecf4ee mercurial-0.9.3-r1.ebuild 1687
@@ -25,33 +12,24 @@ EBUILD mercurial-0.9.3.ebuild 1620 RMD160 8a9ebefd5b876fff9804803b37b500f9bec650
 MD5 2a137b0880f2be32af902c6aad65379f mercurial-0.9.3.ebuild 1620
 RMD160 8a9ebefd5b876fff9804803b37b500f9bec65042 mercurial-0.9.3.ebuild 1620
 SHA256 8f971a5f7b6439d0021b93d0c5ea0ff9be4d08d2a6dc1bd243c430672b8e0f7b mercurial-0.9.3.ebuild 1620
-EBUILD mercurial-0.9.ebuild 1257 RMD160 1ccfd945736a978b4f601e65966a2fe6d24619a6 SHA1 0efdc3a3587799c32b618072f48fd41007ee5d3f SHA256 d9ac117c180a613646b32f5e67329032ca827eb0e0f561fcb8338f95e7908cfd
-MD5 7febfda4775679c3b131ef154405e373 mercurial-0.9.ebuild 1257
-RMD160 1ccfd945736a978b4f601e65966a2fe6d24619a6 mercurial-0.9.ebuild 1257
-SHA256 d9ac117c180a613646b32f5e67329032ca827eb0e0f561fcb8338f95e7908cfd mercurial-0.9.ebuild 1257
-MISC ChangeLog 7955 RMD160 33cc936b60acc2017b4b35da78014df80064f505 SHA1 b6952e7fb2737cd0223f74391c867060829ca94b SHA256 e616eac49d15738d43592fa2bb2ab0002f3825c2e49536cbf345e1b960ecdf99
-MD5 186298893fab7c03eeff6c678abba1eb ChangeLog 7955
-RMD160 33cc936b60acc2017b4b35da78014df80064f505 ChangeLog 7955
-SHA256 e616eac49d15738d43592fa2bb2ab0002f3825c2e49536cbf345e1b960ecdf99 ChangeLog 7955
+EBUILD mercurial-0.9.4.ebuild 1692 RMD160 2c1c7ca12679ab8b72249daaca8cca7ba1ef5fb5 SHA1 82cf087b3d222b70be840b5614f8fa162c92dea4 SHA256 b0b9185fa4d868a93252a275facd4475c79bcbb900d67cf91b4ea55ed7bd6788
+MD5 78b69cde216eefe3c335d7471593ed21 mercurial-0.9.4.ebuild 1692
+RMD160 2c1c7ca12679ab8b72249daaca8cca7ba1ef5fb5 mercurial-0.9.4.ebuild 1692
+SHA256 b0b9185fa4d868a93252a275facd4475c79bcbb900d67cf91b4ea55ed7bd6788 mercurial-0.9.4.ebuild 1692
+MISC ChangeLog 8221 RMD160 419d49e131fa68fd0318a6b76ba3258ee1bccf52 SHA1 bc304cfffd5ac62bc971c987584bc2d57fb3b847 SHA256 3285e4784c7b36a86b82b84a583341e91c00f23bd0183391e30b49781794c7e8
+MD5 176afd22cbb3d584f4b9db7759e3b1ab ChangeLog 8221
+RMD160 419d49e131fa68fd0318a6b76ba3258ee1bccf52 ChangeLog 8221
+SHA256 3285e4784c7b36a86b82b84a583341e91c00f23bd0183391e30b49781794c7e8 ChangeLog 8221
 MISC metadata.xml 248 RMD160 88010a1603151711955a2c588e2c8c77a57a39b5 SHA1 96c30e5314aa50234d118c14b86ffd3e023f989b SHA256 7e7e813a6a219769c8118573805d36fbd61ad97c57eea1fc852cf890b8740234
 MD5 784cb428b4b23cdb7fcd9969db7d341c metadata.xml 248
 RMD160 88010a1603151711955a2c588e2c8c77a57a39b5 metadata.xml 248
 SHA256 7e7e813a6a219769c8118573805d36fbd61ad97c57eea1fc852cf890b8740234 metadata.xml 248
-MD5 f8129e7dd059951d4ff39748cf94d884 files/digest-mercurial-0.9 241
-RMD160 29e7ec22999ac83629486c352910e2614d65c23b files/digest-mercurial-0.9 241
-SHA256 8db15c292dba282f9ac7d07f2a28b98a2a243c3d556a60a73b7dfd177fe501a0 files/digest-mercurial-0.9 241
-MD5 55d3db17a8ff385c3a6eb95eb8cbe46f files/digest-mercurial-0.9.1 247
-RMD160 dba7526c591d0e58c5c304c7810e43e6e26d78b1 files/digest-mercurial-0.9.1 247
-SHA256 754a5267b7395c21d6ea9fb484ba2af3c7d550cf377c39d4092b35c02f3e45ce files/digest-mercurial-0.9.1 247
-MD5 55d3db17a8ff385c3a6eb95eb8cbe46f files/digest-mercurial-0.9.1-r1 247
-RMD160 dba7526c591d0e58c5c304c7810e43e6e26d78b1 files/digest-mercurial-0.9.1-r1 247
-SHA256 754a5267b7395c21d6ea9fb484ba2af3c7d550cf377c39d4092b35c02f3e45ce files/digest-mercurial-0.9.1-r1 247
-MD5 55d3db17a8ff385c3a6eb95eb8cbe46f files/digest-mercurial-0.9.1-r2 247
-RMD160 dba7526c591d0e58c5c304c7810e43e6e26d78b1 files/digest-mercurial-0.9.1-r2 247
-SHA256 754a5267b7395c21d6ea9fb484ba2af3c7d550cf377c39d4092b35c02f3e45ce files/digest-mercurial-0.9.1-r2 247
 MD5 3451c87a31aad00c9aa840c3cc7a6104 files/digest-mercurial-0.9.3 247
 RMD160 1e630b72f45df03b702e7e41c72f1da80133e3f9 files/digest-mercurial-0.9.3 247
 SHA256 36109d2eaf1a42523e7240f06a620f2515e2e06eda31b6f4dccb08e01dde20aa files/digest-mercurial-0.9.3 247
 MD5 3451c87a31aad00c9aa840c3cc7a6104 files/digest-mercurial-0.9.3-r1 247
 RMD160 1e630b72f45df03b702e7e41c72f1da80133e3f9 files/digest-mercurial-0.9.3-r1 247
 SHA256 36109d2eaf1a42523e7240f06a620f2515e2e06eda31b6f4dccb08e01dde20aa files/digest-mercurial-0.9.3-r1 247
+MD5 1fc759fc32ad9aa812529825e4daf4a2 files/digest-mercurial-0.9.4 247
+RMD160 0c11fe1218b6454a0733c5c1c003367102228e83 files/digest-mercurial-0.9.4 247
+SHA256 b6e6dd55ad6526ee586916e21686b4313ba374c1013e84c42c54545ee0919f82 files/digest-mercurial-0.9.4 247
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
-}