Version bump for Gnome 3.6.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 20 insertions, 66 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/Manifest b/gnome-extra/gnome-user-docs/Manifest
index dfb26b2b823e..5abd519ae8d8 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -2,23 +2,17 @@
 Hash: SHA256
 
 DIST gnome-user-docs-2.32.0.tar.bz2 17858824 SHA256 d42c4435590e5b79c8fcf1d917aee485096c02cdc84338bc31f769219ccc87f7 SHA512 d180295b46338f27f827a1dafb2da129cf34c8453e95adc60ee3205c5623038d08ca2aa744d55a67dbe8054b381de0d3c77293663053dc92a556b27cd1cfeb4a WHIRLPOOL 30ac61319d421a20b81831849aae54055b3a8df4720e636b0562e71abd579920f9c53f5e1a24934faf7d9e5bf5e8bfe8e5702489c234b6ad4da32ef4c3fed9e0
-DIST gnome-user-docs-3.2.1.tar.xz 2985248 SHA256 0b7ea48d945e304bc5b22c9afb8377b419922c53287c2f9c583c65c66ca680f8 SHA512 716f50d62bceda643a9ff43b7d6d9ff24b425188c6be650495bfb9d5afb576be5894e03cbca169762c51ca3398d4172c9aa5e30a58e544fa4cf2fb7922282fd7 WHIRLPOOL 3e5f8cd1529a42c27520159a759213cf6dea226176b15c8b199b177603575e59fb6f9a852b4f3ca80e448fdb95aff67b2e2c2fd5e4f7071767e8e1143b2b2942
-DIST gnome-user-docs-3.4.1.tar.xz 7606180 SHA256 dbbee5a13e0ef9b64366149fc68faeb7716c533a3b613306e9c077d92d38849a SHA512 48e123c562d0260ce6678d05e1108e33da279971dada89242fb3d714cac1e7b88e472e6b9a387ddccdf2c3da8084a722d30a6c145811805a64a5e9e463f6ffd8 WHIRLPOOL 0a661149bd4e56ee2529a43780d8344ceee8e05c7f45f59a8919fff177ce208047ac392bdc70eda67840822e644ae5f11811e249b546655f7d10821e6af30dad
 DIST gnome-user-docs-3.4.2.tar.xz 7692224 SHA256 65ca3921f3afa275b4d64eff2ec29f65d8b118c5e3778b1cd715bd6bdced39cf SHA512 a04197fbefd28cae613c0aca869765768f8928ec754637c985edaee999ef4775e8d33191e544769594367137b09f3bf2817ce2da3af752dea3245ea9ec4ff1f3 WHIRLPOOL 042456226d7d286a2e60ac134d9ce38546312fd0b696cd9682f0498f9d6f7b08d489f5e5e9359088dd73ff54b85a3db35c0d85e6c6e3877bd8074b402dfb53e4
+DIST gnome-user-docs-3.6.2.tar.xz 8142108 SHA256 9c13bda8d2690760699456d5d91d241455af51e21a732689d68f15cbf3664152 SHA512 39d302098b90e1c15c7887727b99c9940757df9964d0844191d1914959bb1d2b70a9a194421a5b75edb50c4dd755d3799c0e557231c6e385e72a21e91c1f2da7 WHIRLPOOL 2f114b9ffdc42b9d38aa61ea94698a48db425d18f43c1e5863005d1cca37d8bff787b3b2c61bea214cc1c3979797ebfeea5608e77f1d65af36f2a94567ed02b5
 EBUILD gnome-user-docs-2.32.0.ebuild 732 SHA256 763a4214431a94929cc44f3a375383271757a83c824df364fc1f2a4c95dcffa4 SHA512 2f3172b2f0da14ea564c82da93e2274f35eee2e18f5ebee540d7fe6e1c2863b5da51e277e09c36f15c8e4a792e7a97e80153defcf123b0739e2f55bf9b0509c0 WHIRLPOOL 18e59d5dfc00462fcd544672656ce995e301de11c3ba28dd2c86cb6a08bd63e3c44af427faf75dd84d4035ad232f194d241325ed3e8a0c28d2a9e6c936c44137
