Fix ampersand handling thanks to clotho in bug #132527. Also drop arm keywords due to mozilla breakage and remove some old versions.

Package-Manager: portage-2.1.1_pre1-r5

9 files changed, 23 insertions, 294 deletions

diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 511c23f451f9..861f8cfd6a1d 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -2,49 +2,38 @@ AUX yelp-2.14.0-mozilla-include-fix.patch 276 RMD160 24d8144d6655617da708b704853
 MD5 d3dd0a00ede7b453249075c979ddc6cc files/yelp-2.14.0-mozilla-include-fix.patch 276
 RMD160 24d8144d6655617da708b7048536582bad257795 files/yelp-2.14.0-mozilla-include-fix.patch 276
 SHA256 d8d44922f7710eeb7f80d57c68187fc138c318473f3c24455e53b9b2f2114356 files/yelp-2.14.0-mozilla-include-fix.patch 276
+AUX yelp-2.14.2-ampersand-escaping.patch 631 RMD160 58e22d7446d23a41177a5423411e6e58bf49dab7 SHA1 c651a6aa13e5d1424aeb5ce0137f8bbf2e24960c SHA256 fb1efd482c50dc2920d87bebe12586cca697a1217495e1bfb670a61d78713b42
+MD5 c8a533047d0d8c956f31e454d9755258 files/yelp-2.14.2-ampersand-escaping.patch 631
+RMD160 58e22d7446d23a41177a5423411e6e58bf49dab7 files/yelp-2.14.2-ampersand-escaping.patch 631
+SHA256 fb1efd482c50dc2920d87bebe12586cca697a1217495e1bfb670a61d78713b42 files/yelp-2.14.2-ampersand-escaping.patch 631
 AUX yelp-2.6.4-makedepfix.patch 948 RMD160 542dd07b408f8075168e69b99d5818996cdde1b8 SHA1 8c5c290c6ab915732d96cf16eb277051b248db50 SHA256 47e7193f55b1c5c8094199554de39a427a17ab767764c5b9ffd7f24674b184f9
 MD5 d13c2fbe43ee623230084d6f7bd6ec25 files/yelp-2.6.4-makedepfix.patch 948
 RMD160 542dd07b408f8075168e69b99d5818996cdde1b8 files/yelp-2.6.4-makedepfix.patch 948
 SHA256 47e7193f55b1c5c8094199554de39a427a17ab767764c5b9ffd7f24674b184f9 files/yelp-2.6.4-makedepfix.patch 948
 DIST yelp-2.10.0.tar.bz2 790852
-DIST yelp-2.12.1.tar.bz2 815483
 DIST yelp-2.12.2.tar.bz2 815933 RMD160 9b4d551480af5179a1f6f3d8d842381cace3c5a1 SHA1 352114592194bb867c15c97b7599bbcf55344528 SHA256 ee56b279131f7d2c40da332eece9eee4a7fc4ec36425d29f201038f8a2f382c9
-DIST yelp-2.14.0.tar.bz2 749775 RMD160 aa4b48f9b43216fbd1b9ef0435f99ae5a208f18e SHA256 8c5372c1c7b64fe816dbaa450fed2ebd899fa99116c75737d73d2f56c7d2e709
-DIST yelp-2.14.1.tar.bz2 765371 RMD160 cf4e428fd95263034daaaad45e0db0a29fcf3819 SHA256 db7a8c89bfdfc720a4d3f1e6883a4ac547ac039b4a32bb2b5e7546ac4d051a64
 DIST yelp-2.14.2.tar.bz2 774551 RMD160 6ac35c06dfcac5d49d39d4882ddf665f9489dc06 SHA1 7cc81e80825425d8344892db2beda82ccd28293e SHA256 daeb77cea0c9e5bdd931fd10897edd08ef99d539292caf3501ae67c33e1829ef
 DIST yelp-2.6.5.tar.bz2 654264
