Drop old versions and add new one

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 13 insertions, 69 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/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" \