Bump to 3.2.1 from the gnome overlay. Drop old. Notable changes: bugfixes and stabili...

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 75d0823940aefc7c9a7ac608160d68b9769e4606..09614a279166e9a8f5a498296e7e8ee20928b71d 100644 (file)
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.269 2011/10/05 17:46:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.270 2011/11/04 06:02:36 tetromino Exp $
+
+*yelp-3.2.1 (04 Nov 2011)
+
+  04 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> -yelp-3.0.4.ebuild,
+  +yelp-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay. Drop old. Notable changes: bugfixes and
+  stability improvements. Drop alpha, arm, ia64, ppc, ppc64, sparc keywords due
+  to yelp-xsl dependency.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> yelp-2.30.2-r5.ebuild:
   ppc/ppc64 stable wrt #369909

diff --git a/gnome-extra/yelp/yelp-3.0.4.ebuild b/gnome-extra/yelp/yelp-3.2.1.ebuild
similarity index 70%
rename from gnome-extra/yelp/yelp-3.0.4.ebuild
rename to gnome-extra/yelp/yelp-3.2.1.ebuild
index 053f1f97e93e4cedbf8326eab26afe1a16e81cee..d8317feee597f5ba90314a9b6e4af15abf8edfc6 100644 (file)
--- a/gnome-extra/yelp/yelp-3.0.4.ebuild
+++ b/gnome-extra/yelp/yelp-3.2.1.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-3.0.4.ebuild,v 1.1 2011/08/19 11:02:49 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.2.1.ebuild,v 1.1 2011/11/04 06:02:36 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -13,16 +13,19 @@ 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="doc"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+# FIXME: gtk-doc scanner fails assertion in gtk_icon_theme_get_for_screen().
+# How? Why?
+IUSE="" # doc
 
+# yelp-xsl-3.1.1 neded due to commit ee830ed9
 RDEPEND="
        >=x11-libs/gtk+-2.91.8:3
        >=dev-libs/glib-2.25.11:2
        >=dev-libs/libxml2-2.6.5:2
        >=dev-libs/libxslt-1.1.4
        >=dev-libs/dbus-glib-0.71
-       >=gnome-extra/yelp-xsl-3.0.1
+       >=gnome-extra/yelp-xsl-3.1.1
        >=net-libs/webkit-gtk-1.3.2:3
        >=app-arch/xz-utils-4.9
        app-arch/bzip2
@@ -31,8 +34,8 @@ DEPEND="${RDEPEND}
        >=sys-devel/gettext-0.17
        >=dev-util/intltool-0.41.0
        >=dev-util/pkgconfig-0.9
-       gnome-base/gnome-common
-       doc? ( >=dev-util/gtk-doc-1.13 )"
+       gnome-base/gnome-common"
+#      doc? ( >=dev-util/gtk-doc-1.13 )
 # If eautoreconf:
 #      gnome-base/gnome-common
 
@@ -49,6 +52,7 @@ src_prepare() {
        # Fix compatibility with Gentoo's sys-apps/man
        # https://bugzilla.gnome.org/show_bug.cgi?id=648854
        epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
+
        eautoreconf
 
        gnome2_src_prepare