Version bump for Gnome 3.10

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 14 insertions, 62 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 658af573f7fa..2a25a24f0dea 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.305 2013/12/08 19:01:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.306 2013/12/24 17:15:46 pacho Exp $
+
+*yelp-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +yelp-3.10.1.ebuild,
+  -yelp-3.6.2.ebuild, -yelp-3.8.0.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> yelp-3.8.1.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/yelp/yelp-3.8.0.ebuild b/gnome-extra/yelp/yelp-3.10.1.ebuild
index d920bfe30774..c3ade62a65d4 100644
--- a/gnome-extra/yelp/yelp-3.8.0.ebuild
+++ b/gnome-extra/yelp/yelp-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.8.0.ebuild,v 1.2 2013/03/29 22:56:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.10.1.ebuild,v 1.1 2013/12/24 17:15:46 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -8,12 +8,12 @@ GCONF_DEBUG="yes"
 inherit autotools eutils gnome2
 
 DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://projects.gnome.org/yelp/ https://live.gnome.org/Yelp"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
@@ -25,13 +25,15 @@ RDEPEND="
 	>=gnome-extra/yelp-xsl-3.6.1
 	>=net-libs/webkit-gtk-1.3.10:3
 	>=x11-libs/gtk+-2.91.8:3
-	x11-themes/gnome-icon-theme-symbolic"
+	x11-themes/gnome-icon-theme-symbolic
+"
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.41.0
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	gnome-base/gnome-common"
+	gnome-base/gnome-common
+"
 # If eautoreconf:
 #	gnome-base/gnome-common
 
@@ -39,9 +41,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
 }
 
diff --git a/gnome-extra/yelp/yelp-3.6.2.ebuild b/gnome-extra/yelp/yelp-3.6.2.ebuild
deleted file mode 100644
index cdd0b2acbcb5..000000000000
--- a/gnome-extra/yelp/yelp-3.6.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.6.2.ebuild,v 1.7 2013/02/02 22:41:58 ago Exp $
-
-EAPI="5"
-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="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	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
-	>=gnome-extra/yelp-xsl-3.6.1
-	>=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/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-bz2
-		--enable-lzma
-		ITSTOOL=$(type -P true)"
-
-	# 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
-}