Version bump.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

3 files changed, 35 insertions, 18 deletions

diff --git a/app-doc/linuxfromscratch/ChangeLog b/app-doc/linuxfromscratch/ChangeLog
index bccc34637616..a101e11b203a 100644
--- a/app-doc/linuxfromscratch/ChangeLog
+++ b/app-doc/linuxfromscratch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/linuxfromscratch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/ChangeLog,v 1.15 2012/01/02 04:50:51 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/ChangeLog,v 1.16 2012/02/20 08:01:41 dirtyepic Exp $
+
+*linuxfromscratch-7.0 (20 Feb 2012)
+
+  20 Feb 2012; Ryan Hill <dirtyepic@gentoo.org> -linuxfromscratch-6.7.ebuild,
+  +linuxfromscratch-7.0.ebuild:
+  Version bump.
 
   02 Jan 2012; Ryan Hill <dirtyepic@gentoo.org> linuxfromscratch-6.8.ebuild:
   Stabilize on all.
diff --git a/app-doc/linuxfromscratch/Manifest b/app-doc/linuxfromscratch/Manifest
index 9783d06d707e..cc8bfa787d05 100644
--- a/app-doc/linuxfromscratch/Manifest
+++ b/app-doc/linuxfromscratch/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST LFS-BOOK-6.7-HTML.tar.bz2 183935 RMD160 3e2be513b186c65e86c259843fbd6eddbc2d7c5d SHA1 aff6ce4d1d97b5ae764033aed6d2a3810d71ac77 SHA256 d51f92b9fe0f1276fdc76edfb9774506a908840d2776a6e9b053272acb33a64a
-DIST LFS-BOOK-6.7-NOCHUNKS.html.bz2 164063 RMD160 ab0467bfe24e7cdbb3a325f135edf9cda53125f6 SHA1 24c72e6a282748b1abf2a87aa7ff1ddc669981d0 SHA256 2095cc48d8901a2e6360450fdd26fcefcc9e32d17d6149f663c35b343fbfe293
-DIST LFS-BOOK-6.7.pdf 1388743 RMD160 74fd982ef718f85556b0f55e3d4d5607c5242947 SHA1 2d978fa6a6da1a941bc2bb594d7b4b61bd80bf02 SHA256 b77ae597409aca0bfb3fb56f561c351d6c75f8eb638b01244badcdc289c2e4a5
 DIST LFS-BOOK-6.8-HTML.tar.bz2 184273 RMD160 6f884f548bc11a74bc489d1c0a804e43a484d06d SHA1 2ff7aeee6bd9230f42ea87747fb127eae3292b7b SHA256 f21c78a3c02554c1c120dcd855e4f99731da91eb0425e9aef75603dad12a9c59
 DIST LFS-BOOK-6.8-NOCHUNKS.html.bz2 163393 RMD160 db8bef76fce0cbcfa6302f6b531d5c0beda3be07 SHA1 4ef7f79b5eb206797227c48730acc6e001408585 SHA256 22216c471171f5d388afb1263d54c4f4f8cc2247f72b24b18c4227908af94414
 DIST LFS-BOOK-6.8.pdf 1389722 RMD160 b5f934dd9e0a4e2f7a551cf4bca94e8ce52f162b SHA1 9b32189778c2b37fd1f921b8b0c1a5e18bf15069 SHA256 9a7c7132f72451e35c6a23e37670d459c1c70207ede9d2e9b3e12d0fccad9341
+DIST LFS-BOOK-7.0-NOCHUNKS.html.bz2 173208 RMD160 2d5cdfeac5247f75e996efdf12e5ef64cfc0733a SHA1 ce8f4f7cea2de83d2b1083f0851c8212804505c0 SHA256 f2e9a7fc45fad6166ab380d91a77cd20aa82202050b4b8d64e02bfb33deb2059
+DIST LFS-BOOK-7.0.pdf 1582136 RMD160 d7b48016756db0568f98f4c5562faf2353a4ee4d SHA1 86572093e696a30f8104b82714d2ebd1c7314ba1 SHA256 a01fec839d0e80972e80a146a0648c37079d70898512d4b97e95a6d342820c59
+DIST LFS-BOOK-7.0.tar.bz2 196919 RMD160 aa0151f23bfc0d594a08739c770d36b875f6d596 SHA1 575cb6d19d963aba4c54bd2e0443e6b093df9831 SHA256 74fdcaebef455a2c7d6ccc64c16b7fdaa948fa935e5826a9034c334f8025e8af
 DIST lfs-bootscripts-20100627.tar.bz2 43257 RMD160 dd5532f903ee32981c740cacf93315251a013257 SHA1 b5cb2e95d7780f1c26ac3c974fda5023b2daa213 SHA256 5d10126b0b17b5595f4fedff8c081e071bfdf121d9dde88d271215152a2bd74a
