Version bump.

Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 48 insertions, 55 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/Manifest b/app-doc/tldp-howto/Manifest
index 474d849d82f1..8ca676bc56cb 100644
--- a/app-doc/tldp-howto/Manifest
+++ b/app-doc/tldp-howto/Manifest
@@ -1,32 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Linux-HOWTOs-20100101.tar.bz2 7217658 SHA256 914c49b48c283b378ade4d059ab67b618f67372b9432cda2d7b3599420582f60 SHA512 b1ce2ed4b091dd85fe8b85e63d4100b89e213e60f60b5e2c958702c364972c135088bd4319ca8e2ceb01a0cb1c915b98910bbd03c3662fde6614f2f5587d5fe0 WHIRLPOOL 90d9adecf8b6cd474a865e42632023f898ead4a1666081769d0d4b77bfd15369a18f247ac5222c67ee99e27aefc3788e1a89c2e4f1b0a87fe40cfb2cede127eb
 DIST Linux-HOWTOs-20100701.tar.bz2 7220430 SHA256 193e897be336edf28411dc23b26742707795d3e4bb511990bccbbfabf6e9173e SHA512 2041a3361b522eb8377c98589d9fdbfdb2c1f20e5ba5bc74a67ec550529cd2b9b378d9e741cfddcfff8325c359b078b4e4a83337d6da10927e06254271f85a5d WHIRLPOOL 713e1881af3bdd7325880aebaf9924f5897219db878b1979706db1db4f913d5f5897cf7f25683502306208ae81eec8f48f95750c682226dcd1a5cf4f99ca1cbb
-DIST Linux-html-HOWTOs-20100101.tar.bz2 73796628 SHA256 1c358f512af72665fd9db22f24008b324f0d062dd933f7f9802387cbc4db472c SHA512 69c5670470125f8eb24454463946f6fa1a9bd29e3f19af3a579637f85f33685a2fd1e6ae359f2a67e7de3c1458ae86f28069c4b35b777dd6773ece13f53d5be7 WHIRLPOOL e047e94d0b7d000b733065745fa77bc9776658ae2c1208e43bcfda1e398afc14dfa0493c126978d5ed697096acde91aeeee990c3749d9c516ad5e0af29ec7a17
+DIST Linux-HOWTOs-20120707.tar.bz2 7221427 SHA256 8f818c0ac3bdbe01307b83fe81e3cfdc92112dbf8b32f5df9d28b41decd3def0 SHA512 329a299e2e66f17139a4ce4f6bed0106bc0bd2147773c659e101468adbc12a71c88f952fe7e96b78a483d62a3eafd5306cd8961c100c0ec93d55586ff1bddd41 WHIRLPOOL a981d645969c72e874aa30dda956ba4e09cf65919ea4ffd2f8469b5124af77a4ff3e8196fa515122a7cc878e8d1b036f263bfa910338a1984250f04c80fb422d
 DIST Linux-html-HOWTOs-20100701.tar.bz2 74332215 SHA256 bf3eaae198f465a5ec53c6878fa0bbb05b8faf2243bd2bdb88f0a0d23ff62584 SHA512 e1d9d238b69a972fec737bdfea95c34ff013e9a8caa8635ee2eb2a2e63aece143b5f65a953e64a0add75fe46fa8c9015638a1d2750e3559249fd91801409e560 WHIRLPOOL 951edb9052f1250295c34f83bd6f64c9a0d599b566b2e6ac35f125c5a291fb309818d88770390db248920045b806b0b1da3d1eb8130cd4f09277e66da6a171c0
-DIST Linux-html-single-HOWTOs-20100101.tar.bz2 7564228 SHA256 326d1e9ef22fb2d9f517322ab076bde90645e5d739d842dfe6d79c1cb3bc0b36 SHA512 8efc5e5fb8691a102507e19ede0f574217d0c3895ea097da21bdc17c2d5da0feb2d7eb536fd6ecdb25023a6f7e9658ccdf059a6a3aa8cbaaf66ff940aa85c89c WHIRLPOOL a8b0fbaee3d2c0585fbb9736d8286e4dba0b2fb006cad9444e41384657f13da352aee0fbe9dd6bdd9dddcc3b7e6f810ad62402d88290a92b3c0a54aa3b2a4ee3
+DIST Linux-html-HOWTOs-20120707.tar.bz2 75088235 SHA256 619ae9428f3c47fb9163a6b548f70877f0732e5457e9cd149c0e4d478ccd47ec SHA512 291764f596021cc098f13fc2a589a2bceb3a5865c7194db42c2b1e37bd59bceee089d34c9f55487a049a20d5f5296b5d0e67cc3303ed2aac1d2288a41caa2218 WHIRLPOOL 43cf549462ff6b6b133403eee408ba9defea0920304a4a9c7e06093d269c375082859ff7e49b8c5eb61287402c3a72738d3bb6a08dfc569b45c973a2b4e997f4
 DIST Linux-html-single-HOWTOs-20100701.tar.bz2 7567484 SHA256 251b8ddf1cba4796a6a50cf5e2a14d9cc33a40ffd22b7a19d802cfe89b871ebf SHA512 cb6756485a9f02b3bfb3765fa092298d2bd5cb7bc03d86d95b40bc81171d9167ceb47681f1643151a525f0251054f566c1783358c06bd728ce28c65fad3d1a2b WHIRLPOOL fb72ea8109ddcc4fa58fd13acee85a088c882cc60933b11059f905da9621c0344b49d678101107a7f158daecd9edefcecb4228abc62507278863996c714a9514
