Fixed commit straight to stable, add a patch to fix missing ebuilds.

(Portage version: 2.1_pre9-r4)
 (Unsigned Manifest commit)

2 files changed, 15 insertions, 61 deletions

diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 3ea5041076e1..f3ce552ca812 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -2,16 +2,20 @@ AUX 97462-esearch-metadata.patch 1670 RMD160 432eb8c25204385ef07ee45a6a7e5098b89
 MD5 4f4123da1a370da093d2bb567036571f files/97462-esearch-metadata.patch 1670
 RMD160 432eb8c25204385ef07ee45a6a7e5098b893522e files/97462-esearch-metadata.patch 1670
 SHA256 afa06803863682228a47a01040623aeab313e6525524b9d72ab18aed55af5642 files/97462-esearch-metadata.patch 1670
+AUX 97969-ignore-missing-ebuilds.patch 761 RMD160 f8688922d539f01acabc8758242bc83e2b2dc104 SHA1 9b54c1649499d96551cc3e078822dfe51f4f4c1e SHA256 c086b85bcb75c14857ba63f56e0948561592463b3aa869e7de2ad1ce5be519c0 size 761
+MD5 e3ca91ea82ae090eda4b71c9eda389f8 files/97969-ignore-missing-ebuilds.patch 761
+RMD160 f8688922d539f01acabc8758242bc83e2b2dc104 files/97969-ignore-missing-ebuilds.patch 761
+SHA256 c086b85bcb75c14857ba63f56e0948561592463b3aa869e7de2ad1ce5be519c0 files/97969-ignore-missing-ebuilds.patch 761
 AUX eupdatedb.cron 659 RMD160 b1ccd63e63bdad7640ad536d8427f825527627b6 SHA1 c3ee7bc0df9744f9fde1396e0d6ad21cecdf1e8f SHA256 f0092005752c82d62c1c5b8b3883329610be7a568569d5a375bfc780f3b3b3e0 size 659
 MD5 59372b3e7af83a0b5f9520c501464127 files/eupdatedb.cron 659
 RMD160 b1ccd63e63bdad7640ad536d8427f825527627b6 files/eupdatedb.cron 659
 SHA256 f0092005752c82d62c1c5b8b3883329610be7a568569d5a375bfc780f3b3b3e0 files/eupdatedb.cron 659
 DIST esearch-0.7.1.tar.bz2 10401 RMD160 40e765fdac44c8c11fafdf8e8cc0e3ad20ac675c SHA256 3f8e23a3a0748747ceff562063caccae1c50b46c723add32165c9476e57a270d size 10401
 DIST esearch-0.7.tar.bz2 10230 RMD160 0be0f36174d7c22d562d429905a2b45fd913dbfd SHA256 d578b285212f1770391e75abd0178a33964b9d9491e19c25fd4daf269203d555 size 10230
-EBUILD esearch-0.7.1-r1.ebuild 1504 RMD160 69382b7234bfd4e0b8b475be99e590b116cab58c SHA1 70f5e0524d07c2caaccabd46b76701b3211d9096 SHA256 57d0d95cb28204545b2ea376d2cac7ae757be2318c04fa59e2b49a17fc32033e size 1504
-MD5 5d0d8fad406008667630fcfca3338fa9 esearch-0.7.1-r1.ebuild 1504
-RMD160 69382b7234bfd4e0b8b475be99e590b116cab58c esearch-0.7.1-r1.ebuild 1504
-SHA256 57d0d95cb28204545b2ea376d2cac7ae757be2318c04fa59e2b49a17fc32033e esearch-0.7.1-r1.ebuild 1504
+EBUILD esearch-0.7.1-r2.ebuild 1594 RMD160 5a6a18211a01081daf50584793b068b326c063d7 SHA1 6dd648556a7ddd588f28687dad15622878126f9f SHA256 a3360173c35052eb5e30d70d26811d111db54993d981aea5cffb8caef8087992 size 1594
+MD5 0ce46c96189b327e5f9d17a0a1a92efe esearch-0.7.1-r2.ebuild 1594
+RMD160 5a6a18211a01081daf50584793b068b326c063d7 esearch-0.7.1-r2.ebuild 1594
+SHA256 a3360173c35052eb5e30d70d26811d111db54993d981aea5cffb8caef8087992 esearch-0.7.1-r2.ebuild 1594
 EBUILD esearch-0.7.1.ebuild 1388 RMD160 6b9d3991ed0a7ce67db6b4b5cbc44edacde4b989 SHA1 c43f00cd1f9ca6d067b0df6a156dccd70a8f70df SHA256 ed92816faecef678a15b101464f05f0098ef75cce879bb49b0c75cabb15060d2 size 1388
 MD5 871003504ac4a9c8d4cee43a61ec6d25 esearch-0.7.1.ebuild 1388
 RMD160 6b9d3991ed0a7ce67db6b4b5cbc44edacde4b989 esearch-0.7.1.ebuild 1388
@@ -20,10 +24,10 @@ EBUILD esearch-0.7.ebuild 1052 RMD160 65c68859d99fc16e28b906e8ed8dfc96539fd628 S
 MD5 85dd4ef29955378d917585664ad09c99 esearch-0.7.ebuild 1052
 RMD160 65c68859d99fc16e28b906e8ed8dfc96539fd628 esearch-0.7.ebuild 1052
 SHA256 9ad39efdbfec5774bc7128c355816c7c792880d164ee033016aabbd5a316ba4a esearch-0.7.ebuild 1052
