Linux-3.0 changes.

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

4 files changed, 14 insertions, 20 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 873a54087f49..227076d2f61c 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.312 2011/04/24 18:16:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.313 2011/06/06 06:24:21 robbat2 Exp $
+
+  06 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> alsa-driver-1.0.23.ebuild,
+  alsa-driver-9999.ebuild:
+  Linux-3.0 changes.
 
   24 Apr 2011; Ulrich Mueller <ulm@gentoo.org> alsa-driver-1.0.23.ebuild,
   alsa-driver-9999.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index dd0bb6ad9d2b..aad2453b7a57 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST alsa-driver-1.0.23.tar.bz2 3337645 RMD160 bdefa689616bd6b21e75837f4ee4afc4d7bd4583 SHA1 b7d376cd3e664ba13b6dfb8278546f1b61189a14 SHA256 0641da5be2de9ca2fa1b234d479063280238290e253a94492c87c573bf445f22
-EBUILD alsa-driver-1.0.23.ebuild 7260 RMD160 7d2274b0d88d87a4389744bbf3d5e9583309ea0e SHA1 711600ec5e46f63b9374e423ed4b29b64b4ec80f SHA256 05d64a4f26701c20676535441cf1f380df86c1ff680b955194ba51e73735187d
-EBUILD alsa-driver-9999.ebuild 7011 RMD160 fca42abc5f48a85290f5a6f70fafd94071e9b2e9 SHA1 b480068fe6a9eb9b07651858be7c3ef7e85ec791 SHA256 3372f75f07d63f06a736bbac85682d3bf106e44d2ddf50b10d7c8f0ade507c33
-MISC ChangeLog 53394 RMD160 82d925af2e64c95057d7f690c2ed96abb51d0afe SHA1 a2c59cb54d30a4b4034272824b1388c21c8a078c SHA256 9b4436acf3d9976c3bd639c7427f367b09fc0951086f3a8649434628a5188f7a
+EBUILD alsa-driver-1.0.23.ebuild 7272 RMD160 e12a91454c755bd7e82c1518dd35a1b751124808 SHA1 581c417d59bc7a39252670a74f3e4044ba069e57 SHA256 5b1cf90e13373b4e5e79cfe5efc671154c7750950e21b60a8bbfee0c97ec3f59
+EBUILD alsa-driver-9999.ebuild 7023 RMD160 8877868ef1db8f3743dc670f1cb792b6217e7025 SHA1 ea5077d8c236d7a2a18e33bb8f0147e28e30ad17 SHA256 b0d056bdf76f3652833ecc2c6c7d34ad813b7ca42446a73d5c38e6734208ea56
+MISC ChangeLog 53527 RMD160 42f2069b5d2464243f5ceb48b8c5fdc6526a0df9 SHA1 875e457f1deaf8c95f9bc086bda0f366512901b0 SHA256 4630c5d669d38020f388e435f6cb89dc9b278cfab78da8f804fab8eb435b7a7e
 MISC metadata.xml 377 RMD160 5020bd9c203ee305efd0c333608ec543b27a0939 SHA1 89daecd55cb501b77472689f5e5ec94bbc72a8cb SHA256 5c9628f1ebb8a2592d918fc93b0e4f9705881dc875375efd54e5df1e4dc50302
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk20aWEACgkQOeoy/oIi7uzY3ACg3vWYezx2PFpKN1QmNHHcUvKZ
-i/0AmwVf1dR951iJoP46VESXPvGyAQZg
-=/zae
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.23.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.23.ebuild
index 9a83c17f731d..14d2bbf94d3d 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.23.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.23.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/media-sound/alsa-driver/alsa-driver-1.0.23.ebuild,v 1.5 2011/04/24 18:16:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.23.ebuild,v 1.6 2011/06/06 06:24:21 robbat2 Exp $
 
 inherit autotools linux-mod flag-o-matic eutils multilib
 
@@ -155,7 +155,7 @@ src_install() {
 
 	dodoc CARDS-STATUS FAQ README WARNING TODO SUPPORTED_KERNELS
 
-	if kernel_is 2 6; then
+	if kernel_is -ge 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}"
 		rmdir "${D}/lib/modules/${KV_FULL}/kernel" &> /dev/null
@@ -174,7 +174,7 @@ pkg_postinst() {
 
 	linux-mod_pkg_postinst
 
-	if kernel_is 2 6 && [ -e "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" ]; then
+	if kernel_is -ge 2 6 && [ -e "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" ]; then
 		# Cleanup if they had older alsa installed
 		for file in $(find "${ROOT}/lib/modules/${KV_FULL}/${PN}" -type f); do
 			rm -f ${file//${KV_FULL}\/${PN}/${KV_FULL}\/kernel\/sound}
diff --git a/media-sound/alsa-driver/alsa-driver-9999.ebuild b/media-sound/alsa-driver/alsa-driver-9999.ebuild
index 00236c2f43ec..e937f365a118 100644
--- a/media-sound/alsa-driver/alsa-driver-9999.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-9999.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/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.19 2011/04/24 18:16:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.20 2011/06/06 06:24:21 robbat2 Exp $
 
 inherit linux-mod flag-o-matic eutils multilib autotools git
 
@@ -144,7 +144,7 @@ src_install() {
 
 	dodoc CARDS-STATUS FAQ README WARNING TODO
 
-	if kernel_is 2 6; then
+	if kernel_is -ge 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}"
 		rmdir "${D}/lib/modules/${KV_FULL}/kernel" &> /dev/null
@@ -166,7 +166,7 @@ pkg_postinst() {
 	elog "Check out the ALSA installation guide availible at the following URL:"
 	elog "http://www.gentoo.org/doc/en/alsa-guide.xml"
 
-	if kernel_is 2 6 && [ -e "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" ]; then
+	if kernel_is -ge 2 6 && [ -e "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" ]; then
 		# Cleanup if they had older alsa installed
 		for file in $(find "${ROOT}/lib/modules/${KV_FULL}/${PN}" -type f); do
 			rm -f ${file//${KV_FULL}\/${PN}/${KV_FULL}\/kernel\/sound}