-DIST Linux-pdf-HOWTOs-20100101.tar.bz2 56214127 SHA256 755bb1f447921262986c03eb278a41e6d69c994071bd31d7ce9ccdecaa3bc7d7 SHA512 4a1d2e237fa3e95b18a9a1d366a72bd58f51e2cec0d4c0caaef15d6eb3ba4c4d714e392635c9b1fe2199867cf25942ed7e88a8b5e083e855dcfdaeb1cc6d8b18 WHIRLPOOL 00c3e88651d3b5c601f01d15186b6f763977efb924bc06ff04d0f339b6bce346bad41eceb006e40f618c1f016a9a00e2fe219df77d36a8a5f8a2ace5a1182bae
+DIST Linux-html-single-HOWTOs-20120707.tar.bz2 7563325 SHA256 5f80a27099ec484e8c063afaa767aba3868ea4af942dfccbb024a57eda6ba1c9 SHA512 edfc2c267c8efc66c220a5458eb514864f8b371031bc10afbfaab668558eaa8c02afd7b58c4cb65d874c5fe9b3e22f6df376e4114d3e8635be525c5d14e8bd20 WHIRLPOOL cee63efc95886acfaa25be04c7b124872a0a527d45c359cddc7d5ace5321984d5c8a829e116779c4118ce0572bd77a719df56c355b43de671c84a6521d5d58fd
 DIST Linux-pdf-HOWTOs-20100701.tar.bz2 56839500 SHA256 b8d9a245f8da038af0294335d1a98f0391792c2958e69962958f55778d2b0215 SHA512 54d2a168a186a44fe0d6f3532474e34d9542dc95f8633ee46b864d45ef91576929dd97902922d114fc4fc68c0112b14bd95b758836d25fb5b646655261eb3b7d WHIRLPOOL a600ccb734302d26d5b79bcebac44fd3d7ce7b70a55cfa34fb36b30bc7faf3fb9f3a08b130b7c6cb9290bc481345b65f166e77d764bd0180c774dd95627d4cb9
-EBUILD tldp-howto-20100101.ebuild 2087 SHA256 b428501f67a7b0a8c15d38246396143349cf0a9691719da13e6f33256ea9d9c1 SHA512 1c9f01cf37cfce27f1de6cc65367e918093438b44f004d19bab8261864f07048f3164adf79cecf0a9ef47cbea0f9a2f8ab1be960baf406236e1e330fc140d0df WHIRLPOOL 66b027c9f58813fd6bd0a4b0c63c4aeb4dfe604e94ef3035603c908afab6998bd44fdffe6cd988db3503195c211d9a7395f8da09f1d0274744c900166aeddd7b
+DIST Linux-pdf-HOWTOs-20120707.tar.bz2 57436243 SHA256 7ba25461d394993229245ddef17b6f184e6d480ffea6d0fecd98f2092eed4ab2 SHA512 665387a1e2f9703042f1544ed015e39ba222744795ea676fcefc83fda94b6f9222a98aa4ed37ea5bd9164327837e924613ac41ca78a78ae9a4a4097fb64cff3e WHIRLPOOL 168fe7410c5a03c04898455b6c79725851641b88c282641ccd0d30bc1f5c674bc998f7113c04ae49b7a1b86274d3ef185b1bcaf850d9a5aa082fe42191915068
 EBUILD tldp-howto-20100701.ebuild 2087 SHA256 fa60580b6ff056bf46bfaf791c85c5f4dc4a1d120a85dcc37a2e5ed07df21c27 SHA512 b86dc2abb86b3a99e9409962003cf937a0899825719bca8acbfe7422756114c02f753b09eab94d04d1c5ea4c88839f0b8215f19b7bc86278845174f224e086eb WHIRLPOOL e2f52151a344e975018616177baf04b7a009711e72e5abe37efb9626a2fa531aab1011102b821f2bb31d3062d21e14d09b713f1898654c05c91cbd036b05eb73
