Cleanup of old versions and more parallel build fixes.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686

8 files changed, 49 insertions, 132 deletions

diff --git a/sys-kernel/linux-docs/ChangeLog b/sys-kernel/linux-docs/ChangeLog
index d2c264ea2d9f..678c78c248cb 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.21 2008/11/26 20:56:41 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.22 2008/11/26 23:06:25 mpagano Exp $
+
+  26 Nov 2008; Mike Pagano <mpagano@gentoo.org> -linux-docs-2.4.32.ebuild,
+  -linux-docs-2.4.35.3.ebuild, linux-docs-2.6.16.ebuild,
+  linux-docs-2.6.23.1.ebuild, linux-docs-2.6.24.2.ebuild,
+  linux-docs-2.6.25.2.ebuild:
+  Cleanup of old versions and more parallel build fixes.
 
   26 Nov 2008; Mike Pagano <mpagano@gentoo.org> linux-docs-2.6.26.4.ebuild,
   linux-docs-2.6.27.7.ebuild:
diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest
index c240419639d2..c3cb9db6c409 100644
--- a/sys-kernel/linux-docs/Manifest
+++ b/sys-kernel/linux-docs/Manifest
@@ -1,18 +1,14 @@
-DIST linux-2.4.32.tar.bz2 31132159 RMD160 63ab1a0b18e690170f60de9da7392416311dc609 SHA1 0a99d7ab1d2799168d11689b4a2410b045592cf4 SHA256 7dace89c3f0850c3d5c32c38c20b600259c314e8cbec29fe3ee59c2fbbee1759
-DIST linux-2.4.35.3.tar.bz2 31099113 RMD160 84b0c75ee6c2498ab2fa371767e47fb931783829 SHA1 c50cde44f286f3e97aa40d0b8a9d310c9eb916dd SHA256 a5e9ea5ade233860c4e7e8c3536353b965c384128cccada04dda5f00d755cd2a
 DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA1 bef21cd5063a648f33a99a26f4742dd05eb4dca2 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
 DIST linux-2.6.23.1.tar.bz2 45477128 RMD160 2e552686cec24e462310f1a2e6c03729b3794d64 SHA1 b19c8bf6d52c7c797a68b2762d8324c4a4ae801a SHA256 35bcba56edf2a24f5d38bac0e530b2ce0e06eb094ba083b4a679c903077a671c
 DIST linux-2.6.24.2.tar.bz2 46735221 RMD160 54bc036e38c30c086969ed29aedb729e46f243a6 SHA1 67ca1981239db104ce211647d13d8fbb28520948 SHA256 235fb66f5a182d0b96923fbdcc9779fcf148dbb2f561f72a43ce181f56a70bb1
 DIST linux-2.6.25.2.tar.bz2 48587815 RMD160 414efd15fb9978f5d7128d95168286d0b6692592 SHA1 b3be9e51b5b54fe0c576bad73263e2d216133a3b SHA256 11674760f70b233cbff96a63443fb2893f784ee268cb546dcdde6b842a273686
 DIST linux-2.6.26.4.tar.bz2 49454467 RMD160 b5300707db84453034e76189d8d49a9d69874f42 SHA1 0d3b5c13c923d1aeec2c48799169317cb5252cab SHA256 45c853b3f34a0265fa9877cf0e5b530607beb143537d33ae3d565810e0c14ccc