+DIST lfs-bootscripts-20111017.tar.bz2 31955 RMD160 3617cb6437df1474ff250c21095d720ad97bbced SHA1 aff9e9722290b12d89be0d47fb8a83abeaa30f72 SHA256 9494ccda0dee86e8c6807182d85adc8cafc2d4e27eb3c771aeccbdf4df1a1bbb
 DIST udev-config-20100128.tar.bz2 6283 RMD160 bb7ef96b927e925fd93c22e6c00d756aa977e71e SHA1 07829bbda4139f64e0c66249deef2e7e32861484 SHA256 cc765ce0879bd8fb9347f43603ecfb45bbc2244ae2c8816b1018c86e23f7c02c
-EBUILD linuxfromscratch-6.7.ebuild 996 RMD160 db5da57440b6a978082ed862f86c67f64dce5f72 SHA1 088f19c2826fe38eb0ed51da7616bf692aa4391f SHA256 097cc93f137724a781dadd9a569f05c7583be76084fbb146c0cd744c1723788e
 EBUILD linuxfromscratch-6.8.ebuild 1196 RMD160 3ee7b6a64d823565c259a792fca6f8a445366a74 SHA1 c048e32814a30200e2e22ee06e699d8e8201aafb SHA256 cc981bc8a07dbaf5ca210ae41a06a6ed66d5ef7c51bdd434d2798ebcfbc21aff
-MISC ChangeLog 2378 RMD160 ac1012f1e79928238d8574b84025797295349e9e SHA1 3cf6196aaf171eefc72ecea55d6d5611979424ae SHA256 521aa67e301e2f2cf8a404bda3c2afb834b334480181aa501ca1784116369ef6
+EBUILD linuxfromscratch-7.0.ebuild 1242 RMD160 bf0354928ed71857097dffe6a4957b85b5d4e876 SHA1 75f9a6d095532293fc62282512b072fe763445f0 SHA256 053dfc75ce32ffa155d8582f7e7f29237aecb7b2f6c4f64267c094bc12ee8547
+MISC ChangeLog 2542 RMD160 178c1a000beec3e0b4ef12c086c9dfdcf6656263 SHA1 341dd6d3e5b981a72326d7740002b2eb5285f777 SHA256 3bfb6ef2240e5564c71ef0f5d30d8ebd53a36877127cd82c0b24ed7e59bb5d67
 MISC metadata.xml 317 RMD160 9916c5d77bcc0347c82c9e29c783fa5a772e13c7 SHA1 8bf19b65d63233a2f7d3c3fc3fa2665ad8ed7db3 SHA256 535c730acf7cf2afa09c1b9210133d3492f9d34e9963ab99f5d95f481019d221
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8BOd8ACgkQiqiDRvmkBmKq0ACgmgc4CZjhKyPLBBvZifMpD8Sx
-fOIAn3JXBFXKyppODYaCKV5gOvVEV6sQ
-=k56o
+iEYEARECAAYFAk9B/9EACgkQiqiDRvmkBmKTgACfXX2bz8YI3BP6CUPwhWRG/rT5
+mD8AoNwl30rqkg3Y1iP9s6jTGWX7cODX
+=mouO
 -----END PGP SIGNATURE-----
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-6.7.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-7.0.ebuild
index a92aeb07ec21..dfc07a87c951 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-6.7.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-7.0.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/linuxfromscratch-6.7.ebuild,v 1.3 2011/04/13 08:42:26 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/linuxfromscratch-7.0.ebuild,v 1.1 2012/02/20 08:01:41 dirtyepic Exp $
+
+EAPI="4"
 
 MY_SRC="http://www.linuxfromscratch.org/lfs/downloads/${PV}"
 
-BOOTSCRIPT_PV="20100627"
+BOOTSCRIPT_PV="20111017"
 UDEV_PV="20100128"
 
 DESCRIPTION="LFS documents building a Linux system entirely from source."
 HOMEPAGE="http://www.linuxfromscratch.org/lfs"
-SRC_URI="${MY_SRC}/LFS-BOOK-${PV}-HTML.tar.bz2
+SRC_URI="${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
 		${MY_SRC}/lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
 		${MY_SRC}/udev-config-${UDEV_PV}.tar.bz2
 		htmlsingle? ( ${MY_SRC}/LFS-BOOK-${PV}-NOCHUNKS.html.bz2 )
 		pdf? ( ${MY_SRC}/LFS-BOOK-${PV}.pdf )"
 
-LICENSE="as-is"
+LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-2.5 MIT"
 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="htmlsingle pdf"
 
 DEPEND=""
@@ -25,8 +27,16 @@ RDEPEND=""
 
 S=${WORKDIR}
 
+src_unpack() {
+	unpack LFS-BOOK-${PV}.tar.bz2 \
+		lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2 \
+		udev-config-${UDEV_PV}.tar.bz2
+
+	use htmlsingle && unpack LFS-BOOK-${PV}-NOCHUNKS.html.bz2
+	use pdf && cp "${DISTDIR}"/LFS-BOOK-${PV}.pdf "${S}"
+}
+
 src_install() {
-	# We don't want this stuff compressed
-	insinto /usr/share/doc/${PF}
-	doins -r * || die "Install failed."
+	dodoc -r *
+	docompress -x /usr/share/doc/${PF}
 }