Version bump and old version cleanup

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 11 insertions, 68 deletions

diff --git a/sys-kernel/linux-docs/ChangeLog b/sys-kernel/linux-docs/ChangeLog
index 678c78c248cb..78c2bbdad623 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.22 2008/11/26 23:06:25 mpagano Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.23 2009/02/24 19:16:23 mpagano Exp $
+
+*linux-docs-2.6.28.7 (24 Feb 2009)
+
+  24 Feb 2009; Mike Pagano <mpagano@gentoo.org> -linux-docs-2.6.23.1.ebuild,
+  -linux-docs-2.6.24.2.ebuild, +linux-docs-2.6.28.7.ebuild:
+  Version bump and old version cleanup
 
   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,
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
deleted file mode 100644
index c7783ac8bc43..000000000000
--- a/sys-kernel/linux-docs/linux-docs-2.6.23.1.ebuild
+++ /dev/null
@@ -1,64 +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.6.23.1.ebuild,v 1.2 2008/11/26 23:06:25 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
-
-	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
-
-	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.24.2.ebuild b/sys-kernel/linux-docs/linux-docs-2.6.28.7.ebuild
index b2d105fba345..bcb3fef1e1e4 100644
--- a/sys-kernel/linux-docs/linux-docs-2.6.24.2.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-2.6.28.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/11/26 23:06:25 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-2.6.28.7.ebuild,v 1.1 2009/02/24 19:16:23 mpagano Exp $
 
 inherit toolchain-funcs
 
@@ -30,6 +30,7 @@ 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