-EBUILD yelp-2.10.0.ebuild 1313 RMD160 497f3a6256f61cee9f50c3578c0303d7e50853e6 SHA1 c85a401c487209a2d5640cc0b5284161ccef5094 SHA256 5d4036efe8981389aaa3e647ee93bbc3958ceb448ee28388728351eb1a4a4892
-MD5 d8f059be1680731cfa1b677c4ba04fcd yelp-2.10.0.ebuild 1313
-RMD160 497f3a6256f61cee9f50c3578c0303d7e50853e6 yelp-2.10.0.ebuild 1313
-SHA256 5d4036efe8981389aaa3e647ee93bbc3958ceb448ee28388728351eb1a4a4892 yelp-2.10.0.ebuild 1313
-EBUILD yelp-2.12.1.ebuild 1284 RMD160 df4ca321ab62d4a5999401e354ef8a6b2aea8add SHA1 20039f4a76c009fd19fe281fef1d52a23a090232 SHA256 2b1e0d901d71d805776a812a90655cf084b6a0db89a0b0f1e9c451c55f7da43e
-MD5 ecfc8411aacb1717c377bd207ce323d3 yelp-2.12.1.ebuild 1284
-RMD160 df4ca321ab62d4a5999401e354ef8a6b2aea8add yelp-2.12.1.ebuild 1284
-SHA256 2b1e0d901d71d805776a812a90655cf084b6a0db89a0b0f1e9c451c55f7da43e yelp-2.12.1.ebuild 1284
-EBUILD yelp-2.12.2.ebuild 1285 RMD160 915b05d1b741ff3d2062fc600c1f4baeabd7dc5e SHA1 173e4b3e3453539ee1fdf05eeb9cb81777f6241e SHA256 388d59b57f62fcd34bce2e57fc34d1b40f31f065c57808c1166781addde1a37f
-MD5 f21dcd5bf94a5fdf7fe62199a42d8fc2 yelp-2.12.2.ebuild 1285
-RMD160 915b05d1b741ff3d2062fc600c1f4baeabd7dc5e yelp-2.12.2.ebuild 1285
-SHA256 388d59b57f62fcd34bce2e57fc34d1b40f31f065c57808c1166781addde1a37f yelp-2.12.2.ebuild 1285
-EBUILD yelp-2.14.0.ebuild 1480 RMD160 694ce7da3260ef2c55ae29401aa7ec97caa23f7b SHA1 9ac3ddeec416778cf41c7740f8c339a79866a060 SHA256 8b644f448131a68b5e64fa9f117a335032b42253aadda8b46f1f986c9bbfe2c7
-MD5 cf56b09d17532e64d54dec360a230936 yelp-2.14.0.ebuild 1480
-RMD160 694ce7da3260ef2c55ae29401aa7ec97caa23f7b yelp-2.14.0.ebuild 1480
-SHA256 8b644f448131a68b5e64fa9f117a335032b42253aadda8b46f1f986c9bbfe2c7 yelp-2.14.0.ebuild 1480
-EBUILD yelp-2.14.1.ebuild 1477 RMD160 18eb4507064530b3e5409cc6a2bdce506af57d73 SHA1 c9e863d5344f1d4f09e9dbd68bc1f0f4a227dcbb SHA256 fdfeec7c7f27cfdf906ab5970a2dd98c5bb833879652a94ee0180552e868dd96
-MD5 f2313db110858246b997076a7c7e978e yelp-2.14.1.ebuild 1477
-RMD160 18eb4507064530b3e5409cc6a2bdce506af57d73 yelp-2.14.1.ebuild 1477
-SHA256 fdfeec7c7f27cfdf906ab5970a2dd98c5bb833879652a94ee0180552e868dd96 yelp-2.14.1.ebuild 1477
-EBUILD yelp-2.14.2.ebuild 1478 RMD160 0c414fda453c1a331867fa06df25cd5ea412e321 SHA1 88598e8de4aa77df6f57d5214f44cc9feb5a3f99 SHA256 2adcbd34ee1990b0605fdb3de7a1814593dd4329ad41445d7c2b4c3f72cebb9e
-MD5 b16da435d1d29bafef714886ea24c888 yelp-2.14.2.ebuild 1478
-RMD160 0c414fda453c1a331867fa06df25cd5ea412e321 yelp-2.14.2.ebuild 1478
-SHA256 2adcbd34ee1990b0605fdb3de7a1814593dd4329ad41445d7c2b4c3f72cebb9e yelp-2.14.2.ebuild 1478
+EBUILD yelp-2.10.0.ebuild 1306 RMD160 14285cec3c0dd45fb97ba02f95b668dd107bc1d7 SHA1 8fb1618934814905349791cfe1515e2ebbbe6a35 SHA256 25ac51d51bbd1e31ba1eb4536075aef1c90e978becc8ab6455b91b3e7999db7b
+MD5 ad8939315ab6b2b045dba007fed4a1ba yelp-2.10.0.ebuild 1306
+RMD160 14285cec3c0dd45fb97ba02f95b668dd107bc1d7 yelp-2.10.0.ebuild 1306
+SHA256 25ac51d51bbd1e31ba1eb4536075aef1c90e978becc8ab6455b91b3e7999db7b yelp-2.10.0.ebuild 1306
+EBUILD yelp-2.12.2.ebuild 1277 RMD160 046ff22c36bd19fb226d7f488b5917055dad9593 SHA1 514c5ecfdb98dcc5fac7bdf986bac4bcddca4653 SHA256 3e82ade4c96816417d8631aaa4afd53fc0cefca3eb03bd5f24bd354f15456b9e
+MD5 df2e8551b01ea1b5e656f1032cb96648 yelp-2.12.2.ebuild 1277
+RMD160 046ff22c36bd19fb226d7f488b5917055dad9593 yelp-2.12.2.ebuild 1277
+SHA256 3e82ade4c96816417d8631aaa4afd53fc0cefca3eb03bd5f24bd354f15456b9e yelp-2.12.2.ebuild 1277
+EBUILD yelp-2.14.2-r1.ebuild 1591 RMD160 880d9d8f56c4a888cf2dee64c5c23a45be9b9832 SHA1 2893ba1e280f0bba6d33d3b679dd90b7b83ee662 SHA256 0df63de8201f09854acdcb63eee6c5b5de8d58363cad6c6cfb067ab7c1fe91bf
+MD5 308575916f2e0c49203b6686b86f4845 yelp-2.14.2-r1.ebuild 1591
+RMD160 880d9d8f56c4a888cf2dee64c5c23a45be9b9832 yelp-2.14.2-r1.ebuild 1591
+SHA256 0df63de8201f09854acdcb63eee6c5b5de8d58363cad6c6cfb067ab7c1fe91bf yelp-2.14.2-r1.ebuild 1591
 EBUILD yelp-2.6.5.ebuild 949 RMD160 07622e6527ca83026c8ff39688009b405ed4faa3 SHA1 cb169a8cdff23c51a4cc236bcf30e28a318c785b SHA256 43909bc49919a3e89aed3e5e9f73c3bd12fe0cd453723d71d147ce1537227e3a
 MD5 3bcd3d6aaeffc6b43c1c04057f031df6 yelp-2.6.5.ebuild 949
 RMD160 07622e6527ca83026c8ff39688009b405ed4faa3 yelp-2.6.5.ebuild 949
 SHA256 43909bc49919a3e89aed3e5e9f73c3bd12fe0cd453723d71d147ce1537227e3a yelp-2.6.5.ebuild 949
