Remove doc useflag from live version too.

Package-Manager: portage-2.1.2-r4

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 98b77a460388d14bf11d3dff7279fafde89e1849..5bda39602f500102ac6fb79b7916a1e9e096941a 100644 (file)
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.258 2007/01/25 18:45:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.259 2007/01/27 20:53:29 flameeyes Exp $
+
+  27 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-driver-1.0.14_rc2.ebuild, alsa-driver-9999.ebuild:
+  Remove doc useflag from live version too.
 
   25 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   alsa-driver-9999.ebuild:

diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index c53ad3ab82e3d16101f91229176f89a9a4511b86..b88eddb733131569f012bf9a759a62f082a61d20 100644 (file)
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -20,18 +20,18 @@ EBUILD alsa-driver-1.0.14_rc1.ebuild 6455 RMD160 f9c84b5478044e8f418d96f9c4cfdf2
 MD5 030d3fb68993970d295c196b6394aee3 alsa-driver-1.0.14_rc1.ebuild 6455
 RMD160 f9c84b5478044e8f418d96f9c4cfdf2c21ad66a8 alsa-driver-1.0.14_rc1.ebuild 6455
 SHA256 d0f5af36cb7f584a20a026bfcd0f01f96f06814fde24844a0afa3f3215ff8ba1 alsa-driver-1.0.14_rc1.ebuild 6455
-EBUILD alsa-driver-1.0.14_rc2.ebuild 6507 RMD160 2f313c61a3bd260013ae143f244f73e4c4026f18 SHA1 76b189c391de97044e090779eb1eee45de99bace SHA256 e21259f0e250704074befd65121fbf8feba5267eb3ea304b7c4d74794beb0032
-MD5 82866ffb0cb4055756e6a39127c4cb0c alsa-driver-1.0.14_rc2.ebuild 6507
-RMD160 2f313c61a3bd260013ae143f244f73e4c4026f18 alsa-driver-1.0.14_rc2.ebuild 6507
-SHA256 e21259f0e250704074befd65121fbf8feba5267eb3ea304b7c4d74794beb0032 alsa-driver-1.0.14_rc2.ebuild 6507
-EBUILD alsa-driver-9999.ebuild 7126 RMD160 ea7c48cbce617e2f62c7b80a7d9d406201d2fc7d SHA1 19bac3e039e34825ba8245ac06af58238f244a0b SHA256 0c636cfa458370c05c236872fbf953da0ace6400ad49944df6eca5826e7d7ee3
-MD5 020f19ee0d79a98fa6c2bdb8025004f5 alsa-driver-9999.ebuild 7126
-RMD160 ea7c48cbce617e2f62c7b80a7d9d406201d2fc7d alsa-driver-9999.ebuild 7126
-SHA256 0c636cfa458370c05c236872fbf953da0ace6400ad49944df6eca5826e7d7ee3 alsa-driver-9999.ebuild 7126
-MISC ChangeLog 44896 RMD160 15ff5fd4725f672d97068e7af295423a0ee3bbc1 SHA1 8c7e3fa0625c1ac7a41e28ede57794443e34cdc0 SHA256 9fff9fdc67e8baba481c096c993945e4885b8d98c076cff38c1d409c16e340ab
-MD5 f8f7786ac1ef22cc25ab6f2d0228a358 ChangeLog 44896
-RMD160 15ff5fd4725f672d97068e7af295423a0ee3bbc1 ChangeLog 44896
-SHA256 9fff9fdc67e8baba481c096c993945e4885b8d98c076cff38c1d409c16e340ab ChangeLog 44896
+EBUILD alsa-driver-1.0.14_rc2.ebuild 6507 RMD160 16f9b4af043d9c0f0d5693ded3ccd54f444e1b9b SHA1 8e6a5e44c68e983e7146889bf1aef83133fc201f SHA256 7cfb149360b8e3702bc66fceead0cd56e40e08343ddf4a4230ed04a18f5b0a29
+MD5 cd2b0575c4493ca5942d79c790333703 alsa-driver-1.0.14_rc2.ebuild 6507
+RMD160 16f9b4af043d9c0f0d5693ded3ccd54f444e1b9b alsa-driver-1.0.14_rc2.ebuild 6507
+SHA256 7cfb149360b8e3702bc66fceead0cd56e40e08343ddf4a4230ed04a18f5b0a29 alsa-driver-1.0.14_rc2.ebuild 6507
+EBUILD alsa-driver-9999.ebuild 6597 RMD160 8c56333e1579003505ef951069d5cfb44851f8da SHA1 6389a5b332fa4d64f54f9d33d452e4aed4530ca2 SHA256 66f65e41a89a2711f166b3f302dd59ebda386903e7b922b13e771a62468c8409
+MD5 5095e905b5704e7572491ea686cab5f0 alsa-driver-9999.ebuild 6597
+RMD160 8c56333e1579003505ef951069d5cfb44851f8da alsa-driver-9999.ebuild 6597
+SHA256 66f65e41a89a2711f166b3f302dd59ebda386903e7b922b13e771a62468c8409 alsa-driver-9999.ebuild 6597
+MISC ChangeLog 45052 RMD160 fb274dbf6c46ea35fbb3f75e2d35a8e99a79fb1f SHA1 750a96f517783d6c08fe884d1a34961f308d71fb SHA256 b94b8aa4acd4438e903c445bbe8a878e6e5dd8add687e54af773203bea6fdccc
+MD5 c77dead6a164778a3f92c18b23286443 ChangeLog 45052
+RMD160 fb274dbf6c46ea35fbb3f75e2d35a8e99a79fb1f ChangeLog 45052
+SHA256 b94b8aa4acd4438e903c445bbe8a878e6e5dd8add687e54af773203bea6fdccc ChangeLog 45052
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -51,7 +51,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFuPrPAiZjviIA2XgRAobLAJ41INdHhuG4AM/dcQO/vVTikpNE1wCeKuPP
-JkOLLH97av9JXX32Ddj3qkM=
-=UrjQ
+iD8DBQFFu7vaAiZjviIA2XgRAheuAJ4lbvaGyzmj6oJxrijAGfSUqScOfwCdEz+T
+9fsssv2IxlEMjG1yt1o2dok=
+=cjui
 -----END PGP SIGNATURE-----