-EBUILD gnome-user-docs-3.2.1.ebuild 1313 SHA256 a9e6b348b37317f067ea9440b2c1e0b985d201115ee0182791644ada9bdc6840 SHA512 cb52af9760294d3c620a227530ba8edd5ffde57109d9e7dbb285abc7135ea538c799111700765cb08b9f32fd960a48154a0a25463b87d6a79def49e663bbc7b1 WHIRLPOOL 60d3e2c676468e0e2dde4c8d3d26e53b6bfb89178cc63b1c1f344fd9538829b89912258b68c53e6105db40206c3bca7c4190f50887ddbaa44730cba701aef96b
-EBUILD gnome-user-docs-3.4.1.ebuild 1313 SHA256 081b533fd8596535fff20edc2bfe5ad3d7096a011a3aeb5ccc610b1e1949657f SHA512 38fe73677ab1d2fa802c37b92888eaf74ba16caa80f9af3c603a6c55b3c78f1294f51237face2d486221e7859e61adb8d7ac762a682372d6e3579676983f7676 WHIRLPOOL 781c0c761a4c542437e582e79ed6399376706c0e81bce59f69880fe9042b1884633fa66174ab67311a2e786f5f4f5ce1417fabc1e7bc2156a1c3755783b82e02
 EBUILD gnome-user-docs-3.4.2.ebuild 1313 SHA256 24be6119c4d5779e09a911c4ac7482379eaff5335d006df9111c9e2e6b226d6c SHA512 2526fd4fc9ea8fe06a05daea7e402fa5ffc1306da2ee3ffd9995c0440045c6efe0830897d66d2d5fd9ba3507bb194e3706bc48f0c4444599188ad7e161d22844 WHIRLPOOL 6ee95f15f50a0917dd66131af2a810fde7abd9021f7e8cb831db010d03f0962787510bde28178f6d5571217122b4f56207347b31979662d25c83de1c6006c5a5
-MISC ChangeLog 21534 SHA256 ce131f609745dc3b7f1795a9bab9ca0d675998a01763af8f0a05680d41dd84f0 SHA512 781f99f9cd474c4965fa30cff523716abe9476281b66e79702c804e9a84fdd6892db05155fdeb21c13cbd4b285ecaca7b9e635d93e790172a756fd2acebc2712 WHIRLPOOL b3c36e878547ef9eb1080dba390ac8e3bd266cfd0149b0d4f8423d2fc5d5ab18664a323595ff357abd3756c74e308dddf66b6f6703ab39f0e20bd4d6cbb28394
-MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+EBUILD gnome-user-docs-3.6.2.ebuild 1333 SHA256 c34577f77b3b867c2f062987092da5aa1249f6242a261f8e3fbccedf915e4d99 SHA512 a7c02296eecf0cc6a331a0ac6e6e4d9a2ba4fc5abe2347b60ec4f0a9de0ba090cc1525aea9b49c0401c780881cec9ef34674a73b4ef100e561a13556dec0addd WHIRLPOOL 07e049968c59422dd17f73d99882f1430b99fb8945717a0749d96872e00b8eccc402b874bb5ccad5f1c053726ef8e84b8937369a64e77e641d4b5c8687a9e560
+MISC ChangeLog 21762 SHA256 15174eef52817b180bf4588dae413a8029a88b37635470fc08e39dd9dc5ac560 SHA512 efa3ebb8bccdb6d493d9cb14cbd433f2a745b3eb8868f9956f91a907adf19d96e7c9a044898024e5c903c3ae79c7c890916740fea2510f940eaf9ddf35ae14e8 WHIRLPOOL ed7ac052f93bd1e5abcbe3a41659a205aa152dadd7b890c7b3554787c032b0e62a7ad8c90e04f52e475315bab926b153c40bf51d3fa443b168e62592af35e11b
+MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQI4EdAAoJEJ0WA1zPCt1hk9cIAKYij949xxir94TJq8etOxap
-l9H18vJHWFCnoYMorXniMHso5ubrVO85J6M4E6WdSIcCzSTegetY5mzSH32H9L7H
-UdtkBinfXWJZ0Kk/YcYNRSnYHqvU+wcKfeVRzGF+7wFLohC+RovcaLUdX5rh2tp6
-GNQmg0E48lrGXGpk9F7qPchbZm2bfB+SACsAy77yV3LYxBzTyUkpRWtu2XBRsp7n
-Bbzv2/gvlx/uB7aX4rwq6r8C9kmie0HKgti76CNSqyeaJnx4BeyHKaPntF4yuFFc
-POqKe9Eq4SWVn/Smv+KppvGnm8Ca9VH5ulVlf4lDQQf2r6J5ObwLcub08jVg6Gw=
-=g07g
+iEYEAREIAAYFAlDXmCwACgkQ1fmVwcYIWAaPLwCfS7I2zlc8hvtK7V8vcfCKnQad
+f3gAn1ygwm2AJV8vvSs44mGUz1Ou4tji
+=CRxQ
 -----END PGP SIGNATURE-----
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>