-MISC ChangeLog 5889 RMD160 0dd75b3723da59cf6f5d9792921b286c9ef5b66d SHA1 a74a679ed06ed4fc48f02c12de0e08e84ebe4277 SHA256 3aef33d64b92b295c9c25b8d5a58244081fc5d9b42dd990cf4cb9921ed58e05a size 5889
-MD5 fb22a836e6918d0c82540bb007654758 ChangeLog 5889
-RMD160 0dd75b3723da59cf6f5d9792921b286c9ef5b66d ChangeLog 5889
-SHA256 3aef33d64b92b295c9c25b8d5a58244081fc5d9b42dd990cf4cb9921ed58e05a ChangeLog 5889
+MISC ChangeLog 6172 RMD160 84e32114dc1c928dbfcd2056e64539d2d36e6012 SHA1 d616b99789c7258fbbe3354cddbedb619a23162f SHA256 baeed8aac8d6720725926e77ab7339a5a3e1a695b191c777e007e9dc57afcb75 size 6172
+MD5 fb4ed5b7813db9c626bbc9066d79a452 ChangeLog 6172
+RMD160 84e32114dc1c928dbfcd2056e64539d2d36e6012 ChangeLog 6172
+SHA256 baeed8aac8d6720725926e77ab7339a5a3e1a695b191c777e007e9dc57afcb75 ChangeLog 6172
 MISC metadata.xml 166 RMD160 ca32b35979234f4c3cb4b824fb3c4b5c41bbb1b5 SHA1 ad2b30d8643bb8c9dc8042a399b172878b7021d7 SHA256 3837555db151fa9c3afbe9eb1edff296df030efb574605d6d2b5b37228c2a021 size 166
 MD5 fbb6fe345e65c9b7fa51b2ae10f85067 metadata.xml 166
 RMD160 ca32b35979234f4c3cb4b824fb3c4b5c41bbb1b5 metadata.xml 166
@@ -34,6 +38,6 @@ SHA256 d797f1a6fc8058ae19735498b2ee7b26ad5eab5b8a617de9f20859273194510f files/di
 MD5 9513f938f71b1b2e23fce36db890ab10 files/digest-esearch-0.7.1 241
 RMD160 e23eddd1e2b86b64e638ff107d5fc87a06ddaf6f files/digest-esearch-0.7.1 241
 SHA256 7c8a58cc54f235650d48e4ae7834b56522993507d517dd48ddadb19fe6bb5038 files/digest-esearch-0.7.1 241
-MD5 9513f938f71b1b2e23fce36db890ab10 files/digest-esearch-0.7.1-r1 241
-RMD160 e23eddd1e2b86b64e638ff107d5fc87a06ddaf6f files/digest-esearch-0.7.1-r1 241
-SHA256 7c8a58cc54f235650d48e4ae7834b56522993507d517dd48ddadb19fe6bb5038 files/digest-esearch-0.7.1-r1 241
+MD5 9513f938f71b1b2e23fce36db890ab10 files/digest-esearch-0.7.1-r2 241
+RMD160 e23eddd1e2b86b64e638ff107d5fc87a06ddaf6f files/digest-esearch-0.7.1-r2 241
+SHA256 7c8a58cc54f235650d48e4ae7834b56522993507d517dd48ddadb19fe6bb5038 files/digest-esearch-0.7.1-r2 241
diff --git a/app-portage/esearch/esearch-0.7.1-r1.ebuild b/app-portage/esearch/esearch-0.7.1-r1.ebuild
deleted file mode 100644
index 6609c0d47958..000000000000
--- a/app-portage/esearch/esearch-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.7.1-r1.ebuild,v 1.1 2006/04/23 23:16:18 antarus Exp $
-
-inherit eutils
-
-DESCRIPTION="Replacement for 'emerge --search' with search-index"
-HOMEPAGE="http://david-peter.de/esearch.html"
-SRC_URI="http://david-peter.de/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.2
-	>=sys-apps/portage-2.0.50"
-
-pkg_setup() {
-	if ! built_with_use dev-lang/python readline ; then
-		eerror "Python has to be build with 'readline' support!"
-		eerror "To do so: USE=\"readline\" emerge python"
-		eerror "Or, add \"readline\" to your USE string in"
-		eerror "/etc/make.conf"
-		die "Works only with python readline support"
-	fi
-}
-
-src_compile() {
-	epatch ${FILESDIR}/97462-esearch-metadata.patch || die "Failed to patch sources!"
-}
-
-src_install() {
-	dodir /usr/bin/ /usr/sbin/
-
-	exeinto /usr/lib/esearch
-	doexe eupdatedb.py esearch.py esync.py common.py || die "doexe failed"
-
-	dosym /usr/lib/esearch/esearch.py /usr/bin/esearch
-	dosym /usr/lib/esearch/eupdatedb.py /usr/sbin/eupdatedb
-	dosym /usr/lib/esearch/esync.py /usr/sbin/esync
-
-	doman en/{esearch,eupdatedb,esync}.1
-	dodoc ChangeLog "${FILESDIR}/eupdatedb.cron"
-
-	if use linguas_it ; then
-		insinto /usr/share/man/it/man1
-		doins it/{esearch,eupdatedb,esync}.1
-	fi
-}