Add docs for additional kernel versions

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

4 files changed, 82 insertions, 10 deletions

diff --git a/sys-kernel/linux-docs/ChangeLog b/sys-kernel/linux-docs/ChangeLog
index d30337668133..e6b9fea25f2b 100644
--- a/sys-kernel/linux-docs/ChangeLog
+++ b/sys-kernel/linux-docs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/linux-docs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.25 2010/10/04 19:18:50 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.26 2010/11/21 00:41:23 mpagano Exp $
+
+*linux-docs-2.6.36 (21 Nov 2010)
+*linux-docs-2.6.35.2 (21 Nov 2010)
+
+  21 Nov 2010; Michael Pagano <mpagano@gentoo.org>
+  -linux-docs-2.6.25.2.ebuild, +linux-docs-2.6.35.2.ebuild,
+  +linux-docs-2.6.36.ebuild:
+  Add docs for 2.6.36
 
 *linux-docs-2.6.35.7 (04 Oct 2010)
 *linux-docs-2.6.32.23 (04 Oct 2010)
diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest
index c8706544c48e..32d27d27adb9 100644
--- a/sys-kernel/linux-docs/Manifest
+++ b/sys-kernel/linux-docs/Manifest
@@ -2,21 +2,23 @@
 Hash: SHA1
 
 DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA1 bef21cd5063a648f33a99a26f4742dd05eb4dca2 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
-DIST linux-2.6.25.2.tar.bz2 48587815 RMD160 414efd15fb9978f5d7128d95168286d0b6692592 SHA1 b3be9e51b5b54fe0c576bad73263e2d216133a3b SHA256 11674760f70b233cbff96a63443fb2893f784ee268cb546dcdde6b842a273686
 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-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
 EBUILD linux-docs-2.6.16.ebuild 1460 RMD160 c862a9f8622aded535abcd7ea3972ec2ee16a6fe SHA1 fa3e3218e231493e596c6b8f0033bb4d5b5368ff SHA256 055cbe77ac4c3231877dc5b7fe0dc01b811e468d6d377fef404bc037c7027282
-EBUILD linux-docs-2.6.25.2.ebuild 1428 RMD160 581521d8f49039cf86391c6b96029b0d25c577a5 SHA1 62baeb335f1a60ee2ac64b21795ac17dbe47ab3f SHA256 57aa20fa9a2b0a7ea9790a86193af0e4feb3b9a65a21c341226198df7b2c4264
 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
-MISC ChangeLog 4177 RMD160 7c23e098e0787ccd2f3b9dfbe6c367e0b3bd9147 SHA1 c9f04bdbd2931729c06f14253b98b98250206bce SHA256 84555acf8776852cb7d6380652b1a3b618723b0bc28ab36207279f282e6987e9
+EBUILD linux-docs-2.6.36.ebuild 1470 RMD160 8e87b95a1936af04e5a9ba880d5c11ca7775ec4b SHA1 9b36f96c2f3d1944454d7271d8a921a9405ec98b SHA256 ca8ed96373202a7ce951830298c3b2a84d6321674fa997d1676923d9cde4ad49
+MISC ChangeLog 4409 RMD160 1eb51d64584c5757b16bea60703a749d4f8d617b SHA1 97c08a55d745b67cb2d1f52bf73934006f56d100 SHA256 642c689966282f40508108224bece73e7edebfb867c40186734d4d58d66fef08
 MISC metadata.xml 299 RMD160 dc600bbbb0e020ffd59c05c3db5af421c14fbadf SHA1 93999ab1c937b64ed6a7f220f5814db7eaa342fc SHA256 736556faadf70505403eaa445a43a5a8bf3d0b58d390d289f7bc3c4cf50abb09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyqKJ8ACgkQPDPGULV25OMsPACgvwBof0gEvqO7d8iMl2J0EQre
-woMAn3niiU0+6o1iVgb1U1kLk2uyDEeN
-=tLQM
+iEYEARECAAYFAkzoarwACgkQPDPGULV25OMfCwCgpUudIaEz0l6AeNxf39LRhNp/
+6FMAn3jGK14KPoGAqV6ZRfuSmt3JVRIG
+=tw3f
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-docs/linux-docs-2.6.35.2.ebuild b/sys-kernel/linux-docs/linux-docs-2.6.35.2.ebuild
new file mode 100644
index 000000000000..cf3755f029dd
--- /dev/null
+++ b/sys-kernel/linux-docs/linux-docs-2.6.35.2.ebuild
@@ -0,0 +1,62 @@
+# 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.2.ebuild,v 1.1 2010/11/21 00:41:23 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.25.2.ebuild b/sys-kernel/linux-docs/linux-docs-2.6.36.ebuild
index 49428a89a483..197129709ff6 100644
--- a/sys-kernel/linux-docs/linux-docs-2.6.25.2.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-2.6.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.25.2.ebuild,v 1.2 2008/11/26 23:06:25 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.36.ebuild,v 1.1 2010/11/21 00:41:23 mpagano Exp $
 
 inherit toolchain-funcs
 
@@ -30,10 +30,10 @@ src_unpack() {
 		-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() {