-DIST linux-2.6.27.7.tar.bz2 50365805 RMD160 a2ff56028e35740211817ddb493e6748f152d42d SHA1 0107e42e27c2d9610df902d3155a5ae4adf260d9 SHA256 8e7075fc855ffbcf3c24cbd70b22791759224f98839886d50bba8d659193a950
-EBUILD linux-docs-2.4.32.ebuild 1138 RMD160 16756d435062401b416a67d42e33821a0c1302c9 SHA1 49c0ffea30c8d48688e4ba6c7e9e9a9b819d1b8d SHA256 c64302454c2f54378ee894be67ea6e3ee1ca08c546d11aef57bb7052e9c90f59
-EBUILD linux-docs-2.4.35.3.ebuild 1137 RMD160 ea217143d3f1b85a349686bd0cfa1fe3879260fb SHA1 0a7bd4cd69448a8ff64a761730556eb80aefc3e1 SHA256 21b30733c4a9a59cd220263735197e4da98553b88e85fc4d854ccc6fac90629f
-EBUILD linux-docs-2.6.16.ebuild 1240 RMD160 228d62ebc77e7ff68db505e5dc30d2890159cc14 SHA1 a0c05549200ad41e84268f91a9c76cbcaad02bba SHA256 cd98f667fe3496808e103565432101b4de0034e3b87dcb6314d9e00a812e54f6
-EBUILD linux-docs-2.6.23.1.ebuild 1281 RMD160 36e76021ec2837d07955eeef46a13aaf27c5c2df SHA1 21a944a8e5dc3984b1d36b579e9721792b11a869 SHA256 3b81abceb6ece540101842cc924feffa2e100a272df696a91418120131825ea4
-EBUILD linux-docs-2.6.24.2.ebuild 1281 RMD160 b576add3f5916c9df57caa7128523c1c15836c8b SHA1 6e042a848ce29f9339a1f479fdef4fee2da3e507 SHA256 3b704985f92e326e8528324b918457d4bd0a0ad38b990eafcbce4f11132bba1b
-EBUILD linux-docs-2.6.25.2.ebuild 1281 RMD160 b2708c78fbfb313f57aa0cbe514f7e4466f76acd SHA1 153ce7e4b5f59df98799cc14aed92bd9e0385d54 SHA256 a985bf3754192e754fcbd762373f08046d735d2f40a34bea20b00ee7b1258a04
+DIST linux-2.6.27.7.tar.bz2 49176000 RMD160 3f77b98ac6200c00f2e419e8b5b13a63fd4f6b0d SHA1 0d2a78f8b3bc5062623282274ba8189e5f04400a SHA256 70faab9a7c47404723e7ea5873a99a36e05757df9cb539761de015f3ada75669
+EBUILD linux-docs-2.6.16.ebuild 1460 RMD160 c862a9f8622aded535abcd7ea3972ec2ee16a6fe SHA1 fa3e3218e231493e596c6b8f0033bb4d5b5368ff SHA256 055cbe77ac4c3231877dc5b7fe0dc01b811e468d6d377fef404bc037c7027282
+EBUILD linux-docs-2.6.23.1.ebuild 1501 RMD160 3600f17bf1c3bdc0cf6836786c1583c10887557f SHA1 b1e8b2b5012ef93c9e8642ae281d922962260c08 SHA256 f2f3a93a2efb9fc37cc95a2502d0b56a5274a3449567f321075e2b8c5feb261c
+EBUILD linux-docs-2.6.24.2.ebuild 1427 RMD160 dc61bdf28965a6ca8b971b50c159eb51d3929837 SHA1 f3ce68b11f1601043ce59418ad7cb4fae278b720 SHA256 3ad68daa103eed0c9d6dedc326876da8c8dac9fc188d14f4b1207f3c4063c95c
+EBUILD linux-docs-2.6.25.2.ebuild 1428 RMD160 581521d8f49039cf86391c6b96029b0d25c577a5 SHA1 62baeb335f1a60ee2ac64b21795ac17dbe47ab3f SHA256 57aa20fa9a2b0a7ea9790a86193af0e4feb3b9a65a21c341226198df7b2c4264
 EBUILD linux-docs-2.6.26.4.ebuild 1472 RMD160 7de53ce33f306639add35710460d3f14b2d5e792 SHA1 6d84bc85f9378f0d1f1625bdfac3f09c836efde8 SHA256 81ca720d3ebb780568535779c65ec8aad3a2ffad5f43aa85ba9f831e475126b7
 EBUILD linux-docs-2.6.27.7.ebuild 1472 RMD160 d9b46a505de02b9441362c9e09b58d22e1226a1a SHA1 a88ef6d9a8aaeb244fdbbc01a033c675636c99a8 SHA256 67e7e14cbb386cface5016094e452282ecc44cd76d3587a63497ac97f75a43d4
