From 4fa202e49d5558f710228c7543b7928ccf09444e Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Mon, 28 Nov 2011 16:45:57 +0000 Subject: [PATCH] Now that xul-2 patch is compatible with 1.9 also keywords can be recovered. Drop old. Package-Manager: portage-2.1.10.38/cvs/Linux x86_64 --- gnome-extra/yelp/ChangeLog | 7 ++- gnome-extra/yelp/Manifest | 15 +++---- gnome-extra/yelp/yelp-2.30.2-r1.ebuild | 62 -------------------------- gnome-extra/yelp/yelp-2.30.2-r6.ebuild | 4 +- 4 files changed, 15 insertions(+), 73 deletions(-) delete mode 100644 gnome-extra/yelp/yelp-2.30.2-r1.ebuild diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog index 18cf10564286..76cb8b0148ca 100644 --- a/gnome-extra/yelp/ChangeLog +++ b/gnome-extra/yelp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/yelp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.271 2011/11/24 03:49:04 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.272 2011/11/28 16:45:57 pacho Exp $ + + 28 Nov 2011; Pacho Ramos -yelp-2.30.2-r1.ebuild, + yelp-2.30.2-r6.ebuild: + Now that xul-2 patch is compatible with 1.9 also keywords can be recovered. + Drop old. 24 Nov 2011; Alexandre Rostovtsev yelp-2.30.2-r6.ebuild, -files/yelp-2.30.2-port-to-xulrunner-2-r1.patch, diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest index 563de7b622b6..23f0c9401731 100644 --- a/gnome-extra/yelp/Manifest +++ b/gnome-extra/yelp/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX yelp-2.26.0-automagic-lzma.patch 1326 RMD160 9913b5dba53c1dcbc046e790327339e366e10acd SHA1 9992c4e197a502ab2937f8dcef5bf492b0e128df SHA256 1f5686f0d5ddf716dd7ae9844447344bc19750a695d09b3b4e4580178e18c44f AUX yelp-2.28.1-system-nspr.patch 271 RMD160 2933a00fc9e627d20d7d62617a19effa4c0f1566 SHA1 804726aec12d8ffde5c5ea379d2ffcf30a70edb2 SHA256 9d3c5c2a906909596050f8afd762f929c9a4a3d51be14944ccab48149cf9b274 @@ -14,16 +14,15 @@ AUX yelp-2.30.2-uri-handler.patch 860 RMD160 4b9d9bf1d2e666094e2b287d54bd99c952c AUX yelp-3.0.3-man-compatibility.patch 4226 RMD160 6620b4a546f3be6fa7bde62a3757eafca6a80f9f SHA1 4772bce1e30f14aeb7c5f5ab53bd68a4bb9fb8bd SHA256 9b76f13236170ccbfa24060a18bdfaaad9bfe3490dc42abd9a1dee106f82c1f1 DIST yelp-2.30.2.tar.bz2 1159521 RMD160 a92fde9f64489c5dee6a249964245b087aab5981 SHA1 b36d36449ff19844a429b4e2bd5eaad0a7537281 SHA256 5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165 DIST yelp-3.2.1.tar.xz 855804 RMD160 69a17688daf6303cc2a20d5f144a44dd04d4043c SHA1 2cd1d68b36f7944ab8f840e8beccb8ba0d42d5d5 SHA256 f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d -EBUILD yelp-2.30.2-r1.ebuild 1655 RMD160 011dd64ea3380ad3406af0bcf8cb2f35b61a39a4 SHA1 53111e9c7396ada0bfab370a0e6c3de755d093cf SHA256 1de6153e89eb37a9609adfbc25f36e4857f916cbde80c987950642352e6ca3b1 EBUILD yelp-2.30.2-r5.ebuild 2404 RMD160 4123d73d879f07c15a9f48ee0145f8a63fa65dba SHA1 748b326fcc7adfae38925bc0d792bc1de92dff80 SHA256 2816fd8bfdb7335d2c359b0268f15af18de22af3c52cc7e0768665cac2e1377e -EBUILD yelp-2.30.2-r6.ebuild 2385 RMD160 dc7a2cdb5e218f272f6548754774cb4648d2ad58 SHA1 894766a9306c5fd64053cf11b127bd305266e377 SHA256 eda2f0bd5f8c11cc3b2545106da8bf2771ef9db138d6d526eee4eb50a431d694 +EBUILD yelp-2.30.2-r6.ebuild 2406 RMD160 c79023e639f609819460e4457768b9d0023ad498 SHA1 7775f7371ab3c139ed272b1a711ff766afadad3f SHA256 133352ab395a70995a59c8b2bedd5878a1c6e593b70014cb2507315a26c35f94 EBUILD yelp-3.2.1.ebuild 1466 RMD160 49ae52d2715649aa5b97bcc81275f988c773d18a SHA1 307c81d4c3c2dd84c87d95c7a908c9c2a22f24bf SHA256 698dccbb1aeae44dfc7b1ca50ad1905de56c274f9c50cd4929af00959f846c9e -MISC ChangeLog 34659 RMD160 7d4be57f477cf72e5f1934049a22e27b1c950c1e SHA1 451ece7a854fe57fa98a0635cc40c3eade12ab9c SHA256 0d340c5b0d68b0dff434dfffb502298318f48b8ae77e7a034f32093b8f0e8c32 +MISC ChangeLog 34841 RMD160 f35b86bd0c8990649c0d504733e4c668faad05d9 SHA1 a69beb70021c4dad54b4accd18fc45e22c5d52f1 SHA256 6ab57aed68ab015528860aaf9743b043cbc09ab7177171152ccc463cb48c2582 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk7Nvr4ACgkQdjK8w9WeBnBbcQEAhaRPg8/rb9iGeVWEHijRIcGS -CLxfL0CdD9oW0QrgwQQA+gNNehqXaDQEAq8TRX1E2Y213Q2VHrrASmfnJ55WiNvO -=gxte +iEYEARECAAYFAk7TussACgkQCaWpQKGI+9Q5PQCfa2KcLPpq3piPS9o4uGgeyKhe +9uMAnA+f09Ox1thpcz26ItDVYqBa1F4g +=Ij/z -----END PGP SIGNATURE----- diff --git a/gnome-extra/yelp/yelp-2.30.2-r1.ebuild b/gnome-extra/yelp/yelp-2.30.2-r1.ebuild deleted file mode 100644 index 55286b6fffff..000000000000 --- a/gnome-extra/yelp/yelp-2.30.2-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r1.ebuild,v 1.7 2011/03/23 08:32:01 nirbheek Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit autotools eutils gnome2 - -DESCRIPTION="Help browser for GNOME" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -# FIXME: lzma/xz support will be fixed in yelp3, bug #314923 -IUSE="" - -RDEPEND=">=gnome-base/gconf-2:2 - >=app-text/gnome-doc-utils-0.19.1 - >=x11-libs/gtk+-2.18:2 - >=dev-libs/glib-2.16:2 - >=dev-libs/libxml2-2.6.5:2 - >=dev-libs/libxslt-1.1.4 - >=x11-libs/startup-notification-0.8 - >=dev-libs/dbus-glib-0.71 - net-libs/xulrunner:1.9 - sys-libs/zlib - app-arch/bzip2 - >=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 - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - --with-gecko=libxul-embedding - --with-search=basic - --disable-lzma" -} - -src_prepare() { - gnome2_src_prepare - - # Fix automagic lzma support, bug #266128 - epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch" - - # Fix build with xulrunner-1.9.2 - epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - - # strip stupid options in configure, see bug #196621 - sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed failed" -} diff --git a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild b/gnome-extra/yelp/yelp-2.30.2-r6.ebuild index 3463175cc5b1..dfef57df062f 100644 --- a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild +++ b/gnome-extra/yelp/yelp-2.30.2-r6.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/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.3 2011/11/24 03:49:04 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.4 2011/11/28 16:45:57 pacho Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -13,7 +13,7 @@ HOMEPAGE="http://projects.gnome.org/yelp/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" # FIXME: lzma/xz support will be fixed in yelp3, bug #314923 IUSE="" -- 2.26.2