-MISC ChangeLog 12120 RMD160 7ba9d751bb15fcd8e07a8d5380feba9b34f9bde1 SHA1 4de2f288848ef29bba8846e827a9d814c7d4d075 SHA256 9bf7f0452be42af605f19532268daebe09601d8564634eb9c788e49ebdb12ed0
-MD5 c20534616e659d8a71323b4ea8afe305 ChangeLog 12120
-RMD160 7ba9d751bb15fcd8e07a8d5380feba9b34f9bde1 ChangeLog 12120
-SHA256 9bf7f0452be42af605f19532268daebe09601d8564634eb9c788e49ebdb12ed0 ChangeLog 12120
+MISC ChangeLog 12725 RMD160 879bae9b72ad93a1ef1e55da7a60909f70147970 SHA1 bc98bc3dba09e8911d4665285730e89065972892 SHA256 32d48c27a621a32d95223dedf2c9ad3191675a2b254a47c83aa2813727ff1dd5
+MD5 79bce40ddf84dcb6d0d313470bbd32c1 ChangeLog 12725
+RMD160 879bae9b72ad93a1ef1e55da7a60909f70147970 ChangeLog 12725
+SHA256 32d48c27a621a32d95223dedf2c9ad3191675a2b254a47c83aa2813727ff1dd5 ChangeLog 12725
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -52,21 +41,12 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 c4833a2e4e1d587c717ca61ce83cc55b files/digest-yelp-2.10.0 64
 RMD160 f77ffaff1ce6afc821f6b7721cdc0c1ee1db6a5f files/digest-yelp-2.10.0 64
 SHA256 411584d0ebf1268dcd1ec3746bcff7621a96c3d8ea2cbab00e62dbb910f47078 files/digest-yelp-2.10.0 64
