Disable lzma support since it's not compatible with xz-utils and it won't be solved until yelp3 (bug #314923), also disable beagle support as it's broken, dead all will be dropped soon (bug #353533).

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

3 files changed, 82 insertions, 2 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index c3ac899d009f..1450c36dbce4 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.250 2011/01/30 18:58:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.251 2011/02/12 16:18:27 pacho Exp $
+
+*yelp-2.30.2-r1 (12 Feb 2011)
+
+  12 Feb 2011; Pacho Ramos <pacho@gentoo.org> +yelp-2.30.2-r1.ebuild:
+  Disable lzma support since it's not compatible with xz-utils and it won't be
+  solved until yelp3 (bug #314923), also disable beagle support as it's broken,
+  dead all will be dropped soon (bug #353533).
 
   30 Jan 2011; Raúl Porcel <armin76@gentoo.org> yelp-2.30.2.ebuild:
   alpha/arm/ia64/sparc stable wrt #348987
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index ffe353200fc1..dbf5aa73cdfc 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,3 +1,6 @@
+-----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.1-system-nspr.patch 271 RMD160 2933a00fc9e627d20d7d62617a19effa4c0f1566 SHA1 804726aec12d8ffde5c5ea379d2ffcf30a70edb2 SHA256 9d3c5c2a906909596050f8afd762f929c9a4a3d51be14944ccab48149cf9b274
 AUX yelp-2.30.1-fix-toc.patch 769 RMD160 8fbae215912342a2e8dced497a2e45df352634cb SHA1 acc801f48a1fc3379d26ee85c327a563b0aa1eb8 SHA256 0dbf1a19551ac99c0ab3aafc0122524f8662659a3ec855fdcfecd346c0d0ed85
@@ -5,6 +8,14 @@ AUX yelp-2.30.1-open-link.patch 1364 RMD160 341a95d078d260d45baafb3f9518b5c760c6
 DIST yelp-2.30.1.tar.bz2 1139961 RMD160 a8529e8cbdb021690bcc8a399a1d1b14b0e964ad SHA1 941b4c3aecd379ea2ff26d12a37efe32afbf0ab1 SHA256 4b453e994f8e57bc5c4637dba2c315536f30e90741b74b0bee218cbb436eb20c
 DIST yelp-2.30.2.tar.bz2 1159521 RMD160 a92fde9f64489c5dee6a249964245b087aab5981 SHA1 b36d36449ff19844a429b4e2bd5eaad0a7537281 SHA256 5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165
 EBUILD yelp-2.30.1-r1.ebuild 1973 RMD160 85452f06ca5eaa813e58d39580d1411c2f3ccd0f SHA1 38f1c660b1ddfbb9931f4956a6e6d29220bc2318 SHA256 3daef8e5f31614d4b3bae1539e4fb62c01627fbf8895fbaff6693f9c8ad1c210
+EBUILD yelp-2.30.2-r1.ebuild 1656 RMD160 1091ad6ec2a8c359306fb9beee4433d4228efc5e SHA1 fa059c3ca586fb41de089d139735dd93b6c5bd77 SHA256 2c32edbbd23c13d57b3f4c285d1a6264919f293ab895824649257992b1382915
 EBUILD yelp-2.30.2.ebuild 1811 RMD160 e824ff7bd8809f49f45aff9e915568fca33e1238 SHA1 0298fa2cfaa09e7eed21c8d9e646e757cf40540c SHA256 e27ee90c5647f3ba8749a255090b8adebd2bed56812c76f6204e6970834a0002
-MISC ChangeLog 30619 RMD160 7a3e0e1afb4879d1d8ffc16663fb013239b0c122 SHA1 0bc77133338bdf94868a0f391877957e72e77bb1 SHA256 386325b7e2f1c0fa90e12093ee9fa734f664c38276d6150778f40f6d52aefc3b
+MISC ChangeLog 30925 RMD160 2933194f0812caaaecbdba6c2ca9582586b02f8f SHA1 cdddf4048c0107f5d1dd9c185a03d56f5eb1cc8d SHA256 166915ab04bf69059b6e6ff690845c09c6cd86ce6d22afd8b9c54491c35877a6
 MISC metadata.xml 364 RMD160 b8d1a4cb0331c368c94ba6f8b72b52396b1728da SHA1 99cf408c018565500005654707a4bd1b1ab28334 SHA256 7f315cc2f1c8d303ba2dfa5c2542ba3b9b65635a3d1b978032f114ce6ebc5a4c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk1WstkACgkQCaWpQKGI+9QxwwCeL048xzTHa11AVZPrUbCcQWj5
+8fMAn1EYhyv3PUimExDC4BvKqqdtVFbz
+=XH5u
+-----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
new file mode 100644
index 000000000000..159682969a13
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.30.2-r1.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2011/02/12 16:18:27 pacho 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
+	>=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
+	>=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"
+}