-MISC ChangeLog 1514 SHA256 f9c252a304ce0cdafdb13d9d37c6bc302fc54af27d6a3709095482db1a713cb7 SHA512 5cfe9ebf69f4dce421566a17bd0beba0d04a681f9f50e018d43a14132cb8c4278394d9976a590520d59c29f55603c6f25932f36fdd0df8ecdf2459f664b835b8 WHIRLPOOL 2f2da8ed354711348c4816413b7545ff62ac1883e6f739419ede665339d69973f271ede28c3ea8205065a6c3e96020a6de29dfa34ed63f927f45e7dabe454899
-MISC metadata.xml 454 SHA256 443be71ba959a19f4482b296379ec29ee49cfdbded68cc9c48397522d20b2811 SHA512 0e992c3787be4f03552e65f1c5469275d461f08d90efaf62a5dc7ad0deb57a1d7f813b5bf17b06c1c213c9f80ae462425c9f698745e927f78361c08771123e08 WHIRLPOOL 81112418fca89b49ca78fb7e9a530084046de99ddf6a61980bdcfe6ef02cb1f2bf8acbf97e8d838f3a361d4c8288e7e89967adcb77208ca03eee6ecc1d719f22
+EBUILD tldp-howto-20120707.ebuild 1884 SHA256 c28e9673c30a454f704e020919ef591f7f2eb8a257ec45eb9c147c501f32efaf SHA512 6790767fab2a83ef629c46fc069337ef4d89b62d9162b0c55a088b94a69a7b3bd0cae7b41815fc774ba509c262014691ff17e59fdb0ce254d03f0fc033a0fef2 WHIRLPOOL d128d07b8c7c7209fa4312dcb092c430780f43c6ff1a9ce5a60a866e8c4456d7a8d3864515df7cfd2dfdf400eb7a580e2283aba57a54216219c3b8bd6f5d3da1
+MISC ChangeLog 1692 SHA256 906223b87bbcb7f520b93526e0d3dabb63b6bbed6ad5a86575b5d50b038b7861 SHA512 8c53f9ef7434119c28275ad1accde5135698acb6a4150026070f52a9c486b8e8aa46e27e12d7e6f568b2b598edfebffc48734e78ed3e12a2b67f7f6c754185be WHIRLPOOL 7059adaa8f4b59fb1575c32322923d26e6a1dedb610cc733ec68b1ee6d1ce408d64c7b994b3a243636f2b16b6c06d9bc74a2aa68ddcc6e0a506f98defac37d24
+MISC metadata.xml 396 SHA256 653b62e404e145731e9d2b5bcae907412b3e632d98254b458d31d4f7d269ce89 SHA512 09fdbeb36f47bd3877893b161afc4aaef583363f7c20a9fd8bde670d4a49a43b6940b8ac16b53c1d2540e717cad8a44f1b736dbf71a2fa417de7f9ab3bb81c68 WHIRLPOOL 06cf1cc4dce294511532fde038d844892cdb1f32267655d06cd8c6789a5820a0180284e4cc06f07d7bcafdc04c4419df9026f5b3480158f4c239958055a6ac9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSKBxuAAoJELEHsLL7fEFWcXsQAKl9KOLK/rZb3e0ZWhTzeWvJ
-wqD2wJFQxirtvUHLowvsrJKAtVoGKZxyQDR/fQ+1Fzr23KzvnuGY/bjS9JNHIDEK
-dPw14RvkRPgmTUSMe20CEgLDpNM+gIet97Ze3wO8xlNfJ0NP7ugDCOIagh+sMb5L
-L71VGpCAIydc/ndauSvnL8HPJRUzu53+ytn8KbS7ETKd9zY8BhKmF5YjuXJnaITO
-yB0NrbXo+0N2H1WDrHVaCBWgSRGMcCfz4wtEGmVFKr/3b4Sqd55BLdSlBmKoEl8g
-tDdsqAAXQ2VfvF92atTcTtnSfUJ09cMeMCzgFFO8SG1Nyxzq65PnmKQ5zalIXjCs
-0THiLcFOI5EfpF6fjqFB/s8SwiV3GaRLrd/ot+xUT4hXxtnGz52fRomraKGC80Vr
-du7YglXeVlb/1DVuZWvPCj/b905LuBKuFQYsmXaLOok0nA884DNXo8lqLZ2c+JGQ
-RDVbHNrOPufoOFyhuPe6B7BGOOuToOISTT3uOtz9xf23bfG0w3gTue7TXFyq/epI
-s9p4HzrcTyhspC6Af+7lBlIkoIPpr6WKb/bWwl1SHvvptr5yMLoyMRegJ9lzo3IF
-um05mIVYExiUG7fUmvTEeS/fx6jIk+V4m97JwVcIQPFq9s+yZV5plA+1HsXcViGz
-U0XSRbZ4PJgemP0Z7nrT
-=XPFy
+iQEcBAEBCAAGBQJSW36yAAoJEO04vUmVeoRj0uIIAIY4C8czt7hsWgQ48N1US6AG
+Tzkyqm8SblJJq7EIu6Mxo/rgtGkLPfKLFWAYZw3MRYxACwv7uQ8WjARMpN1ulCAc
+Ea71O+qXtIfwz3WrxbNQDypwafc6pK0o+bvDK66Up//tcLSqoVbXQZzaTwJehb6y
+Tv82QEAyyOrJIp04Kv8/qR4UWeKP27g/lj0WvJW1S/eCeyBCxb/kAKIzOMzFGozh
+AeEPdR0VJBYijFoRGfJ4a8ccugsyGBLb7R3qwie18gSI+Kp0JFhaZkiWspowH43z
+E+Taq0l0IJ/9oh8C03p6NF/+ShGwmxhGsqc7zf/UwOyNuEEWWE2kJ2nXTAEwBS4=
+=ss0r
 -----END PGP SIGNATURE-----
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() {