From ae02abeb521de654a7107133e552b83d16760364 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Thu, 29 Jun 2006 15:26:33 +0000 Subject: Fix ampersand handling thanks to clotho in bug #132527. Also drop arm keywords due to mozilla breakage and remove some old versions. (Portage version: 2.1.1_pre1-r5) --- gnome-extra/yelp/ChangeLog | 16 +++++- gnome-extra/yelp/files/digest-yelp-2.14.2-r1 | 3 + .../files/yelp-2.14.2-ampersand-escaping.patch | 15 +++++ gnome-extra/yelp/yelp-2.10.0.ebuild | 6 +- gnome-extra/yelp/yelp-2.12.2.ebuild | 4 +- gnome-extra/yelp/yelp-2.14.2-r1.ebuild | 64 ++++++++++++++++++++++ 6 files changed, 102 insertions(+), 6 deletions(-) create mode 100644 gnome-extra/yelp/files/digest-yelp-2.14.2-r1 create mode 100644 gnome-extra/yelp/files/yelp-2.14.2-ampersand-escaping.patch create mode 100644 gnome-extra/yelp/yelp-2.14.2-r1.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog index 6bd700cd0514..912e5d44d377 100644 --- a/gnome-extra/yelp/ChangeLog +++ b/gnome-extra/yelp/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for gnome-extra/yelp # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.113 2006/06/28 06:03:36 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.114 2006/06/29 15:26:33 dsd Exp $ + + 29 Jun 2006; Daniel Drake + +files/yelp-2.14.2-ampersand-escaping.patch, yelp-2.10.0.ebuild, + -yelp-2.12.1.ebuild, yelp-2.12.2.ebuild, -yelp-2.14.0.ebuild, + -yelp-2.14.1.ebuild, -yelp-2.14.2.ebuild, +yelp-2.14.2-r1.ebuild: + Fix ampersand handling thanks to clotho in bug #132527. Also drop arm + keywords due to mozilla breakage and remove some old versions. + +*yelp-2.14.2-r1 (29 Jun 2006) + + 29 Jun 2006; Daniel Drake + +files/yelp-2.14.2-ampersand-escaping.patch, -yelp-2.14.2.ebuild, + +yelp-2.14.2-r1.ebuild: + Fix ampersand handling thanks to clotho in bug #132527 *yelp-2.14.2 (28 Jun 2006) diff --git a/gnome-extra/yelp/files/digest-yelp-2.14.2-r1 b/gnome-extra/yelp/files/digest-yelp-2.14.2-r1 new file mode 100644 index 000000000000..1756a101fedc --- /dev/null +++ b/gnome-extra/yelp/files/digest-yelp-2.14.2-r1 @@ -0,0 +1,3 @@ +MD5 4294fe3b01824675bd8be9d7936dcaa7 yelp-2.14.2.tar.bz2 774551 +RMD160 6ac35c06dfcac5d49d39d4882ddf665f9489dc06 yelp-2.14.2.tar.bz2 774551 +SHA256 daeb77cea0c9e5bdd931fd10897edd08ef99d539292caf3501ae67c33e1829ef yelp-2.14.2.tar.bz2 774551 diff --git a/gnome-extra/yelp/files/yelp-2.14.2-ampersand-escaping.patch b/gnome-extra/yelp/files/yelp-2.14.2-ampersand-escaping.patch new file mode 100644 index 000000000000..182ab85ebc04 --- /dev/null +++ b/gnome-extra/yelp/files/yelp-2.14.2-ampersand-escaping.patch @@ -0,0 +1,15 @@ +Already merged into upstream gnome-2-14 branch + +Index: yelp-2.14.2/src/yelp-toc-pager.c +=================================================================== +--- yelp-2.14.2.orig/src/yelp-toc-pager.c ++++ yelp-2.14.2/src/yelp-toc-pager.c +@@ -1166,7 +1166,7 @@ process_info_pending (YelpTocPager *page + xmlNewNsProp (new_node, NULL, BAD_CAST "id", + BAD_CAST g_strdup_printf ("infosect%d", sectno)); + sectno++; +- xmlNewChild (new_node, NULL, BAD_CAST "title", ++ xmlNewTextChild (new_node, NULL, BAD_CAST "title", + BAD_CAST *ptr); + g_hash_table_insert (categories, + g_strdup (*ptr), diff --git a/gnome-extra/yelp/yelp-2.10.0.ebuild b/gnome-extra/yelp/yelp-2.10.0.ebuild index 939a97b1dd70..1ff93394be70 100644 --- a/gnome-extra/yelp/yelp-2.10.0.ebuild +++ b/gnome-extra/yelp/yelp-2.10.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.10.0.ebuild,v 1.9 2005/10/06 22:57:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.10.0.ebuild,v 1.10 2006/06/29 15:26:33 dsd Exp $ inherit eutils gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86" +KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86" IUSE="firefox" RDEPEND=">=gnome-base/orbit-2 diff --git a/gnome-extra/yelp/yelp-2.12.2.ebuild b/gnome-extra/yelp/yelp-2.12.2.ebuild index 89b699274221..3703beaa4524 100644 --- a/gnome-extra/yelp/yelp-2.12.2.ebuild +++ b/gnome-extra/yelp/yelp-2.12.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.12.2.ebuild,v 1.9 2006/05/02 14:02:28 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.12.2.ebuild,v 1.10 2006/06/29 15:26:33 dsd Exp $ inherit eutils gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86" +KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86" IUSE="firefox" RDEPEND=">=dev-libs/glib-2 diff --git a/gnome-extra/yelp/yelp-2.14.2-r1.ebuild b/gnome-extra/yelp/yelp-2.14.2-r1.ebuild new file mode 100644 index 000000000000..5492ce1687de --- /dev/null +++ b/gnome-extra/yelp/yelp-2.14.2-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.14.2-r1.ebuild,v 1.1 2006/06/29 15:26:33 dsd Exp $ + +inherit eutils gnome2 autotools + +DESCRIPTION="Help browser for GNOME" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="firefox" + +RDEPEND=">=dev-libs/glib-2 + >=gnome-base/orbit-2.12.4 + >=gnome-base/gconf-2 + >=app-text/gnome-doc-utils-0.3.1 + >=gnome-base/gnome-vfs-2 + >=x11-libs/gtk+-2.5.3 + >=gnome-base/libbonobo-1.108 + >=gnome-base/libglade-2 + >=gnome-base/libgnome-2.0.2 + >=gnome-base/libgnomeui-1.103 + >=gnome-base/libgnomeprint-2.2 + >=gnome-base/libgnomeprintui-2.2 + >=dev-libs/libxml2-2.6.5 + >=dev-libs/libxslt-1.1.4 + >=x11-libs/startup-notification-0.8 + !firefox? ( >=www-client/mozilla-1.7.3 ) + firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 ) + dev-libs/popt + sys-libs/zlib + app-arch/bzip2" + +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.28 + >=dev-util/pkgconfig-0.9" + +DOCS="AUTHORS ChangeLog NEWS README TODO" + + +pkg_setup() { + G2CONF="${G2CONF} --enable-man --enable-info" + + if use firefox; then + G2CONF="${G2CONF} --with-mozilla=firefox" + else + G2CONF="${G2CONF} --with-mozilla=mozilla" + fi +} + +src_unpack() { + gnome2_src_unpack + + epatch ${FILESDIR}/${PN}-2.14.0-mozilla-include-fix.patch + + # Fixes bug #132527, already merged upstream into next 2.14 release + epatch ${FILESDIR}/${P}-ampersand-escaping.patch + + mv aclocal.m4 old_macros.m4 + AT_M4DIR="m4 ." eautoreconf +} -- cgit v1.2.3-65-gdbad