Version bumps. Remove old and fix bug in install for USE=html. Thanks to Ted Marston. See bug #515520

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key B576E4E3)

8 files changed, 166 insertions, 70 deletions

diff --git a/sys-kernel/linux-docs/ChangeLog b/sys-kernel/linux-docs/ChangeLog
index 94ab22163521..d0ba6febb2d6 100644
--- a/sys-kernel/linux-docs/ChangeLog
+++ b/sys-kernel/linux-docs/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sys-kernel/linux-docs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.48 2014/04/14 14:39:00 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/ChangeLog,v 1.49 2014/10/17 13:15:09 mpagano Exp $
+
+*linux-docs-3.17.1 (17 Oct 2014)
+*linux-docs-3.16.6 (17 Oct 2014)
+*linux-docs-3.14.22 (17 Oct 2014)
+*linux-docs-3.12.30 (17 Oct 2014)
+*linux-docs-3.10.58 (17 Oct 2014)
+*linux-docs-3.4.104 (17 Oct 2014)
+
+  17 Oct 2014; Mike Pagano <mpagano@gentoo.org> -linux-docs-3.2.55.ebuild,
+  -linux-docs-3.4.82.ebuild, +linux-docs-3.4.104.ebuild,
+  -linux-docs-3.10.32.ebuild, +linux-docs-3.10.58.ebuild,
+  -linux-docs-3.12.16.ebuild, +linux-docs-3.12.30.ebuild,
+  -linux-docs-3.13.9.ebuild, +linux-docs-3.14.22.ebuild,
+  +linux-docs-3.16.6.ebuild, +linux-docs-3.17.1.ebuild:
+  Version bumps. Remove old and fix bug in install for USE=html. Thanks to Ted
+  Marston. See bug #515520
 
 *linux-docs-3.13.9 (14 Apr 2014)
 
diff --git a/sys-kernel/linux-docs/linux-docs-3.12.16.ebuild b/sys-kernel/linux-docs/linux-docs-3.10.58.ebuild
index e38851da5619..3c0e0ab8b5aa 100644
--- a/sys-kernel/linux-docs/linux-docs-3.12.16.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-3.10.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.12.16.ebuild,v 1.1 2014/04/14 14:29:15 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.10.58.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 IUSE="html"
 DEPEND="app-text/docbook-sgml-utils
@@ -55,6 +55,9 @@ src_install() {
 	make installmandocs || die "make installmandocs failed"
 
 	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
 		for file in Documentation/DocBook/*.html; do
 			dohtml -r ${file/\.html/}
 		done
diff --git a/sys-kernel/linux-docs/linux-docs-3.2.55.ebuild b/sys-kernel/linux-docs/linux-docs-3.12.30.ebuild
index fd3af8d77cf2..5d6703a8bfc4 100644
--- a/sys-kernel/linux-docs/linux-docs-3.2.55.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-3.12.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.2.55.ebuild,v 1.2 2014/04/14 14:22:01 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.12.30.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 IUSE="html"
 DEPEND="app-text/docbook-sgml-utils
@@ -55,6 +55,9 @@ src_install() {
 	make installmandocs || die "make installmandocs failed"
 
 	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
 		for file in Documentation/DocBook/*.html; do
 			dohtml -r ${file/\.html/}
 		done
diff --git a/sys-kernel/linux-docs/linux-docs-3.14.22.ebuild b/sys-kernel/linux-docs/linux-docs-3.14.22.ebuild
new file mode 100644
index 000000000000..eee27e9ff656
--- /dev/null
+++ b/sys-kernel/linux-docs/linux-docs-3.14.22.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.14.22.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
+
+EAPI=5
+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/v3.x/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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_prepare() {
+
+	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
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
+		for file in Documentation/DocBook/*.html; do
+			dohtml -r ${file/\.html/}
+		done
+	fi
+}
diff --git a/sys-kernel/linux-docs/linux-docs-3.13.9.ebuild b/sys-kernel/linux-docs/linux-docs-3.16.6.ebuild
index abe126453844..a7c7fac65dd4 100644
--- a/sys-kernel/linux-docs/linux-docs-3.13.9.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-3.16.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.13.9.ebuild,v 1.1 2014/04/14 14:39:00 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.16.6.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -55,6 +55,9 @@ src_install() {
 	make installmandocs || die "make installmandocs failed"
 
 	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
 		for file in Documentation/DocBook/*.html; do
 			dohtml -r ${file/\.html/}
 		done
diff --git a/sys-kernel/linux-docs/linux-docs-3.10.32.ebuild b/sys-kernel/linux-docs/linux-docs-3.17.1.ebuild
index 1915bfb7af57..13afecb7e747 100644
--- a/sys-kernel/linux-docs/linux-docs-3.10.32.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-3.17.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.10.32.ebuild,v 1.2 2014/04/14 14:26:18 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.17.1.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 IUSE="html"
 DEPEND="app-text/docbook-sgml-utils
@@ -55,6 +55,9 @@ src_install() {
 	make installmandocs || die "make installmandocs failed"
 
 	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
 		for file in Documentation/DocBook/*.html; do
 			dohtml -r ${file/\.html/}
 		done
diff --git a/sys-kernel/linux-docs/linux-docs-3.4.104.ebuild b/sys-kernel/linux-docs/linux-docs-3.4.104.ebuild
new file mode 100644
index 000000000000..1cbca14ce6b1
--- /dev/null
+++ b/sys-kernel/linux-docs/linux-docs-3.4.104.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.4.104.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
+
+EAPI=5
+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/v3.x/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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_prepare() {
+
+	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
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
+		for file in Documentation/DocBook/*.html; do
+			dohtml -r ${file/\.html/}
+		done
+	fi
+}
diff --git a/sys-kernel/linux-docs/linux-docs-3.4.82.ebuild b/sys-kernel/linux-docs/linux-docs-3.4.82.ebuild
deleted file mode 100644
index 4e5a6f0e41a5..000000000000
--- a/sys-kernel/linux-docs/linux-docs-3.4.82.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.4.82.ebuild,v 1.2 2014/04/14 13:40:22 mpagano Exp $
-
-EAPI=5
-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/v3.x/${MY_P}.tar.xz"
-
-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_prepare() {
-
-	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
-}