Version bump for gnome-3.6. Update license. Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 41 insertions, 58 deletions

diff --git a/dev-util/gnome-devel-docs/ChangeLog b/dev-util/gnome-devel-docs/ChangeLog
index 38311a8f955c..7fbbb9ea03fd 100644
--- a/dev-util/gnome-devel-docs/ChangeLog
+++ b/dev-util/gnome-devel-docs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/gnome-devel-docs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnome-devel-docs/ChangeLog,v 1.12 2012/05/14 06:05:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnome-devel-docs/ChangeLog,v 1.13 2012/12/17 11:31:40 tetromino Exp $
+
+*gnome-devel-docs-3.6.2 (17 Dec 2012)
+
+  17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-devel-docs-2.30.1.ebuild, gnome-devel-docs-2.32.0.ebuild,
+  -gnome-devel-docs-3.2.1.ebuild, gnome-devel-docs-3.4.1.ebuild,
+  +gnome-devel-docs-3.6.2.ebuild:
+  Version bump for gnome-3.6. Update license. Drop old.
 
 *gnome-devel-docs-3.4.1 (14 May 2012)
 
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index 881884bcfd85..a96080ed148c 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,10 +1,22 @@
-DIST gnome-devel-docs-2.30.1.tar.bz2 4402369 SHA256 073570bd0057a836cc000a1964cfa674728c14152027e2876bbee98c723845a0 SHA512 0c7e4460464f95254351db73d1371b52fefe863d2ae1cad277d144ed88d2aa343a21249fc0cb6fc211a6e76e6875ddcc81c2b06c7203d3799fffd58299c41e51 WHIRLPOOL 18475259bb5833be910d681a90ad318ca73a7d1fd330428436d5e5c8c8baeb233a6ea09ef685a35d3db93256dce836e0f70cffeb4c4f3fdd1793e554d948abca
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gnome-devel-docs-2.32.0.tar.bz2 4841916 SHA256 38f6c48c35179d667b637e8d65bd35045d8b54b4f8079220633d9a59cafa4b26 SHA512 ff6e76c26e5c5cbf3168a6e3de67f6502745fe44ddbb62416862189e1b8fb9b35b1aeb81f4429e439a621b99bdfbf2566ae6a7c7d8cbfb2308f353bccda017c6 WHIRLPOOL 780a9016cf0a898db46fee381e7643744fc8d9e960837655f9ffd417db9d317858189fb4289333348167c306eba143f33b41a792455cb1298d27218e4edf3724
-DIST gnome-devel-docs-3.2.1.tar.xz 4746264 SHA256 15587e20267ad966cc723d88ccfd650952c442d8751b2d82c2a87c7f1cde9d5c SHA512 ae0a0ea2034a1fb83ceeef72747286220f2ffeaef54814726a353ce85a28415e4078185e65a735e038f23b984efb6507116c1052cef0819f38c2eda3967f87eb WHIRLPOOL e33653d0b860a5ccadb83142d2c151a9d2d6615d9e374dbc68bc25a63d42b2ba7b05c0476db80a094d7726dc9cdfc2177a47ad54f39f5d947fa61120a2b8faac
 DIST gnome-devel-docs-3.4.1.tar.xz 6081008 SHA256 5eb0cf7eb1fa232007c4b63e1283085e81e159eeefc379ec51ae2c4ea97a39dd SHA512 60001d1fb9b5a29ff5a2f8518749f19ad8b231487d2e1f10dc25d1d838bb88db84279fcacd76c2e074fc60a050165e05fc5ada71462e0f12b2a3495a659d2e8b WHIRLPOOL ed18c4b3e9d21a8c11db4a60bfce45425c7693eb01d9fa20e2126ce6dc58de5e171470731491fe4f0c4c3e78aaabae8cccf418c38e8a0ee677fb5a3a6a86289c