diff --git a/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild
index 1e28159e8900943293bbf8d9733d1f119918f5cc..378b89df571344f53c46ea42d06c32e4da97fa0b 100644 (file)
--- a/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild,v 1.2 2007/01/19 16:41:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.14_rc2.ebuild,v 1.3 2007/01/27 20:53:29 flameeyes Exp $
 
 inherit linux-mod flag-o-matic eutils multilib
 
@@ -126,7 +126,7 @@ src_compile() {
 
        ARCH=$(tc-arch-kernel)
        ABI=${KERNEL_ABI}
-       emake LDFLAGS="$(raw-ldflags)" HOSTCC="$(tc-getBUILD_CC)" "CC=$(tc-getCC)" || die "Make Failed"
+       emake LDFLAGS="$(raw-ldflags)" HOSTCC="$(tc-getBUILD_CC)" CC="$(tc-getCC)" || die "Make Failed"
        ARCH=$(tc-arch)
        ABI=${myABI}
 }

diff --git a/media-sound/alsa-driver/alsa-driver-9999.ebuild b/media-sound/alsa-driver/alsa-driver-9999.ebuild
index 4bc5be794a28e7c8babd702414fc77108d7e417a..e7e9c8f9dfe2075c819fcfdc5c4bef2b14d18f33 100644 (file)
--- a/media-sound/alsa-driver/alsa-driver-9999.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-9999.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.6 2007/01/25 18:45:28 flameeyes Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.7 2007/01/27 20:53:29 flameeyes Exp $
 
 inherit linux-mod flag-o-matic eutils multilib autotools mercurial
 
@@ -14,7 +11,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
 KEYWORDS=""
-IUSE="oss doc debug"
+IUSE="oss debug"
 
 IUSE_CARDS="seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401 loopback
 portman2x4 pcsp ad1848-lib cs4231-lib adlib ad1816a ad1848 als100 azt2320 cmi8330
@@ -57,7 +54,6 @@ pkg_setup() {
        #
        ALSA_CARDS=${ALSA_CARDS:-${IUSE_ALSA_CARDS}}
 
-       # Which drivers need PNP
        local PNP_DRIVERS="interwave interwave-stb"
        local PNP_ERROR="Some of the drivers you selected require PnP support in your kernel (${PNP_DRIVERS}). Either enable PnP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
 
@@ -131,20 +127,9 @@ src_compile() {
 
        ARCH=$(tc-arch-kernel)
        ABI=${KERNEL_ABI}
-       emake LDFLAGS="$(raw-ldflags)" HOSTCC=$(tc-getBUILD_CC) CC=$(tc-getCC) || die "Make Failed"
+       emake LDFLAGS="$(raw-ldflags)" HOSTCC="$(tc-getBUILD_CC)" CC="$(tc-getCC)" || die "Make Failed"
        ARCH=$(tc-arch)
        ABI=${myABI}
-
-       if use doc;
-       then
-               ebegin "Building Documentation"
-               cd ${S}/scripts
-               emake || die Failed making docs in ${S}/scripts
-
-               cd ${S}/doc/DocBook
-               emake || die Failed making docs in ${S}/doc/DocBook
-               eend $?
-       fi
 }
 
 
@@ -153,19 +138,6 @@ src_install() {
 
        dodoc CARDS-STATUS FAQ README WARNING TODO
 
-       if use doc; then
-               docinto doc
-               dodoc doc/*
-               rm ${D}/usr/share/doc/${PF}/doc/Makefile.gz
-
-               docinto DocBook
-               dodoc doc/DocBook/*
-               rm ${D}/usr/share/doc/${PF}/DocBook/Makefile.gz
-
-               docinto Documentation
-               dodoc sound/Documentation/*
-       fi
-
        if kernel_is 2 6; then
                # mv the drivers somewhere they won't be killed by the kernel's make modules_install
                mv "${D}/lib/modules/${KV_FULL}/kernel/sound" "${D}/lib/modules/${KV_FULL}/${PN}"