Version bump for gnome-3.6. Drop unused dbus-glib dependency, thanks to Rafał Mużyło for noticing. Remove useless doc USE flag. Drop old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 30 insertions, 94 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 12eb4279b138..619c22d6fc8e 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.293 2012/06/24 15:58:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.294 2012/12/19 02:12:52 tetromino Exp $
+
+*yelp-3.6.2 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  yelp-2.30.2-r200.ebuild, -yelp-3.2.1.ebuild, -yelp-3.4.1.ebuild,
+  yelp-3.4.2.ebuild, +yelp-3.6.2.ebuild:
+  Version bump for gnome-3.6. Drop unused dbus-glib dependency, thanks to
+  Rafał Mużyło for noticing. Remove useless doc USE flag. Drop old.
 
   24 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> yelp-2.30.2-r200.ebuild:
   Use Gentoo mirrors.
diff --git a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild b/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
index 65af8292db3e..8bf6950d7ab8 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r200.ebuild,v 1.9 2012/06/24 15:58:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r200.ebuild,v 1.10 2012/12/19 02:12:52 tetromino Exp $
 
 # git clone git://git.gnome.org/yelp
 # cd yelp
@@ -17,7 +17,7 @@ DESCRIPTION="Help browser for GNOME"
 HOMEPAGE="http://projects.gnome.org/yelp/"
 SRC_URI="mirror://gentoo/${MY_P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="lzma"
diff --git a/gnome-extra/yelp/yelp-3.4.1.ebuild b/gnome-extra/yelp/yelp-3.4.1.ebuild
deleted file mode 100644
index 962a6802e1dc..000000000000
--- a/gnome-extra/yelp/yelp-3.4.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.4.1.ebuild,v 1.3 2012/05/22 03:18:43 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-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="
-	app-arch/bzip2
-	>=app-arch/xz-utils-4.9
-	dev-db/sqlite:3
-	>=dev-libs/dbus-glib-0.71
-	>=dev-libs/glib-2.25.11:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-3.3.2
-	>=net-libs/webkit-gtk-1.3.2:3
-	>=x11-libs/gtk+-2.91.8:3
-	x11-themes/gnome-icon-theme-symbolic"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common"
-#	doc? ( >=dev-util/gtk-doc-1.13 )
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-bz2
-		--enable-lzma"
-}
-
-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
-}
diff --git a/gnome-extra/yelp/yelp-3.4.2.ebuild b/gnome-extra/yelp/yelp-3.4.2.ebuild
index d938339e9680..cddb33d8acb2 100644
--- a/gnome-extra/yelp/yelp-3.4.2.ebuild
+++ b/gnome-extra/yelp/yelp-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.4.2.ebuild,v 1.3 2012/05/22 03:18:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.4.2.ebuild,v 1.4 2012/12/19 02:12:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,19 +11,16 @@ inherit autotools eutils gnome2
 DESCRIPTION="Help browser for GNOME"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 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
+IUSE=""
 
 # yelp-xsl-3.1.1 neded due to commit ee830ed9
 RDEPEND="
 	app-arch/bzip2
 	>=app-arch/xz-utils-4.9
 	dev-db/sqlite:3
-	>=dev-libs/dbus-glib-0.71
 	>=dev-libs/glib-2.25.11:2
 	>=dev-libs/libxml2-2.6.5:2
 	>=dev-libs/libxslt-1.1.4
@@ -32,25 +29,23 @@ RDEPEND="
 	>=x11-libs/gtk+-2.91.8:3
 	x11-themes/gnome-icon-theme-symbolic"
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.41.0
 	dev-util/itstool
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	gnome-base/gnome-common"
-#	doc? ( >=dev-util/gtk-doc-1.13 )
 # If eautoreconf:
 #	gnome-base/gnome-common
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
 		--enable-bz2
 		--enable-lzma"
-}
 
-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"
diff --git a/gnome-extra/yelp/yelp-3.2.1.ebuild b/gnome-extra/yelp/yelp-3.6.2.ebuild
index e1e3139063c6..d3ab41ac591e 100644
--- a/gnome-extra/yelp/yelp-3.2.1.ebuild
+++ b/gnome-extra/yelp/yelp-3.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.2.1.ebuild,v 1.5 2012/05/22 03:18:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.6.2.ebuild,v 1.1 2012/12/19 02:12:52 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -11,45 +11,39 @@ inherit autotools eutils gnome2
 DESCRIPTION="Help browser for GNOME"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 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
+IUSE=""
 
-# yelp-xsl-3.1.1 neded due to commit ee830ed9
 RDEPEND="
-	>=x11-libs/gtk+-2.91.8:3
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite: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.1.1
+	>=gnome-extra/yelp-xsl-3.6.1
 	>=net-libs/webkit-gtk-1.3.2:3
-	>=app-arch/xz-utils-4.9
-	app-arch/bzip2
-	dev-db/sqlite:3
+	>=x11-libs/gtk+-2.91.8:3
 	x11-themes/gnome-icon-theme-symbolic"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
+	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.41.0
+	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	gnome-base/gnome-common"
-#	doc? ( >=dev-util/gtk-doc-1.13 )
 # If eautoreconf:
 #	gnome-base/gnome-common
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
 		--enable-bz2
-		--enable-lzma"
-}
+		--enable-lzma
+		ITSTOOL=$(type -P true)"
 
-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"