summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2011-04-13 08:42:26 +0000
committerRyan Hill <dirtyepic@gentoo.org>2011-04-13 08:42:26 +0000
commita1e5f7afbab04c01d621a4533066ec46190e9220 (patch)
tree6c430ae529ce94e50bb5f0c9974ef811c2eb89b8 /app-doc
parentOnly mask nvidia beta driver (diff)
downloadgentoo-2-a1e5f7afbab04c01d621a4533066ec46190e9220.tar.gz
gentoo-2-a1e5f7afbab04c01d621a4533066ec46190e9220.tar.bz2
gentoo-2-a1e5f7afbab04c01d621a4533066ec46190e9220.zip
Version bump. Fix pdf installation and remove old.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'app-doc')
-rw-r--r--app-doc/linuxfromscratch/ChangeLog8
-rw-r--r--app-doc/linuxfromscratch/linuxfromscratch-6.7.ebuild4
-rw-r--r--app-doc/linuxfromscratch/linuxfromscratch-6.8.ebuild (renamed from app-doc/linuxfromscratch/linuxfromscratch-6.6.ebuild)24
-rw-r--r--app-doc/linuxfromscratch/metadata.xml2
4 files changed, 27 insertions, 11 deletions
diff --git a/app-doc/linuxfromscratch/ChangeLog b/app-doc/linuxfromscratch/ChangeLog
index 2de5a2326f56..b69353a1f72a 100644
--- a/app-doc/linuxfromscratch/ChangeLog
+++ b/app-doc/linuxfromscratch/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-doc/linuxfromscratch
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/ChangeLog,v 1.13 2011/01/23 06:56:24 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/ChangeLog,v 1.14 2011/04/13 08:42:25 dirtyepic Exp $
+
+*linuxfromscratch-6.8 (13 Apr 2011)
+
+ 13 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> -linuxfromscratch-6.6.ebuild,
+ linuxfromscratch-6.7.ebuild, +linuxfromscratch-6.8.ebuild, metadata.xml:
+ Version bump. Fix pdf installation and remove old.
23 Jan 2011; Ryan Hill <dirtyepic@gentoo.org> linuxfromscratch-6.7.ebuild:
Stable for all.
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-6.7.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-6.7.ebuild
index 2ea10019cf9c..a92aeb07ec21 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-6.7.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-6.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.2 2011/01/23 06:56:24 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/linuxfromscratch-6.7.ebuild,v 1.3 2011/04/13 08:42:26 dirtyepic Exp $
MY_SRC="http://www.linuxfromscratch.org/lfs/downloads/${PV}"
@@ -17,7 +17,7 @@ SRC_URI="${MY_SRC}/LFS-BOOK-${PV}-HTML.tar.bz2
LICENSE="as-is"
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=""
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-6.6.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-6.8.ebuild
index dd0fe7057ea5..25c3a26fea97 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-6.6.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-6.8.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/linuxfromscratch-6.6.ebuild,v 1.2 2010/10/26 17:37:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/linuxfromscratch-6.8.ebuild,v 1.1 2011/04/13 08:42:26 dirtyepic Exp $
+
+EAPI="4"
MY_SRC="http://www.linuxfromscratch.org/lfs/downloads/${PV}"
-BOOTSCRIPT_PV="20100124"
+BOOTSCRIPT_PV="20100627"
UDEV_PV="20100128"
DESCRIPTION="LFS documents building a Linux system entirely from source."
@@ -17,7 +19,7 @@ SRC_URI="${MY_SRC}/LFS-BOOK-${PV}-HTML.tar.bz2
LICENSE="as-is"
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}-HTML.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}
}
diff --git a/app-doc/linuxfromscratch/metadata.xml b/app-doc/linuxfromscratch/metadata.xml
index dea38f93a28a..bf44b96fca9e 100644
--- a/app-doc/linuxfromscratch/metadata.xml
+++ b/app-doc/linuxfromscratch/metadata.xml
@@ -7,6 +7,6 @@
<name>Ryan Hill</name>
</maintainer>
<use>
- <flag name='htmlsingle'>Also install all-in-one-page HTML version</flag>
+ <flag name='htmlsingle'>Also install single-page HTML version</flag>
</use>
</pkgmetadata>