-MD5 c24c32d5dad71be2394955adcd74aef1 files/digest-yelp-2.12.1 64
-RMD160 258ac6e161563ce43b22d5038fcd87506f0bb55b files/digest-yelp-2.12.1 64
-SHA256 57ce3b85ffa7d7c4326fc84614274a61988d29bcf9b4086ca96b56d5c270ebe8 files/digest-yelp-2.12.1 64
 MD5 77b79d6098366a03e88cbc9f9bcf87ae files/digest-yelp-2.12.2 238
 RMD160 f16e2902d6256c7dcab47803b94eb3bfdb52def1 files/digest-yelp-2.12.2 238
 SHA256 c03b3e73918e444c0783aa3c928f7ccc7dc2c5485c6f1d84cc36995ab4fd58ab files/digest-yelp-2.12.2 238
-MD5 7438f67cd6ff5b5d43c77e79fdc20d45 files/digest-yelp-2.14.0 238
-RMD160 569840cdf0b9ef3fe16379aa30a5956ee292751c files/digest-yelp-2.14.0 238
-SHA256 07391a0f92d93c6ce3c2e92d7520dfca448f2eb6495c15c42416659a436a839c files/digest-yelp-2.14.0 238
-MD5 dad609d5c589f96dcd98aed799e61ce5 files/digest-yelp-2.14.1 238
-RMD160 3b64518bd01f2393d3c0d38665a98e7142b6eebd files/digest-yelp-2.14.1 238
-SHA256 21deeec9ce1e2259424381e31fc93850127da4fd27e3c1f94885643f2739d573 files/digest-yelp-2.14.1 238
-MD5 3b6f88658da9d6fa7e522b937b4ce307 files/digest-yelp-2.14.2 238
-RMD160 402a09dc557fc2c73d19fc190adb7ae622de6d11 files/digest-yelp-2.14.2 238
-SHA256 8236663003b415d744ff56678b4d939f42f6dee9b7421d7f36fee070a683956f files/digest-yelp-2.14.2 238
+MD5 3b6f88658da9d6fa7e522b937b4ce307 files/digest-yelp-2.14.2-r1 238
+RMD160 402a09dc557fc2c73d19fc190adb7ae622de6d11 files/digest-yelp-2.14.2-r1 238
+SHA256 8236663003b415d744ff56678b4d939f42f6dee9b7421d7f36fee070a683956f files/digest-yelp-2.14.2-r1 238
 MD5 0cf1e0f8c2d2235fc75a784741638f77 files/digest-yelp-2.6.5 63
 RMD160 d43a06780cf0ecfd8c473f6781875db4619e9fcc files/digest-yelp-2.6.5 63
 SHA256 3405c3ae08a54b40a8f3f9f7aec66de05b2ee95a731eb4d8712530567cf6ac16 files/digest-yelp-2.6.5 63
