Add use doc also on 9999-r1 ebuild.

QA: Remove COPYING file
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 23 insertions, 18 deletions

diff --git a/dev-libs/gnulib/ChangeLog b/dev-libs/gnulib/ChangeLog
index 0f0b6d3806e0..5debc5b7d05d 100644
--- a/dev-libs/gnulib/ChangeLog
+++ b/dev-libs/gnulib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gnulib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/ChangeLog,v 1.7 2009/03/04 15:34:11 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/ChangeLog,v 1.8 2009/03/04 15:37:25 drizzt Exp $
+
+  04 Mar 2009; Timothy Redaelli <drizzt@gentoo.org>
+  gnulib-2009.03.03.14.07.45.ebuild, gnulib-9999-r1.ebuild:
+  Add use doc also on 9999-r1 ebuild. QA: Remove COPYING file
 
 *gnulib-2009.03.03.14.07.45 (04 Mar 2009)
 
diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index 169c60cd76cd..f0009ad164a7 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX gnulib-2008.07.23-rpl_getopt.patch 304 RMD160 a20477e8587f910c13c3995d75649a868b96b79a SHA1 66a4e1826ff8f8458f1d0c4ff4b4786a7060f968 SHA256 b3d1aaad2310fc793763839bae0e0ab67ff7882731f03a943461db95da3c2443
 AUX gnulib-2009.03.03.14.07.45-scandir.patch 316 RMD160 a60a8c569fd73e83a0a038a57ff430da84c54810 SHA1 1e194b4ca8f45a1c050ef595d74393febb2accca SHA256 e390b51d3cc1534d225cbdee27ffbf1ffd6967d0571c1f4435b4aa928eea9203
 DIST gnulib-8d2524ce78ca107074727cbd8780c26a203a107c.tar.gz 3687831 RMD160 a25bd3c079464f531d4dc76cb9362e412ab7a56e SHA1 f80c9d309d8b58c00fd9b212e32289742030f45e SHA256 a220080dda77159b2d30bbed93437b97efeef20c417e255296924d580ce6d309
-EBUILD gnulib-2009.03.03.14.07.45.ebuild 2013 RMD160 c0df0e32d919e14b8d2414851d00d08a69fe3956 SHA1 7f097c4042f00f24db3df4fcf0c58159126d0aeb SHA256 1ba7d2b53e26baef7134516aaa6d19693eceaea5fb5fdd0a5acbc9c051e5b9c8
-EBUILD gnulib-9999-r1.ebuild 1039 RMD160 baa13eaf235b6ba9a0773084c98a3ae5a4484249 SHA1 b0a75a5ec0027d1028fc49d365a886dc45d9b108 SHA256 896c441aec1219df353b799c740116b1b54b57061e7a952bd09e4515cb219021
-MISC ChangeLog 1034 RMD160 7f11fbcfd7a1b104ad86e5a7712ba8b9bfeef683 SHA1 31d129c69c53b6e35d3c78a3f7d29331131381ea SHA256 158fb1135a7a468171a48e0a9ccc43519357cedbeb287f1bd7dce372c291927e
+EBUILD gnulib-2009.03.03.14.07.45.ebuild 2005 RMD160 db0c847e0aeee36c75707597d5efc7398e81e69c SHA1 c2ee6cd2d227c9a346bfb0d229ed853665774e9b SHA256 427ea5d3502feffe0a7cc743872dd78719bdf5688af8534d16ecb05355840557
+EBUILD gnulib-9999-r1.ebuild 1004 RMD160 8196a9cc23ae81cea3d102dc109490d43e273dd2 SHA1 124f3f0c557704f7da57f29dbfbe94666612e6af SHA256 254c3c51f8f024872ea9baf4e2c7a298cabf89067b773ae44b6b9343f8d98109
+MISC ChangeLog 1209 RMD160 3dfe85457bbcc9b13dc8166343ef6ec07bb54663 SHA1 da4b7436e0d7eacbfe611ce37b699cfb7b0b2854 SHA256 691caab88f6dd0c99f8f6f4dc4197894e6a5ac5895e74caecc62c664d5d245bd
 MISC metadata.xml 220 RMD160 308345912146c5e9bd3f1d2ee119e04cede580a3 SHA1 2869d94e798df613f6a03d471ca672fce92af74e SHA256 f887a8f740f065e7b83ebcb94494ab388927dca6b0d57e6f8b1b7acc9822af66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmun3oACgkQl4DfQEcjpw2tbQCeORVc03KOdTZAyh42wbCBRo0w
-5/UAn1WJnEAi8oh4c4yt+Sit1UIFhWV7
-=Uonj
+iEYEARECAAYFAkmuoD4ACgkQl4DfQEcjpw3K0wCeIhBz/i5UIjvrUE8XKpsmus35
+xREAn2m+5xZ4AuMHfZFbrgjAz2YumORz
+=Tc8Q
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild b/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild
index 8c1d20ccfdd8..05e39e06234e 100644
--- a/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild
+++ b/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild,v 1.1 2009/03/04 15:34:11 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild,v 1.2 2009/03/04 15:37:25 drizzt Exp $
 
 inherit eutils
 
@@ -50,7 +50,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc README COPYING ChangeLog
+	dodoc README ChangeLog
 	if use doc; then
 		dohtml doc/gnulib.html
 		doinfo doc/gnulib.info
diff --git a/dev-libs/gnulib/gnulib-9999-r1.ebuild b/dev-libs/gnulib/gnulib-9999-r1.ebuild
index cb1e829a1bd5..20841271aca6 100644
--- a/dev-libs/gnulib/gnulib-9999-r1.ebuild
+++ b/dev-libs/gnulib/gnulib-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/gnulib-9999-r1.ebuild,v 1.3 2009/02/02 18:55:47 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/gnulib-9999-r1.ebuild,v 1.4 2009/03/04 15:37:25 drizzt Exp $
 
 EGIT_REPO_URI="git://git.savannah.gnu.org/gnulib.git"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/gnulib"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="doc"
 
 DEPEND=""
 RDEPEND=""
@@ -20,13 +20,17 @@ RDEPEND=""
 S="${WORKDIR}"/${PN}
 
 src_compile() {
-	emake -C doc info html || die "emake failed"
+	if use doc; then
+		emake -C doc info html || die "emake failed"
+	fi
 }
 
 src_install() {
-	dodoc README COPYING ChangeLog
-	dohtml doc/gnulib.html
-	doinfo doc/gnulib.info
+	dodoc README ChangeLog
+	if use doc; then
+		dohtml doc/gnulib.html
+		doinfo doc/gnulib.info
+	fi
 
 	insinto /usr/share/${PN}
 	doins -r lib
@@ -35,9 +39,6 @@ src_install() {
 	doins -r build-aux
 	doins -r top
 
-	# remove CVS dirs
-	#find "${D}" -name CVS -type d -print0 | xargs -0 rm -r
-
 	# install the real script
 	exeinto /usr/share/${PN}
 	doexe gnulib-tool