-MISC ChangeLog 3225 RMD160 b53f24595a456a2073369683f154dc8e6a997eb6 SHA1 f18e08e6c7091f6b6ebe362307d6aeb118254bc9 SHA256 89d8fae22677c22d6355a744ae6ba657eeff255f7681675ce0351a5ac60d3a03
+MISC ChangeLog 3503 RMD160 39b2a0c45237f0d743cd30c81ae26cac8cc33808 SHA1 dc83df4fd88ad36423855c2b21e3825adf1f1c0f SHA256 6c61e15f840435a7804734315c1d45172dbdcefbf04f0970ca3f590d27f471de
 MISC metadata.xml 298 RMD160 c8787caf63a38adcd56763302e856074baf4167f SHA1 4560e8b489efa6106e33240a27c100165d7de6ff SHA256 1d0f3700786208626b15eea5c1ff559b184cb2fdefd1ede8cb655f330e27eab2
diff --git a/sys-kernel/linux-docs/linux-docs-2.4.32.ebuild b/sys-kernel/linux-docs/linux-docs-2.4.32.ebuild
deleted file mode 100644
index 709c7c0c152b..000000000000
--- a/sys-kernel/linux-docs/linux-docs-2.4.32.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 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.4.32.ebuild,v 1.7 2008/05/08 12:24:12 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/pub/linux/kernel/v2.4/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc sparc ~x86"
-
-IUSE="html"
-DEPEND="app-text/docbook-sgml-utils
-		dev-lang/perl
-		sys-apps/sed
-		html? ( media-gfx/xfig )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i \
-		-e "s:db2:docbook2:g" \
-		-e "s:docbook2html \$<:docbook2html -o \$@ \$<:" \
-		"${S}"/Documentation/DocBook/Makefile
-}
-
-src_compile() {
-	local ARCH=$(tc-arch-kernel)
-
-	make mandocs || die "make mandocs failed"
-
-	if use html; then
-		make htmldocs || die "make htmldocs failed"
-	fi
-}
-
-src_install() {
-	local file
-
-	doman Documentation/man/*
-
-	if use html; then
-		for file in Documentation/DocBook/*.sgml; do
-			dohtml -r ${file/\.sgml/}
-		done
-	fi
-}
diff --git a/sys-kernel/linux-docs/linux-docs-2.4.35.3.ebuild b/sys-kernel/linux-docs/linux-docs-2.4.35.3.ebuild
deleted file mode 100644
index ed098b0e3501..000000000000
--- a/sys-kernel/linux-docs/linux-docs-2.4.35.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 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.4.35.3.ebuild,v 1.1 2007/11/05 02:50:20 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.4/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-IUSE="html"
-DEPEND="app-text/docbook-sgml-utils
-		dev-lang/perl
-		sys-apps/sed
-		html? ( media-gfx/xfig )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i \
-		-e "s:db2:docbook2:g" \
-		-e "s:docbook2html \$<:docbook2html -o \$@ \$<:" \
-		"${S}"/Documentation/DocBook/Makefile
-}
-
-src_compile() {
-	local ARCH=$(tc-arch-kernel)
-
-	make mandocs || die "make mandocs failed"
-
-	if use html; then
-		make htmldocs || die "make htmldocs failed"
-	fi
-}
-
-src_install() {
-	local file
-
-	doman Documentation/man/*
-
-	if use html; then
-		for file in Documentation/DocBook/*.sgml; do
-			dohtml -r ${file/\.sgml/}
-		done
-	fi
-}
diff --git a/sys-kernel/linux-docs/linux-docs-2.6.16.ebuild b/sys-kernel/linux-docs/linux-docs-2.6.16.ebuild
index 14a046ea04fc..8592415ce6a1 100644
--- a/sys-kernel/linux-docs/linux-docs-2.6.16.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-2.6.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.16.ebuild,v 1.14 2008/05/08 12:24:12 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.16.ebuild,v 1.15 2008/11/26 23:06:25 mpagano Exp $
 
 inherit toolchain-funcs
 
@@ -28,16 +28,23 @@ src_unpack() {
 		-e "s:db2:docbook2:g" \
 		-e "s:/usr/local/man:${D}/usr/share/man:g" \
 		"${S}"/Documentation/DocBook/Makefile
+
+	sed -i \
+		-e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \
+		"${S}"/Makefile
+
+	# fix for arch change i386->x86
+	ln -s "${S}"/arch/i386 "${S}"/arch/x86
 }
 
 src_compile() {
 	local ARCH=$(tc-arch-kernel)
 	unset KBUILD_OUTPUT
 
-	make mandocs || die "make mandocs failed"
+	emake mandocs || die "make mandocs failed"
 
 	if use html; then
-		make htmldocs || die "make htmldocs failed"
+		emake htmldocs || die "make htmldocs failed"
 	fi
 }
 
diff --git a/sys-kernel/linux-docs/linux-docs-2.6.23.1.ebuild b/sys-kernel/linux-docs/linux-docs-2.6.23.1.ebuild
index 47715e94d6ec..c7783ac8bc43 100644
--- a/sys-kernel/linux-docs/linux-docs-2.6.23.1.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-2.6.23.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.23.1.ebuild,v 1.1 2007/11/05 02:50:20 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.23.1.ebuild,v 1.2 2008/11/26 23:06:25 mpagano Exp $
 
 inherit toolchain-funcs
 
@@ -29,16 +29,23 @@ src_unpack() {
 		-e "s:db2:docbook2:g" \
 		-e "s:/usr/local/man:${D}/usr/share/man:g" \
 		"${S}"/Documentation/DocBook/Makefile
+
+	sed -i \
+		-e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \
+		"${S}"/Makefile
+
+	# fix for arch change i386->x86
+	ln -s "${S}"/arch/i386 "${S}"/arch/x86
 }
 
 src_compile() {
 	local ARCH=$(tc-arch-kernel)
 	unset KBUILD_OUTPUT
 
-	make mandocs || die "make mandocs failed"
+	emake mandocs || die "make mandocs failed"
 
 	if use html; then
-		make htmldocs || die "make htmldocs failed"
+		emake htmldocs || die "make htmldocs failed"
 	fi
 }
 
diff --git a/sys-kernel/linux-docs/linux-docs-2.6.24.2.ebuild b/sys-kernel/linux-docs/linux-docs-2.6.24.2.ebuild
index 558997993f1e..b2d105fba345 100644
--- a/sys-kernel/linux-docs/linux-docs-2.6.24.2.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-2.6.24.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.24.2.ebuild,v 1.1 2008/02/17 02:21:25 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.24.2.ebuild,v 1.2 2008/11/26 23:06:25 mpagano Exp $
 
 inherit toolchain-funcs
 
@@ -29,16 +29,20 @@ src_unpack() {
 		-e "s:db2:docbook2:g" \
 		-e "s:/usr/local/man:${D}/usr/share/man:g" \
 		"${S}"/Documentation/DocBook/Makefile
+
+	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
 
-	make mandocs || die "make mandocs failed"
+	emake mandocs || die "make mandocs failed"
 
 	if use html; then
-		make htmldocs || die "make htmldocs failed"
+		emake htmldocs || die "make htmldocs failed"
 	fi
 }
 
diff --git a/sys-kernel/linux-docs/linux-docs-2.6.25.2.ebuild b/sys-kernel/linux-docs/linux-docs-2.6.25.2.ebuild
index 050e32aa5ea6..49428a89a483 100644
--- a/sys-kernel/linux-docs/linux-docs-2.6.25.2.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-2.6.25.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1 2008/05/08 12:24:12 mpagano Exp $
+# $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 $
 
 inherit toolchain-funcs
 
@@ -29,16 +29,21 @@ src_unpack() {
 		-e "s:db2:docbook2:g" \
 		-e "s:/usr/local/man:${D}/usr/share/man:g" \
 		"${S}"/Documentation/DocBook/Makefile
+
+	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
 
-	make mandocs || die "make mandocs failed"
+	emake mandocs || die "make mandocs failed"
 
 	if use html; then
-		make htmldocs || die "make htmldocs failed"
+		emake htmldocs || die "make htmldocs failed"
 	fi
 }