diff --git a/gnome-extra/yelp/files/digest-yelp-2.12.1 b/gnome-extra/yelp/files/digest-yelp-2.12.1
deleted file mode 100644
index 5b301a345dcd..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.12.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6a9c142ca367447f06cee003b6d8a5d yelp-2.12.1.tar.bz2 815483
diff --git a/gnome-extra/yelp/files/digest-yelp-2.14.0 b/gnome-extra/yelp/files/digest-yelp-2.14.0
deleted file mode 100644
index 11eecf9e894b..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.14.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eef25315bfe8162dd7bcc2aabf31bcf8 yelp-2.14.0.tar.bz2 749775
-RMD160 aa4b48f9b43216fbd1b9ef0435f99ae5a208f18e yelp-2.14.0.tar.bz2 749775
-SHA256 8c5372c1c7b64fe816dbaa450fed2ebd899fa99116c75737d73d2f56c7d2e709 yelp-2.14.0.tar.bz2 749775
diff --git a/gnome-extra/yelp/files/digest-yelp-2.14.1 b/gnome-extra/yelp/files/digest-yelp-2.14.1
deleted file mode 100644
index 973c419abda7..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.14.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3d569f8e9372bc88c7f9fca6a94388a9 yelp-2.14.1.tar.bz2 765371
-RMD160 cf4e428fd95263034daaaad45e0db0a29fcf3819 yelp-2.14.1.tar.bz2 765371
-SHA256 db7a8c89bfdfc720a4d3f1e6883a4ac547ac039b4a32bb2b5e7546ac4d051a64 yelp-2.14.1.tar.bz2 765371
diff --git a/gnome-extra/yelp/files/digest-yelp-2.14.2 b/gnome-extra/yelp/files/digest-yelp-2.14.2
deleted file mode 100644
index 1756a101fedc..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.14.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4294fe3b01824675bd8be9d7936dcaa7 yelp-2.14.2.tar.bz2 774551
-RMD160 6ac35c06dfcac5d49d39d4882ddf665f9489dc06 yelp-2.14.2.tar.bz2 774551
-SHA256 daeb77cea0c9e5bdd931fd10897edd08ef99d539292caf3501ae67c33e1829ef yelp-2.14.2.tar.bz2 774551
diff --git a/gnome-extra/yelp/yelp-2.12.1.ebuild b/gnome-extra/yelp/yelp-2.12.1.ebuild
deleted file mode 100644
index 2c5ef68fd757..000000000000
--- a/gnome-extra/yelp/yelp-2.12.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.12.1.ebuild,v 1.2 2005/10/06 22:57:47 vapier Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="firefox"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/orbit-2.12.4
-	>=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.3.1
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/gtk+-2.5.3
-	>=gnome-base/libbonobo-1.108
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-1.103
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	!firefox? ( >=www-client/mozilla-1.7.3 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
-	dev-libs/popt
-	sys-libs/zlib
-	app-arch/bzip2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.28
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-
-pkg_setup() {
-	G2CONF="--enable-man --enable-info"
-
-	if use firefox; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=mozilla"
-	fi
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch ${FILESDIR}/${PN}-2.6.4-makedepfix.patch
-}
diff --git a/gnome-extra/yelp/yelp-2.14.0.ebuild b/gnome-extra/yelp/yelp-2.14.0.ebuild
deleted file mode 100644
index f97532e91337..000000000000
--- a/gnome-extra/yelp/yelp-2.14.0.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/gnome-extra/yelp/yelp-2.14.0.ebuild,v 1.4 2006/05/02 14:02:28 corsair Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="firefox"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/orbit-2.12.4
-	>=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.3.1
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/gtk+-2.5.3
-	>=gnome-base/libbonobo-1.108
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-1.103
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	!firefox? ( >=www-client/mozilla-1.7.3 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
-	dev-libs/popt
-	sys-libs/zlib
-	app-arch/bzip2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.28
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-man --enable-info"
-
-	if use firefox; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=mozilla"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-2.14.0-mozilla-include-fix.patch
-
-	mv aclocal.m4 old_macros.m4
-	AT_M4DIR="m4 ." \
-	eautoreconf
-}
diff --git a/gnome-extra/yelp/yelp-2.14.1.ebuild b/gnome-extra/yelp/yelp-2.14.1.ebuild
deleted file mode 100644
index 1c70bccbb9b2..000000000000
--- a/gnome-extra/yelp/yelp-2.14.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/gnome-extra/yelp/yelp-2.14.1.ebuild,v 1.1 2006/05/06 21:55:03 dang Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="firefox"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/orbit-2.12.4
-	>=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.3.1
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/gtk+-2.5.3
-	>=gnome-base/libbonobo-1.108
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-1.103
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	!firefox? ( >=www-client/mozilla-1.7.3 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
-	dev-libs/popt
-	sys-libs/zlib
-	app-arch/bzip2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.28
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-man --enable-info"
-
-	if use firefox; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=mozilla"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-2.14.0-mozilla-include-fix.patch
-
-	mv aclocal.m4 old_macros.m4
-	AT_M4DIR="m4 ." \
-	eautoreconf
-}
diff --git a/gnome-extra/yelp/yelp-2.14.2.ebuild b/gnome-extra/yelp/yelp-2.14.2.ebuild
deleted file mode 100644
index 450476450fab..000000000000
--- a/gnome-extra/yelp/yelp-2.14.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.14.2.ebuild,v 1.1 2006/06/28 06:03:36 compnerd Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="firefox"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/orbit-2.12.4
-	>=gnome-base/gconf-2
-	>=app-text/gnome-doc-utils-0.3.1
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/gtk+-2.5.3
-	>=gnome-base/libbonobo-1.108
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-1.103
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=dev-libs/libxml2-2.6.5
-	>=dev-libs/libxslt-1.1.4
-	>=x11-libs/startup-notification-0.8
-	!firefox? ( >=www-client/mozilla-1.7.3 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
-	dev-libs/popt
-	sys-libs/zlib
-	app-arch/bzip2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.28
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-man --enable-info"
-
-	if use firefox; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=mozilla"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-2.14.0-mozilla-include-fix.patch
-
-	mv aclocal.m4 old_macros.m4
-	AT_M4DIR="m4 ." eautoreconf
-}