Drop old versions and add new one

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 19 insertions, 77 deletions

diff --git a/sys-kernel/linux-docs/ChangeLog b/sys-kernel/linux-docs/ChangeLog
index 9580bea32f33..653a19fb0f76 100644
--- a/sys-kernel/linux-docs/ChangeLog
+++ b/sys-kernel/linux-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/linux-docs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.29 2011/12/11 18:45:09 mpagano Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.30 2012/01/18 14:58:07 mpagano Exp $
+
+*linux-docs-3.2.1 (18 Jan 2012)
+
+  18 Jan 2012; Michael Pagano <mpagano@gentoo.org> -linux-docs-2.6.35.2.ebuild,
+  -linux-docs-2.6.35.7.ebuild, +linux-docs-3.2.1.ebuild:
+  Add new version and remove old.
 
 *linux-docs-3.0 (11 Dec 2011)
 
diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest
index dc9b2d95f8d0..c893015fe9b0 100644
--- a/sys-kernel/linux-docs/Manifest
+++ b/sys-kernel/linux-docs/Manifest
@@ -4,23 +4,21 @@ Hash: SHA256
 DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA1 bef21cd5063a648f33a99a26f4742dd05eb4dca2 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
 DIST linux-2.6.27.7.tar.bz2 50365805 RMD160 a2ff56028e35740211817ddb493e6748f152d42d SHA1 0107e42e27c2d9610df902d3155a5ae4adf260d9 SHA256 8e7075fc855ffbcf3c24cbd70b22791759224f98839886d50bba8d659193a950
 DIST linux-2.6.32.23.tar.bz2 64429572 RMD160 500cf101e64e41c5e4e7294565d55ad6e6514c3f SHA1 80f6b73b33f2989ec7451ed0ca33f213ace24be3 SHA256 d99e04971ae6412ffceae7b6fe980efee60fd80ad504c7e50f629bd673631d76
-DIST linux-2.6.35.2.tar.bz2 69259259 RMD160 686b3c6408de362161954c6e9e6c0ea093195892 SHA1 c5f1139bbbdc339668ee2ff22632f1d1c7539a96 SHA256 36cfb44b8756b7543c8ba6c7404723b8d8184c23a7303979d8441c1251996bb3
-DIST linux-2.6.35.7.tar.bz2 69255636 RMD160 516070fd630273757c61e558db61c7fef20ddd4e SHA1 1c3b0da36fbc54932710a74f0d64a279c279935a SHA256 f19c830e52d97fe35e9e32e1911de238e75b1cd29ca779de0d83f0906073ee2c
 DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
 DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.1.tar.bz2 78111701 RMD160 98ef5a9104d692b8bfdd711ffc931995583c6b9b SHA1 9d278e8d11f368aaca97ed708e2e315b2127dc15 SHA256 7e2b1e3d93883dd3e469a76598196a3836a0182d93bf073fd68bae1f4cfbf44e
 EBUILD linux-docs-2.6.16.ebuild 1460 RMD160 c862a9f8622aded535abcd7ea3972ec2ee16a6fe SHA1 fa3e3218e231493e596c6b8f0033bb4d5b5368ff SHA256 055cbe77ac4c3231877dc5b7fe0dc01b811e468d6d377fef404bc037c7027282
 EBUILD linux-docs-2.6.27.7.ebuild 1472 RMD160 d9b46a505de02b9441362c9e09b58d22e1226a1a SHA1 a88ef6d9a8aaeb244fdbbc01a033c675636c99a8 SHA256 67e7e14cbb386cface5016094e452282ecc44cd76d3587a63497ac97f75a43d4
 EBUILD linux-docs-2.6.32.23.ebuild 1473 RMD160 7896611a2509e0cd9117654706cf14dbf7577b12 SHA1 69ffd18147bf5d0530231c38e3f0f7a740d86348 SHA256 27175ac867b5a8f7b1104145841c08179d93d6dd0a793465cf900d49042a058f
-EBUILD linux-docs-2.6.35.2.ebuild 1472 RMD160 a37318cbc82dbc9b0a0ad82c7add3d1c84a7a5b1 SHA1 c876a2dca47f09d921745760fbd8166673637963 SHA256 6b3a222a120840addcff8323a3e7a0e08098df0ee8a4dd9157c7afeff2496e19
-EBUILD linux-docs-2.6.35.7.ebuild 1472 RMD160 8755aa75e151f52f8a2fc475f453b84de9858bbb SHA1 17b49d83aece3a532c63ca0a4faac871953415a2 SHA256 945d65ce5257dcce1a024376b39ae0d5c33690862c2673d442c79626a7070b7b
 EBUILD linux-docs-3.0.ebuild 1467 RMD160 113f5c01f9c9b6956bbaac228e7a794f1742c893 SHA1 b8fedf193b248b9dc68142fce7d46d329ad0f5e5 SHA256 7cc3a4014a0ae3b8ef486dff26ddf08ca44ea78c444e92bc9bbe74f3540ab8f5
 EBUILD linux-docs-3.1.ebuild 1467 RMD160 425979f549557e4092224369524b43d237b5b6be SHA1 b52f649c9cd1e0daf6b7926714ad87c944a5c2c7 SHA256 ee8d613cd19ab52f22e3979e7fd7c7495f205b79c5721d767ce9b720cc88a507
