Drop old yelp that doesn't work with current stable xulrunner. This was also the...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 9497aeb5ccda3eee40e0558ebc2dd1dbb3a78e40..5453fe717d969c565d0b1292d2d1c33aed246c7f 100644 (file)
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.237 2010/07/07 18:58:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.238 2010/07/09 10:43:13 pacho Exp $
+
+  09 Jul 2010; Pacho Ramos <pacho@gentoo.org> -yelp-2.26.0.ebuild:
+  Drop old yelp that doesn't work with current stable xulrunner. This was
+  also the last hppa stable version (bug #324511).
 
   07 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> yelp-2.28.1-r2.ebuild:
   ppc64 stable wrt #314015

diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index b5aeb7ec53ef658c9144504208f708b8db450c7b..6710697d9d12b6902b7147b74b8b8ac11e5d9e0a 100644 (file)
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,14 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX yelp-2.26.0-automagic-lzma.patch 1326 RMD160 9913b5dba53c1dcbc046e790327339e366e10acd SHA1 9992c4e197a502ab2937f8dcef5bf492b0e128df SHA256 1f5686f0d5ddf716dd7ae9844447344bc19750a695d09b3b4e4580178e18c44f
 AUX yelp-2.28.0-include-warning-fix.patch 703 RMD160 ebf02c008cb26130774b1b99137a7ea97e3b9227 SHA1 91f51645b0fd7540c7a581665f181eac7b468798 SHA256 8f8b22c17a8f88a04e44c1b49c009bca21fe9f5ba5726dd6ae4a32084ebdd81c
 AUX yelp-2.28.1-system-nspr.patch 271 RMD160 2933a00fc9e627d20d7d62617a19effa4c0f1566 SHA1 804726aec12d8ffde5c5ea379d2ffcf30a70edb2 SHA256 9d3c5c2a906909596050f8afd762f929c9a4a3d51be14944ccab48149cf9b274
 AUX yelp-2.28.1-xul192-compat.patch 3645 RMD160 64e635662702dae237f5e4d8fd3b4d2cc9ed892e SHA1 b1509be9ac3ea04bba06d0223d6f6aa0c39b9d76 SHA256 004648d03f24b40d162ace2b38f836e989abd1f8d7e17f26d7240c0d043c5939
 AUX yelp-2.30.1-fix-toc.patch 769 RMD160 8fbae215912342a2e8dced497a2e45df352634cb SHA1 acc801f48a1fc3379d26ee85c327a563b0aa1eb8 SHA256 0dbf1a19551ac99c0ab3aafc0122524f8662659a3ec855fdcfecd346c0d0ed85
 AUX yelp-2.30.1-open-link.patch 1364 RMD160 341a95d078d260d45baafb3f9518b5c760c67464 SHA1 9cb1da0c8576c9a546c37d2eddf68ecf2600833c SHA256 6a59b2fd5e0d8c85f24743cc1fc8677687bf62d1ace44aafa581ff5a1950a212
-DIST yelp-2.26.0.tar.bz2 1021362 RMD160 5f6f3f7b504d7522a39ba9e55e22cf2ca75589d7 SHA1 c1c3262d77d4515a0fd0a7840307533fda9ed0ea SHA256 0c5a91a206b26ef714e9929404f1711caadcee481299566011b4ae4232d151d0
 DIST yelp-2.28.1.tar.bz2 1136184 RMD160 0cac3a3504065fece952390a05b9612cfe180f11 SHA1 260719600148490effaba2e78a9d536f251f5b66 SHA256 860cfb348cbe199bca64203c82858d012fe505194573f8290be7a85de6c80a22
 DIST yelp-2.30.1.tar.bz2 1139961 RMD160 a8529e8cbdb021690bcc8a399a1d1b14b0e964ad SHA1 941b4c3aecd379ea2ff26d12a37efe32afbf0ab1 SHA256 4b453e994f8e57bc5c4637dba2c315536f30e90741b74b0bee218cbb436eb20c
-EBUILD yelp-2.26.0.ebuild 1703 RMD160 6f07e357e1090406e3d3fc28916dfb971f8f3691 SHA1 def086d1c36e31640ec7cd424b8a26effac964b5 SHA256 af6fc324406dea3830d6eb71a0a6660981ed2b32332936d17426ab945b84dc8e
 EBUILD yelp-2.28.1-r2.ebuild 1915 RMD160 96be34f58c4f6c83be0582efd16f50c385e8f4d8 SHA1 ca72f0c8c9feaf1727b25932e5820eeee844ed97 SHA256 53457d3cb2dc5c065ec2992d0a6bf5427154d466cfe501cb9a73cb82db6c48ba
 EBUILD yelp-2.30.1-r1.ebuild 1985 RMD160 6f26616fc2e659023028dcf7d243abb31827613d SHA1 e9b2f5d7bef9f33df535d663f6c83e63e81be298 SHA256 e7941b3928fdf35c3c0f5f585eaad39d8d679ca208859ac32950126efdfa1b8b
-MISC ChangeLog 28955 RMD160 af7be0db80328b32aceffc35aa0f3c154b2488bd SHA1 9b16a48fa751ca1fc4561d55e8d34b55a9489cd9 SHA256 a489707b8d7f08c401872d554193d85f654cb6e8e76d672330b6f6805cdbfa25
+MISC ChangeLog 29144 RMD160 31ec128008b649f0b84f024a9d9fa47bd28a8784 SHA1 2c940bfc9cc0f7f0d64482d96a88ef98cad7b78d SHA256 b54e62618b8de26ba9f69ceb78963eccbb70245bf4b7cbfbacf75323f922e750
 MISC metadata.xml 364 RMD160 b8d1a4cb0331c368c94ba6f8b72b52396b1728da SHA1 99cf408c018565500005654707a4bd1b1ab28334 SHA256 7f315cc2f1c8d303ba2dfa5c2542ba3b9b65635a3d1b978032f114ce6ebc5a4c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw2/UcACgkQCaWpQKGI+9SpSACfQUzUK7jf4k+52Pz7WAIZt09O
+I/IAmwe58mshUhFNLRnuLuhKA9sPQ8Ym
+=vUPE
+-----END PGP SIGNATURE-----

diff --git a/gnome-extra/yelp/yelp-2.26.0.ebuild b/gnome-extra/yelp/yelp-2.26.0.ebuild
deleted file mode 100644 (file)
index a6f0826..0000000
--- a/gnome-extra/yelp/yelp-2.26.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.26.0.ebuild,v 1.12 2010/03/08 10:26:09 nirbheek Exp $
-
-EAPI="1"
-
-inherit autotools eutils gnome2
-
-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="beagle lzma"
-
-RDEPEND=">=gnome-base/gconf-2
-       >=app-text/gnome-doc-utils-0.15.2
-       >=x11-libs/gtk+-2.10
-       >=dev-libs/glib-2.16
-       >=gnome-base/libglade-2
-       >=gnome-base/libgnome-2.14
-       >=gnome-base/libgnomeui-2.14
-       >=dev-libs/libxml2-2.6.5
-       >=dev-libs/libxslt-1.1.4
-       >=x11-libs/startup-notification-0.8
-       >=dev-libs/dbus-glib-0.71
-       beagle? ( || (
-               >=dev-libs/libbeagle-0.3.0
-               =app-misc/beagle-0.2* ) )
-       net-libs/xulrunner:1.9
-       !>=net-libs/xulrunner-1.9.2
-       sys-libs/zlib
-       app-arch/bzip2
-       lzma? ( || (
-               app-arch/xz-utils
-               app-arch/lzma-utils ) )
-       >=app-text/rarian-0.7
-       >=app-text/scrollkeeper-9999"
-DEPEND="${RDEPEND}
-       sys-devel/gettext
-       >=dev-util/intltool-0.35
-       >=dev-util/pkgconfig-0.9
-       gnome-base/gnome-common"
-# If eautoreconf:
-#      gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-       gnome2_src_unpack
-
-       # Fix automagic lzma support, bug #266128
-       epatch "${FILESDIR}/${P}-automagic-lzma.patch"
-
-       eautoreconf
-
-       # strip stupid options in configure, see bug #196621
-       sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed failed"
-}
-
-pkg_setup() {
-       G2CONF="${G2CONF}
-               --with-gecko=libxul-embedding
-               $(use_enable lzma)"
-
-       if use beagle; then
-               G2CONF="${G2CONF} --with-search=beagle"
-       else
-               G2CONF="${G2CONF} --with-search=basic"
-       fi
-}