Version bump for Gnome 3.10

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

3 files changed, 13 insertions, 60 deletions

diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog
index 5875593f2477..b97c3c331439 100644
--- a/gnome-extra/gnome-user-docs/ChangeLog
+++ b/gnome-extra/gnome-user-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-user-docs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.69 2013/12/08 18:52:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.70 2013/12/24 17:03:30 pacho Exp $
+
+*gnome-user-docs-3.10.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-user-docs-3.10.2.ebuild,
+  -gnome-user-docs-3.6.2.ebuild, -gnome-user-docs-3.8.1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-user-docs-3.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.8.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.10.2.ebuild
index b9491163fd5b..4723cfbfa542 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.8.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.10.2.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/gnome-user-docs/gnome-user-docs-3.8.1.ebuild,v 1.1 2013/05/14 21:40:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-3.10.2.ebuild,v 1.1 2013/12/24 17:03:30 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,19 +15,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="test"
 
-# Newer gnome-doc-utils is needed for RNGs
-# libxml2 needed for xmllint
-# scrollkeeper is referenced in gnome-user-docs.spec, but is not used
 RDEPEND=""
-DEPEND="test? (
-		>=app-text/gnome-doc-utils-0.20.5
-		dev-libs/libxml2 )"
+DEPEND="
+	test? ( dev-libs/libxml2 )
+"
 # eautoreconf requires:
 #	app-text/yelp-tools
 # rebuilding translations requires:
-#	dev-libs/libxml2
+#	app-text/yelp-tools
 #	dev-util/gettext
-#	dev-util/itstool
 
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
@@ -36,7 +32,7 @@ src_configure() {
 	# itstool is only needed for rebuilding translations
 	# xmllint is only needed for tests
 	gnome2_src_configure \
-		$(usex test XMLLINT=$(type -P true)) \
+		$(usex test "" XMLLINT=$(type -P true)) \
 		ITSTOOL=$(type -P true)
 }
 
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild
deleted file mode 100644
index 49c186acf9f4..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild
+++ /dev/null
@@ -1,49 +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/gnome-user-docs/gnome-user-docs-3.6.2.ebuild,v 1.2 2013/02/07 22:23:14 ulm Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
-
-# Newer gnome-doc-utils is needed for RNGs
-# libxml2 needed for xmllint
-# scrollkeeper is referenced in gnome-user-docs.spec, but is not used
-RDEPEND=""
-DEPEND="test? (
-		>=app-text/gnome-doc-utils-0.20.5
-		dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	dev-libs/libxml2
-#	dev-util/gettext
-#	dev-util/itstool
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-	# xmllint is only needed for tests
-	use test || G2CONF="${G2CONF} XMLLINT=$(type -P true)"
-	gnome2_src_configure
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}