Remove asihpi driver when building for 2.6.17 as it's not fixed to work on that and...

Package-Manager: portage-2.1.1_pre1-r1

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index d1d510290f40bd2198379c16c583bd894dbc7713..471ea159d7f3b065581172f044e356bfe533b183 100644 (file)
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.217 2006/06/19 13:41:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.218 2006/06/21 20:19:07 flameeyes Exp $
+
+  21 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-driver-1.0.11.ebuild:
+  Remove asihpi driver when building for 2.6.17 as it's not fixed to work on
+  that and upstream hasn't released a new version yet.
 
   19 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/alsa-driver-1.0.11-kernel-2.6.17.patch, alsa-driver-1.0.11.ebuild:

diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index ed314979d148ebadd4ed9b241a625db7a06bfb81..04318bdd28c787a6078798cf3e0ef7f0b64e6de0 100644 (file)
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -27,14 +27,14 @@ EBUILD alsa-driver-1.0.10-r2.ebuild 4791 RMD160 4940a1d64edb487b93b0d29f48d937fa
 MD5 9916e84eeec916e6f6ec0f3aeffccb6a alsa-driver-1.0.10-r2.ebuild 4791
 RMD160 4940a1d64edb487b93b0d29f48d937fa2563c3cc alsa-driver-1.0.10-r2.ebuild 4791
 SHA256 bdaa51fefcad30e94b4a663fb64db3aa9eaa089c9162dec3b8236407bd49c2fc alsa-driver-1.0.10-r2.ebuild 4791
-EBUILD alsa-driver-1.0.11.ebuild 4884 RMD160 8adf73908233f8013fa49f2fa46834154bc926d3 SHA1 35d63fab01b46b1e5922bbd8196b4f53276e225f SHA256 d16fdbe9488fdb09a89b63af22cd51c19e03c701d2fcb628a1ced536811aba53
-MD5 62b628f8f3525e6bd5ec43cfb371c876 alsa-driver-1.0.11.ebuild 4884
-RMD160 8adf73908233f8013fa49f2fa46834154bc926d3 alsa-driver-1.0.11.ebuild 4884
-SHA256 d16fdbe9488fdb09a89b63af22cd51c19e03c701d2fcb628a1ced536811aba53 alsa-driver-1.0.11.ebuild 4884
-MISC ChangeLog 37230 RMD160 64d6598c664dfc83dc62c0b2be6d37dbe46778ac SHA1 95baa78c5ab8a18dc8d9dfae1c88e8fcb4484bc5 SHA256 155bb0d02ce3bf84d1ac691101412d07ff7a73c4741189cb9facd24b56d3cb98
-MD5 99b6789679f9c44333f623fa9f32676e ChangeLog 37230
-RMD160 64d6598c664dfc83dc62c0b2be6d37dbe46778ac ChangeLog 37230
-SHA256 155bb0d02ce3bf84d1ac691101412d07ff7a73c4741189cb9facd24b56d3cb98 ChangeLog 37230
+EBUILD alsa-driver-1.0.11.ebuild 5134 RMD160 5cf5632f21ec116d323e2fe19db71bd4ead1ffaf SHA1 17192392a1bb7401d06bbd63882517df02312b6f SHA256 abe0999a1b8ef9b759bc4dbfe24802ff3dc50c45b8d50d7ceb238479add71f73
+MD5 0ca9e75c9aa10f06cf578837ead7c3f7 alsa-driver-1.0.11.ebuild 5134
+RMD160 5cf5632f21ec116d323e2fe19db71bd4ead1ffaf alsa-driver-1.0.11.ebuild 5134
+SHA256 abe0999a1b8ef9b759bc4dbfe24802ff3dc50c45b8d50d7ceb238479add71f73 alsa-driver-1.0.11.ebuild 5134
+MISC ChangeLog 37445 RMD160 c83e390838d6fbafd3d7ec39c55cea8eb229d1ff SHA1 5fec9d2f1fa28dad31b0637f4cbf2d054fe7d81b SHA256 13b56db433836e2a6dcc55c35b08a6f88bf7b1d080804f1688cfe8ae55740bda
+MD5 ce984cd13b4f494f09504596766051f9 ChangeLog 37445
+RMD160 c83e390838d6fbafd3d7ec39c55cea8eb229d1ff ChangeLog 37445
+SHA256 13b56db433836e2a6dcc55c35b08a6f88bf7b1d080804f1688cfe8ae55740bda ChangeLog 37445
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -48,7 +48,7 @@ SHA256 685909b916bf91fe04291a0f9dcb11865ed4efb588efb3b876ec3e367fede2ad files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFElqmeAiZjviIA2XgRArg0AJ9cRQSzksj4V4mKI8JlhpaHzRhmRwCfeVKb
-r7JpibDC6ECNy6Gt2epAfLQ=
-=U/G5
+iD8DBQFEmanGAiZjviIA2XgRAinuAKDtNsJk4dTu+YqgJj0sobh5yZXHAQCcCd08
+jUA3sDsm3DUqxS0tGYhgP3c=
+=lZHE
 -----END PGP SIGNATURE-----

diff --git a/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild
index 979472a3953bb5322d97a9a5cdce36c95f26be11..dbf7ee2c0ef626f4360aa8891fbb14f41ce4b9ed 100644 (file)
--- a/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.11.ebuild,v 1.11 2006/06/19 13:41:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild,v 1.12 2006/06/21 20:19:07 flameeyes Exp $
 
 inherit linux-mod flag-o-matic eutils multilib
 
@@ -74,7 +74,13 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.patch
 
        if kernel_is ge 2 6 17 ; then
+               # These are needed for some drivers to build with kernel 2.6.17
+               # until a refreshed release of alsa-driver is done
                epatch "${FILESDIR}/${P}-kernel-2.6.17.patch"
+
+               # asihpi driver is broken, skip it until upstream releases something
+               # working.
+               sed -i -e 's:asihpi/::' "${S}/pci/Makefile"
        fi
 
        convert_to_m "${S}/Makefile"