-MISC ChangeLog 4793 RMD160 fa9a3718a03cfe8c81603f96b7a9dc2c9ba4aaa6 SHA1 8f8701605f7b3bc2b4ddd6adc5aff40b1655605a SHA256 268126b8a5ee8bfb4a1922d2a3c5ee181f6d0cf26e81db2b1f4ca74519e4a804
+EBUILD linux-docs-3.2.1.ebuild 1464 RMD160 27e8a8173e30db0691994727ad4a8e23b5c29c32 SHA1 60cdc12655ceb89b043da46f550cda4da62322ba SHA256 98611963eb5e7c3fa90537756dbffbeb1778e69c973c2d31eae72a3f59c82b93
+MISC ChangeLog 4998 RMD160 450fa05b0eeb21b11f5742b096a1261b1a098793 SHA1 ca322387d747bcab1cded7f08dfd571b1b42dff7 SHA256 b646498cbc77acd011be2eb52279a6c2cdd79efcfeb3519b8631019f1cd295aa
 MISC metadata.xml 299 RMD160 dc600bbbb0e020ffd59c05c3db5af421c14fbadf SHA1 93999ab1c937b64ed6a7f220f5814db7eaa342fc SHA256 736556faadf70505403eaa445a43a5a8bf3d0b58d390d289f7bc3c4cf50abb09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk7k+k0ACgkQPDPGULV25OMxAACcCx5kQosjC9H/RejFa1Q2uk9a
-yh8AoJ5teo9RSuEA5TXGggQBhXsjRRGi
-=qy7P
+iEYEAREIAAYFAk8W3gUACgkQPDPGULV25OOevQCdFVl8Nubu6D+yJr56x2tCrlzc
+t7cAni6zEmR1K6uoMwKqnpQX+O6mha/q
+=kuzk
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-docs/linux-docs-2.6.35.7.ebuild b/sys-kernel/linux-docs/linux-docs-2.6.35.7.ebuild
deleted file mode 100644
index fd760fb43aee..000000000000
--- a/sys-kernel/linux-docs/linux-docs-2.6.35.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.35.7.ebuild,v 1.1 2010/10/04 19:18:50 mpagano Exp $
-
-inherit toolchain-funcs
-
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Developer documentation generated from the Linux kernel"
-HOMEPAGE="http://www.kernel.org/"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-IUSE="html"
-DEPEND="app-text/docbook-sgml-utils
-		app-text/xmlto
-		sys-apps/sed
-		~app-text/docbook-xml-dtd-4.1.2"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i \
-		-e "s:db2:docbook2:g" \
-		-e "s:/usr/local/man:${D}/usr/share/man:g" \
-		"${S}"/Documentation/DocBook/Makefile
-
-	# fix for parallel build as per bug #248337
-	sed -i \
-		-e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \
-		"${S}"/Makefile
-}
-
-src_compile() {
-	local ARCH=$(tc-arch-kernel)
-	unset KBUILD_OUTPUT
-
-	emake mandocs || die "make mandocs failed"
-
-	if use html; then
-		emake htmldocs || die "make htmldocs failed"
-	fi
-}
-
-src_install() {
-	local file
-	local ARCH=$(tc-arch-kernel)
-	unset KBUILD_OUTPUT
-
-	make installmandocs || die "make installmandocs failed"
-
-	if use html; then
-		for file in Documentation/DocBook/*.html; do
-			dohtml -r ${file/\.html/}
-		done
-	fi
-}
diff --git a/sys-kernel/linux-docs/linux-docs-2.6.35.2.ebuild b/sys-kernel/linux-docs/linux-docs-3.2.1.ebuild
index cf3755f029dd..7a757323cce1 100644
--- a/sys-kernel/linux-docs/linux-docs-2.6.35.2.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-3.2.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.35.2.ebuild,v 1.1 2010/11/21 00:41:23 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.2.1.ebuild,v 1.1 2012/01/18 14:58:07 mpagano Exp $
 
+EAPI=3
 inherit toolchain-funcs
 
 MY_P=linux-${PV}
@@ -9,7 +10,7 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Developer documentation generated from the Linux kernel"
 HOMEPAGE="http://www.kernel.org/"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/${MY_P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,8 +23,7 @@ DEPEND="app-text/docbook-sgml-utils
 		~app-text/docbook-xml-dtd-4.1.2"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 
 	sed -i \
 		-e "s:db2:docbook2:g" \