Version bump for Gnome 3.6.

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

4 files changed, 13 insertions, 53 deletions

diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog
index d169367278ea..02990eb768c8 100644
--- a/gnome-extra/gnome-user-docs/ChangeLog
+++ b/gnome-extra/gnome-user-docs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-user-docs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.60 2012/08/09 09:21:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.61 2012/12/23 23:47:55 eva Exp $
+
+*gnome-user-docs-3.6.2 (23 Dec 2012)
+
+  23 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-user-docs-3.2.1.ebuild, -gnome-user-docs-3.4.1.ebuild,
+  +gnome-user-docs-3.6.2.ebuild, metadata.xml:
+  Version bump for Gnome 3.6.
 
 *gnome-user-docs-3.4.2 (09 Aug 2012)
 
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.2.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.2.1.ebuild
deleted file mode 100644
index 8bb754eb1ac8..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 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.2.1.ebuild,v 1.1 2011/11/04 06:21:46 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="CCPL-Attribution-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"
-
-pkg_setup() {
-	# 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)"
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.4.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild
index 720e9fcebc2b..1706769537b1 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.4.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-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/gnome-user-docs/gnome-user-docs-3.4.1.ebuild,v 1.1 2012/05/14 06:05:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-3.6.2.ebuild,v 1.1 2012/12/23 23:47:55 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -34,11 +34,12 @@ RESTRICT="binchecks strip"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-pkg_setup() {
+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() {
diff --git a/gnome-extra/gnome-user-docs/metadata.xml b/gnome-extra/gnome-user-docs/metadata.xml
index da6fd63d0085..6e0e2ecb48ca 100644
--- a/gnome-extra/gnome-user-docs/metadata.xml
+++ b/gnome-extra/gnome-user-docs/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome</herd>
 </pkgmetadata>