-EBUILD gnome-devel-docs-2.30.1.ebuild 1047 SHA256 19834309014560287ddf8620fb3dac85a6b20ba573a90abe4d312bc2a1357ecb SHA512 6e949a7d0a6ae873309dd4f93dc2e681fa5ddffda29f6f13dbdb8063d04773445f1f1a5aa9e04b0059f1ee290d3fb45989cc6833c3cf73c4dc6cda843aa630a4 WHIRLPOOL 82439c78c17c5ef3d9e5b02a4c04e01f6c5436e785970da1ecfa3b56f7adc1ecc5ecdb7081d03a5f9057f8901dbeac9def54ddd77dcd66f2e324a5522b3fb087
-EBUILD gnome-devel-docs-2.32.0.ebuild 653 SHA256 cbecf238219914731345597fe836dc718f6008168f928efe8b79c5e1d7fe3a35 SHA512 eb47d1631342486c9340585935d9ddeffaca9debe2368f28c1f9e24f98339beafd6b8408eb731aff0fb9f9a3c01d63eeabb3ff5fbaf63015124f69300e810620 WHIRLPOOL 145cc219405015c726dbe6a0a07c55b901f15f4140ddea2e2942c02ccf42caa02c84b81a7091c0ba854a8896038bce38e74b654ecb7bd0902b755951d9094f71
-EBUILD gnome-devel-docs-3.2.1.ebuild 810 SHA256 1bf8de7ac951625ee1357e21925de67d57846b842a0ef79fc8f09202e35d4ee2 SHA512 e90c2e5371aef337ba84a08157d04139eff86a8285b1b8defc8633f60738eca656eb7b9de4404231c80199d6e89fe856efcb5e45cec5dc38c18f636626af0544 WHIRLPOOL 53b8e10902992ca5dc545990fa74545a224ccb3b10ea6a6000ec47c417d4ada880d7ddd2ac87ee52dddd9efeb4b697081677ff287438b93dcdc54b66542153a8
-EBUILD gnome-devel-docs-3.4.1.ebuild 813 SHA256 26a800711114f5cb746f183f0e152149c441cb3d1b4fd8cbbddc79b60e10d0c3 SHA512 d7d644a4587c17a2d4614371571157f298749c40dace2001a9dbb446cf2b27983e1ff9ff92bde3674bf1fc3602b9f6d1db350db67100c2725d1563a1945e25a3 WHIRLPOOL 07b98ef18c85e9cad3674da44b49379910384183a6e1673e6e7a41316392649ce6a2f78a0be606de9eea0b2e0b1a0adfa74ba85dcf0203f40204134b3df3d08b
-MISC ChangeLog 2297 SHA256 7173f55d1078053ebecb2b8724e26a61dba9196c35a3fff5a5df9e3e513447dc SHA512 b1dc0f548f6c98a492a5b85b90b700bff9ce24121f9dc891589c637fcf278ccce5d28788f572df189faeaa67d31e42101decf03629219216a1cfa6b59f1ba99c WHIRLPOOL dd956a299a3b43a5071283ed6e01d6b165263fbc678614e134a712e02fbf8ff2f8d20f26efde6c3d5ccb75dab0c4589fb4762531cf99b78b44729cd1ffd81a65
+DIST gnome-devel-docs-3.6.2.tar.xz 9501068 SHA256 342ee059a2f15a9ef652e0ee7d452f78f6aa58db375a2f8e799c6fbed45841b3 SHA512 6d52bd8af8d180da295eaede27881ffef6d2a1e32e2cbb67f42f5828b2981b9f74b849b6fd84ed843bda701dc7e1831f0c284425b654f9716a09a15d7598977f WHIRLPOOL d113963619ced9e0fdd0af25375611e098ef13c94018acd5272b7376726d171cb5064fa779d7e0cab328649086c5701313f7f8f827af6eab5a189f363e03f1b4
+EBUILD gnome-devel-docs-2.32.0.ebuild 657 SHA256 0382dd199ecff2ffb59c90c7c71c840af0ca86b6208cd64a7b85f82e6dd24a55 SHA512 aced43d98768124815a9eb6d56a8554422403626d529e6a62b4299d1f9647b0287b9484c32f43b48b685f03eb860384670334d8faa1260994d26a6371872f002 WHIRLPOOL 024009c866a269fd97db787ac1d80657a73b0efb42d94d824929ced18d32afb6ec65777b3c29dd7630b616e85d7f06fbf4a55ef97e2b12b7a8931032e84392bc
+EBUILD gnome-devel-docs-3.4.1.ebuild 814 SHA256 0a2c21b6df00c1024c34d667b0d6caa56e7b1a5f5cf6eafe71d6c4f4aab217dd SHA512 fc261aa80b66959c3f6ab0b252e448ab47c7bd29899a97c4249a09e354197fb72afd56edbd1c78a83950c544e79e47f6fb4173e066ff13a2f2598dfa0828ccc4 WHIRLPOOL 5744bb7325e470eae42eb6a19c175f4bd826dddab153babe1735cce75b3125306d8ce55a52e2d6e08bed1e20ef48c3f5623ab9715ae0ddc1a84491f9e99a0242
+EBUILD gnome-devel-docs-3.6.2.ebuild 733 SHA256 cce31fd4e025a2c500a60ada09a5226fcb95faa57e92f6b1ed824feb52f9f7a2 SHA512 c5745ad1730bf9544f46e2c8a187cd5455d60fc904ee822462473e5d4edf84a1b323a337bec2f5658ca874434d14f3acfe0d6208f53a8d8181b686947b61fb17 WHIRLPOOL bfbe66b982c1d5c9c0293cedf17b427fa4a2ddf04a237a933bd34e4438babd64bdc00fbdb459d5816ae7470501dff87c209b3a46aa57a18ba7eef248b82e8fbe
+MISC ChangeLog 2618 SHA256 30772f98f1f5844ed0b1f7aa0ee69201e5ba041a5adc179f5788a0ffc4dde3c6 SHA512 05128938b09776e0310a179cd7c53bdeae90957e8b871dc05d3c4eb6d7457194c0571d50fde6a11c63dc5bc8a402519d023df5c55f35d6fdbec7581ea46ce970 WHIRLPOOL 9326b5aeae137b76ad459ba10e7d3b40224e974359246adf44b3cc94dcb3346ce05a011f978f8b1928ccab0ebf7dbbfb2340be2fbf8069f518137a68b95fcde9
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQzwKeAAoJEJ0WA1zPCt1hmekH/3DNBaIDuvIlnSC94caOaWeW
+1sRQagbH8cv+p9B5A54E/zAc/Gs9oxwl8ZNl70oFjHSekZOiwWNA3o3wZZjEh8Ww
+VTSgnty/gkex+wbsphuAEsx3D1srv2O2h71HEwbLuc1MnDWcQpwOye6mW4seAMs7
+zLRtx7fFJ2HVcRgsUtDseH9/RrccF1OvmN+MXgZgIC/hwvFy/o349h6oAIvGHAcE
+emB6NOsrp7D79x3V5kZAlK/s9fa3HtPGF9M9A9UVF7D2qA7H5PhyckpwXdzt1+Io
+rA5nUmac01MP4crqclitWJ8BefxBIhG7Qf3yrsL2QwHwct0i7sXSjnh/kqswcok=
+=+li4
+-----END PGP SIGNATURE-----
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-2.30.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-2.30.1.ebuild
deleted file mode 100644
index 7c34b7224cf8..000000000000
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-2.30.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnome-devel-docs/gnome-devel-docs-2.30.1.ebuild,v 1.5 2012/05/04 17:51:45 jdhore Exp $
-
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="http://developer.gnome.org/"
-
-LICENSE="FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-# FIXME: Find a better fix for the failure with parallel install.
-# It occurs when a thread starts a mkdir, then it's stopped
-# (during the mkdir), and then an other thread try to create the same dir.
-# -> when the first thread continue, it tries to create a dir already created
-# by the second.
-# Have a look to install-sh script, it's commented out for this bug.
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	app-text/gnome-doc-utils
-	~app-text/docbook-xml-dtd-4.2"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-}
-
-src_install() {
-	MAKEOPTS="-j1" gnome2_src_install
-}
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-2.32.0.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-2.32.0.ebuild
index 14c28a28be4b..cd642d4adc78 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-2.32.0.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-2.32.0.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/dev-util/gnome-devel-docs/gnome-devel-docs-2.32.0.ebuild,v 1.7 2012/05/04 17:51:45 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnome-devel-docs/gnome-devel-docs-2.32.0.ebuild,v 1.8 2012/12/17 11:31:40 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="Documentation for developing for the GNOME desktop environment"
 HOMEPAGE="http://developer.gnome.org/"
 
