Version bump.

Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 957A8463)

3 files changed, 33 insertions, 34 deletions

diff --git a/app-doc/tldp-howto/ChangeLog b/app-doc/tldp-howto/ChangeLog
index f3287bdfaf60..43b62f245aa9 100644
--- a/app-doc/tldp-howto/ChangeLog
+++ b/app-doc/tldp-howto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/tldp-howto
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/tldp-howto/ChangeLog,v 1.8 2013/09/05 05:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/tldp-howto/ChangeLog,v 1.9 2013/10/14 05:08:18 dirtyepic Exp $
+
+*tldp-howto-20120707 (14 Oct 2013)
+
+  14 Oct 2013; Ryan Hill <dirtyepic@gentoo.org> -tldp-howto-20100101.ebuild,
+  +tldp-howto-20120707.ebuild, metadata.xml:
+  Version bump.
 
   05 Sep 2013; Mike Frysinger <vapier@gentoo.org> tldp-howto-20100101.ebuild,
   tldp-howto-20100701.ebuild:
diff --git a/app-doc/tldp-howto/metadata.xml b/app-doc/tldp-howto/metadata.xml
index 7f6f66d8af53..d82b7161b7b9 100644
--- a/app-doc/tldp-howto/metadata.xml
+++ b/app-doc/tldp-howto/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>app-doc</herd>
 	<use>
-		<flag name='html'>Install the docs in multipage HTML format (default)</flag>
-		<flag name='htmlsingle'>Install the docs in single page HTML format</flag>
-		<flag name='pdf'>Install the docs in pdf format</flag>
-		<flag name='text'>Install the docs in plain text format</flag>
+		<flag name='html'>Install multi-chapter HTML docs</flag>
+		<flag name='htmlsingle'>Install all-on-one-page HTML docs</flag>
+		<flag name='pdf'>Install pdf docs</flag>
+		<flag name='text'>Install plain-text docs</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-doc/tldp-howto/tldp-howto-20100101.ebuild b/app-doc/tldp-howto/tldp-howto-20120707.ebuild
index f0b76a7954e0..a19a4e8a9c27 100644
--- a/app-doc/tldp-howto/tldp-howto-20100101.ebuild
+++ b/app-doc/tldp-howto/tldp-howto-20120707.ebuild
@@ -1,66 +1,59 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/tldp-howto/tldp-howto-20100101.ebuild,v 1.7 2013/09/05 05:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/tldp-howto/tldp-howto-20120707.ebuild,v 1.1 2013/10/14 05:08:18 dirtyepic Exp $
 
-EAPI="2"
-
-inherit confutils
+EAPI=5
 
 DESCRIPTION="The Linux Documentation Project HOWTOs"
 HOMEPAGE="http://www.tldp.org"
 
-# Yay, unversioned distfiles
-# http://www.ibiblio.org/pub/Linux/docs/HOWTO/Linux-HOWTOs.tar.bz2
-# http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html/Linux-html-HOWTOs.tar.bz2
-#  ^^^ this also contains the pdfs, not sure if it's intentional as older versions don't
-# http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Linux-html-single-HOWTOs.tar.bz2
-# http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/pdf/Linux-pdf-HOWTOs.tar.bz2
-
+MY_SRC="http://www.ibiblio.org/pub/Linux/docs/HOWTO"
 SRC_URI="
-	html? ( mirror://gentoo/Linux-html-HOWTOs-${PV}.tar.bz2 )
-	htmlsingle? ( mirror://gentoo/Linux-html-single-HOWTOs-${PV}.tar.bz2 )
-	pdf? ( mirror://gentoo/Linux-pdf-HOWTOs-${PV}.tar.bz2 )
-	text? ( mirror://gentoo/Linux-HOWTOs-${PV}.tar.bz2 )"
+	html? ( ${MY_SRC}/other-formats/html/Linux-html-HOWTOs-${PV}.tar.bz2 )
+	htmlsingle? ( ${MY_SRC}/other-formats/html_single/Linux-html-single-HOWTOs-${PV}.tar.bz2 )
+	pdf? ( ${MY_SRC}/other-formats/pdf/Linux-pdf-HOWTOs-${PV}.tar.bz2 )
+	text? ( ${MY_SRC}/Linux-HOWTOs-${PV}.tar.bz2 )"
 
 LICENSE="FDL-1.2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="+html htmlsingle pdf text"
-RESTRICT="binchecks strip"
+REQUIRED_USE="|| ( html htmlsingle pdf text )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	confutils_require_any html htmlsingle pdf text
-}
+RESTRICT="binchecks strip"
 
 src_unpack() {
-	mkdir -p "${S}"
+	mkdir -p "${S}" || die
 	cd "${S}"
-	if use text; then
-		mkdir "${S}"/text
-		pushd "${S}"/text > /dev/null
-		unpack Linux-HOWTOs-${PV}.tar.bz2
-		popd > /dev/null
-	fi
 	if use html; then
 		unpack Linux-html-HOWTOs-${PV}.tar.bz2
+		# for some reason this bundles the pdfs - older versions didn't
 		[[ -d ${S}/HOWTO/pdf ]] && rm -r "${S}"/HOWTO/pdf
+		# stray bin file, doubt anyone will ever need it
+		rm -f "${S}"/HOWTO/RedHat-CD-HOWTO/rhcd-scripts/rvc
 		mv "${S}"/HOWTO "${S}"/html
 	fi
 	if use htmlsingle; then
-		mkdir "${S}"/htmlsingle
+		mkdir "${S}"/htmlsingle || die
 		pushd "${S}"/htmlsingle > /dev/null
 		unpack Linux-html-single-HOWTOs-${PV}.tar.bz2
 		popd > /dev/null
 	fi
 	if use pdf; then
-		mkdir "${S}"/pdf
+		mkdir "${S}"/pdf || die
 		pushd "${S}"/pdf > /dev/null
 		unpack Linux-pdf-HOWTOs-${PV}.tar.bz2
 		popd > /dev/null
 	fi
+	if use text; then
+		mkdir "${S}"/text || die
+		pushd "${S}"/text > /dev/null
+		unpack Linux-HOWTOs-${PV}.tar.bz2
+		popd > /dev/null
+	fi
 }
 
 src_install() {