Version bump. Include patches from r1, plus i18n updates.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

3 files changed, 84 insertions, 5 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index fce72fa7f4e1..b2c558545710 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.242 2010/09/11 18:52:26 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.243 2010/09/29 21:17:22 eva Exp $
+
+*yelp-2.30.2 (29 Sep 2010)
+
+  29 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> +yelp-2.30.2.ebuild:
+  Version bump. Include patches from r1, plus i18n updates.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> yelp-2.30.1-r1.ebuild:
   Marked ppc for bug #324077.
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 75219916e384..4b7a06b66b58 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -9,14 +9,16 @@ AUX yelp-2.30.1-fix-toc.patch 769 RMD160 8fbae215912342a2e8dced497a2e45df352634c
 AUX yelp-2.30.1-open-link.patch 1364 RMD160 341a95d078d260d45baafb3f9518b5c760c67464 SHA1 9cb1da0c8576c9a546c37d2eddf68ecf2600833c SHA256 6a59b2fd5e0d8c85f24743cc1fc8677687bf62d1ace44aafa581ff5a1950a212
 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
+DIST yelp-2.30.2.tar.bz2 1159521 RMD160 a92fde9f64489c5dee6a249964245b087aab5981 SHA1 b36d36449ff19844a429b4e2bd5eaad0a7537281 SHA256 5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165
 EBUILD yelp-2.28.1-r2.ebuild 1903 RMD160 f5728f986d34f571cd1ea38b18b1190a942e95f7 SHA1 99258310b0f41d4af0d615cc47e7a26c17744fa1 SHA256 1f4a280db6ed405c1691a03dd0208d110ec939a978d4cff0bbb22d447561847c
 EBUILD yelp-2.30.1-r1.ebuild 1977 RMD160 061a2ded94a38de017f0f079355c1cba1b9c28ba SHA1 3cc1770769b514c9550769f542780babf2a92c2f SHA256 741ba90543ccf87b7e9c38d91cb8f7dab96ef7f189af80fe9996f3015fa4498b
-MISC ChangeLog 29584 RMD160 f5bab4fd500c765419e72ffdce50fdf0e7f8609a SHA1 935af25c89ef164e9df6b4510338f8ca19194135 SHA256 ff902bd7560bb2bb835a27ae868c52885ec7b18f09e317061c8e1be898985492
+EBUILD yelp-2.30.2.ebuild 1809 RMD160 4a2d1d8cdf5658ca40d723c3f7b7e37a89c7a7ca SHA1 24ebafd5008db3386823389d385fe2cc3ed35c59 SHA256 4f15e7dfadb2dac4f9be9aac1ac7129b8ec892cd0439422da04d3e446222712e
+MISC ChangeLog 29745 RMD160 6d69845703ff0f1a8838be93a81623e4e7f7b539 SHA1 0199520c0ffd88b90b9a028baa5270cfcfaf3739 SHA256 c3ac716f13bc63a911f623aea04e971a63e848b32932653233150226aaec8217
 MISC metadata.xml 364 RMD160 b8d1a4cb0331c368c94ba6f8b72b52396b1728da SHA1 99cf408c018565500005654707a4bd1b1ab28334 SHA256 7f315cc2f1c8d303ba2dfa5c2542ba3b9b65635a3d1b978032f114ce6ebc5a4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyLzv0ACgkQcsIHjyDViGQWfwCdGDS052j017hWrtrfBZM53p1O
-CYYAn2RGtrSoRKt8LOyioMRdzWkuPgb+
-=7J1O
+iEYEARECAAYFAkyjrOcACgkQ1fmVwcYIWAbv9ACgzGBMp3bObnyvQQVRLVlyrk9w
+P4YAoNjqeBjtp1GnhRE4z12SVUkq+UGi
+=/pwM
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/yelp-2.30.2.ebuild b/gnome-extra/yelp/yelp-2.30.2.ebuild
new file mode 100644
index 000000000000..d281f86e3104
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.30.2.ebuild
@@ -0,0 +1,72 @@
+# 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.30.2.ebuild,v 1.1 2010/09/29 21:17:22 eva Exp $
+
+EAPI="2"
+
+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"
+IUSE="beagle lzma"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.19.1
+	>=x11-libs/gtk+-2.18
+	>=dev-libs/glib-2.16
+	>=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
+	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"
+
+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
+}
+
+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"
+}