-LICENSE="FDL-1.1"
+LICENSE="FDL-1.1+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.4.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.4.1.ebuild
index f2f6085855fe..78a623abeccb 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.4.1.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.4.1.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/dev-util/gnome-devel-docs/gnome-devel-docs-3.4.1.ebuild,v 1.1 2012/05/14 06:05:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnome-devel-docs/gnome-devel-docs-3.4.1.ebuild,v 1.2 2012/12/17 11:31:40 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="Documentation for developing for the GNOME desktop environment"
 HOMEPAGE="http://developer.gnome.org/"
 
-LICENSE="FDL-1.1"
+LICENSE="FDL-1.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.2.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.6.2.ebuild
index 714444260b6d..344deba488cb 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.2.1.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-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/dev-util/gnome-devel-docs/gnome-devel-docs-3.2.1.ebuild,v 1.2 2012/05/04 17:51:45 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnome-devel-docs/gnome-devel-docs-3.6.2.ebuild,v 1.1 2012/12/17 11:31:40 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -10,21 +10,18 @@ inherit gnome2
 DESCRIPTION="Documentation for developing for the GNOME desktop environment"
 HOMEPAGE="http://developer.gnome.org/"
 
-LICENSE="FDL-1.1"
+LICENSE="FDL-1.1+ CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-	app-text/gnome-doc-utils
+DEPEND="app-text/gnome-doc-utils
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.2"
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-G2CONF="${G2CONF} --disable-scrollkeeper"
-DOCS="AUTHORS ChangeLog NEWS README"
 # This ebuild does not install any binaries
-# FIXME: Docs don't validate
-RESTRICT="test binchecks strip"
+RESTRICT="binchecks strip"