bump to 2.22.1. Translation fixes and a potentitial security fix.

Package-Manager: portage-2.1.5_rc2

3 files changed, 77 insertions, 6 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 88cb654cfb50..82546e05be4f 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.179 2008/03/23 15:55:49 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.180 2008/04/10 23:02:11 eva Exp $
+
+*yelp-2.22.1 (10 Apr 2008)
+
+  10 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> +yelp-2.22.1.ebuild:
+  bump to 2.22.1. Translation fixes and a potentitial security fix.
 
 *yelp-2.22.0 (23 Mar 2008)
 
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index d42832b83e27..e796e2009e5a 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -5,16 +5,18 @@ DIST yelp-2.16.2.tar.bz2 858693 RMD160 5c33700f40c6f533406d99f06731f2ffcb31d448
 DIST yelp-2.18.1.tar.bz2 900142 RMD160 8aaf7e5f7f37369fa6822eed615f110babbecd28 SHA1 66e446596c22902290d6614b2d356b64d5bd304c SHA256 3add75de19550015a526a875bca66be81f73910561f1a84493d76d990717d1fa
 DIST yelp-2.20.0.tar.bz2 903106 RMD160 381b71583bc98dcce52a3de19407cc7f7e123ab0 SHA1 29c99793174c24f86ad34373ed5798b534aaac9e SHA256 0f4e1c5f3c4bf8d5109794b4d0a340ed847d49381d42968beb405f14b68c61ed
 DIST yelp-2.22.0.tar.bz2 978777 RMD160 711ae5d819513ad36f5418e8397bc22b11001690 SHA1 afb629ac17478982449ebac56dfe28a113617238 SHA256 211b05ff153efff714b7767c4d5bce068562bf242e5f935a703f54d899e30cd0
+DIST yelp-2.22.1.tar.bz2 995734 RMD160 236acd566b5e0cde0cc1365b1fdae75b2451bcce SHA1 29586dd5415fc6470c43dbd68fdb491f91778231 SHA256 6e990b35d914869dc82ada4790e2215ef71c884f6ccb8acf2e7a1c7d4b6f7614
 EBUILD yelp-2.16.2.ebuild 1078 RMD160 447c272d74b726cb01c8d6d6c5e9ebd1b10cba94 SHA1 5d3ae35ab0cc8533298929b73e63251d42d9b508 SHA256 9ed192e3c97fdfbebf42154c05c495fd7a14956fe6665b2395850c80af4d90b5
 EBUILD yelp-2.18.1.ebuild 1231 RMD160 d004768614c3e5e673b617b2bad5303b10ece780 SHA1 104ce5cf40331a033667bf962805e11f1f86f289 SHA256 a9aa5a617e0f83fb493209db4d9d3109fc53d7d35878bdd8550469f623fb44f1
 EBUILD yelp-2.20.0.ebuild 1626 RMD160 4b100f76cdd30e91e9bdc85d9e817fed68283a14 SHA1 9b2acc031b0fc923f736ce963ae0a195ff8a1c0c SHA256 e00b52b39b0943f903fb6180ec7b69062f71a20cb8db6b004b12c9f3bf629f78
 EBUILD yelp-2.22.0.ebuild 1662 RMD160 da73d50465ab0f4ee4d5f42cfe88719ed91ab186 SHA1 79c8900ce02cb8f03d4d422f3d73a8a593b543c3 SHA256 4bea66dd84b5867f68735ba55a44d417692b33e9f0d1007fb6bd7dc3ca728527
-MISC ChangeLog 20453 RMD160 faf66b595507b301cc1a6565e160fe928494cccb SHA1 f6a0c88b8adf00846a8c77edb1f82441fd551e77 SHA256 28f557f93b692361eae150e16ba25071c524d9cea744bbd36fd670de24fc0c9e
+EBUILD yelp-2.22.1.ebuild 1661 RMD160 7b8c25efd8e7139ffce157d670e8ae191567be9f SHA1 c30e24ebfeea3334e5cfc292eda0b24664f96d5b SHA256 268b8619a1ab40f0056d0a043fe54409575bc0cfa7ca8cfea65dc5e079b5db90
+MISC ChangeLog 20624 RMD160 c99e060946c5bc550d6f49eb768b38deab5bba87 SHA1 4433b431abc41810a84806f5314a0f338aed2678 SHA256 c759d1a1da075a817e45f1e701ab987f0ebb3c4f2e85b9b7a0a462cf0146879b
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfmfYEACgkQkeYb6olFHJf65ACfbLc4IsH2M4l20MdnZbXKooY1
-+98AoPasaDibZ407lrun7SzMNKXp95yM
-=WdVO
+iEYEARECAAYFAkf+nIgACgkQ1fmVwcYIWAbejQCg28VoAPh/zjRrZoYUpTkGfsJo
+luwAnjds0uruRnnyrITgTk7jFGcxt/+1
+=BNtw
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/yelp-2.22.1.ebuild b/gnome-extra/yelp/yelp-2.22.1.ebuild
new file mode 100644
index 000000000000..67cc5fc747b2
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.22.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.1.ebuild,v 1.1 2008/04/10 23:02:11 eva Exp $
+
+inherit gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="beagle lzma xulrunner"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.11.1
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gnome-vfs-2
+	>=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/glib-2
+	>=dev-libs/dbus-glib-0.71
+	beagle? ( >=app-misc/beagle-0.2.4 )
+	!xulrunner? ( =www-client/mozilla-firefox-2* )
+	xulrunner? ( =net-libs/xulrunner-1.8* )
+	sys-libs/zlib
+	app-arch/bzip2
+	lzma? ( 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"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# strip stupid options in configure, see bug #196621
+	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure
+}
+
+pkg_setup() {
+	# FIXME: Add patch to make lzma-utils not automagic and use_enable here
+	G2CONF="${G2CONF} --enable-man --enable-info"
+
+	if use beagle; then
+		G2CONF="${G2CONF} --with-search=beagle"
+	else
+		G2CONF="${G2CONF} --with-search=basic"
+	fi
+
+	if use xulrunner; then
+		G2CONF="${G2CONF} --with-gecko=xulrunner"
+	else
+		G2CONF="${G2CONF} --with-gecko=firefox"
+	fi
+}