Fix duplicate items in GNU Info directory, upstream bug 7942.

3 files changed, 8 insertions, 17 deletions

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8a791c97f53e..16665f973ae2 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,30 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches-5.tar.bz2 17964 RMD160 55c561bf455fc101a65c4ec29956b6cecaa8f632 SHA1 7e9532ff07aa8141856382ef11344221453269fd SHA256 ab41883691956d705a9306f2a2bc803aff1ceea43da7e9539ff0ed51d2ae0953
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4-patches-11.tar.bz2 13005 RMD160 2a55e7e102659d978e9069f56d188c91a721f468 SHA1 f1068df11532aadc38c0ebb618f9d420add3f2bb SHA256 10f76aa765ae9de34b3a36fbfa8391cb1be1dd97e0f78700623b3d9a3c68902c
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.3-patches-6.tar.bz2 5278 RMD160 2a3b57cf2fbed502a2de52d3cf28c0ba6fd9470a SHA1 4752d9733cad948910a4296f032fdc878328f7cf SHA256 dd4c7f315faa2ebfc093e845d6a7610102af5974614d7352e861436499f17275
+DIST emacs-22.3-patches-7.tar.bz2 5788 RMD160 0b3eead2c4bb2e523e51102bfcb863cdf0351555 SHA1 d0c696b8f7b09ded161ad4e0215903a165902c8b SHA256 1fe220dbc1388fffb19fdc4fda3643c7f177ce4e07757b238f381f49b528b6cd
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST emacs-23.2-patches-2.tar.bz2 2248 RMD160 e8e6d8ac11b9d9f61edca4046381f93deec24d17 SHA1 261f32cde33890d77efde5448c6aedf72377f1f1 SHA256 5a5c257847ec952d4ca8e9c1c296ae906043b9fb989c40042d25cdb27a81768c
-DIST emacs-23.2-patches-3.tar.bz2 3122 RMD160 6d008cf875916fb41d99844d90bd59c2a16cd053 SHA1 500c2c4faee31e04d108b8a2946cce98d72a9c9f SHA256 25b83ed7f2ae87fbf816e7b28c68eec723c05c6c23e999f51b0d94cc51c8c1c9
+DIST emacs-23.2-patches-4.tar.bz2 3599 RMD160 f807bb451ba0ceb78bd83e03dbc251b0ef2fd8b8 SHA1 ffe81a3c26f565bb110afc140088675b60243b82 SHA256 4d78a6f63f780861b1c294f1d2dae6645fa4c256e823a1221c3f59eaf291ba91
 DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
 EBUILD emacs-21.4-r22.ebuild 5176 RMD160 1fa570948a1de7c16e24fd97bf98062d08c76786 SHA1 f398f96f53735b83b0f7ef0333573da2b094c0a6 SHA256 f2b61e2616727544f5f4e14f45567014d24162986bd10e411aaa904ace6d65fd
 EBUILD emacs-21.4-r23.ebuild 5014 RMD160 b598a01d292f0652d3d580705970c626a3e84b32 SHA1 5fad050c4fbfcaf69faae74aaf55c7206cf284a4 SHA256 0e3b454a5e326ecd6dae5e363a644fa3b5dcf6373c8dcbc9d8e3288646826d61
 EBUILD emacs-22.3-r6.ebuild 8052 RMD160 444100251b38e4c011889290c70e1e1d0a29416c SHA1 cd5d8ab44f1a1244e6790aef831140dc42604216 SHA256 b7af827b7bae26adffb6e0df84fd12a9f60fcf0238a24f3b307b93a9d591a17d
-EBUILD emacs-22.3-r7.ebuild 7921 RMD160 99995e7d9afa7894882d7974ebac51071f5a939d SHA1 0fa1f3b98c80c4702ceeb6c0d05e64a3dd2b829d SHA256 059c350fe008259a97e5a15de2b1ab885c67a35e577f13cb6f2adcdf0cb32e6a
+EBUILD emacs-22.3-r7.ebuild 7921 RMD160 97ebcb87d5bc0a51aff17e3886574bb71337d4cd SHA1 cc613793ccd5f479019ba7188f91f22f6495b985 SHA256 3f82028b108a5773115083148b10d43fc08a077999d31ab101dbbfb182eb2a04
 EBUILD emacs-23.2-r2.ebuild 10008 RMD160 47d6ab99e7483fe18a7fece0a31f1f0ad19fdfef SHA1 57367184d44c8e170f3186cf84c007a4d9be7fd3 SHA256 44fd93a28deb705d0cdbf741bb3ce65ae0c6bdc1b06d147b76abf085cd1cc4f9
-EBUILD emacs-23.2-r3.ebuild 10969 RMD160 4a32ccdea6de628d28c2a55a8533b119c677ce1a SHA1 84bd7210002fbb28a7965fb6a6c22562a5991ee6 SHA256 830f56650f895bae6434159435a664bad48892cb2ed8c640eaac74bb9a533c7c
+EBUILD emacs-23.2-r3.ebuild 10969 RMD160 19f3514b92c858764dcb2ad4aba2fce87b89392d SHA1 a508d79f19e062b2a76b7a45496dfbdcc5be15c3 SHA256 b7c73827dbe7176783272ec02048952e32f19f8d13e3db09796cd94efe546c88
 MISC ChangeLog 58117 RMD160 61376c0e5816b5b749fe1126208fc04fbca48f17 SHA1 f333a77cc3c5bd78d71aec8e55381c4456bcd49a SHA256 2838b9909822fb876e7ad9fd99f922a999c4576c5042400cadc4db6f6e79ed83
 MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk1HHegACgkQOeoy/oIi7uwfAgCgz5ss88l3YaOWvgbob6iNWQjM
-rSoAniv5H96Z63rNtdNwnBxbpumTVEKO
-=J4rq
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-22.3-r7.ebuild b/app-editors/emacs/emacs-22.3-r7.ebuild
index 2835ba102f3f..f70065d54dc0 100644
--- a/app-editors/emacs/emacs-22.3-r7.ebuild
+++ b/app-editors/emacs/emacs-22.3-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r7.ebuild,v 1.1 2011/01/30 08:42:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r7.ebuild,v 1.2 2011/02/02 17:37:10 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -10,7 +10,7 @@ inherit autotools elisp-common eutils flag-o-matic
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-	mirror://gentoo/${P}-patches-6.tar.bz2"
+	mirror://gentoo/${P}-patches-7.tar.bz2"
 
 LICENSE="GPL-3 FDL-1.2 BSD as-is MIT"
 SLOT="22"
diff --git a/app-editors/emacs/emacs-23.2-r3.ebuild b/app-editors/emacs/emacs-23.2-r3.ebuild
index aad8cfbabaa1..8d366d30f322 100644
--- a/app-editors/emacs/emacs-23.2-r3.ebuild
+++ b/app-editors/emacs/emacs-23.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild,v 1.2 2011/01/31 20:33:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild,v 1.3 2011/02/02 17:37:10 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -15,7 +15,7 @@ if [ "${PV##*.}" = "9999" ]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-		mirror://gentoo/${P}-patches-3.tar.bz2"
+		mirror://gentoo/${P}-patches-4.tar.bz2"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on