Cleanup of old versions and more parallel build fixes.

(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686)

7 files changed, 43 insertions, 122 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/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
 }