Added patch for newer kernels and updated ebuild to accommodate kernel

staging driver (if enabled).
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 101 insertions, 19 deletions

diff --git a/media-sound/line6usb/ChangeLog b/media-sound/line6usb/ChangeLog
index 328e2327007f..38fbfc6ccfcb 100644
--- a/media-sound/line6usb/ChangeLog
+++ b/media-sound/line6usb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/line6usb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/line6usb/ChangeLog,v 1.5 2009/09/06 21:15:09 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/line6usb/ChangeLog,v 1.6 2010/01/24 01:31:49 nerdboy Exp $
+
+*line6usb-0.8.1-r1 (24 Jan 2010)
+
+  24 Jan 2010; Steve Arnold <nerdboy@gentoo.org> -line6usb-0.8.1.ebuild,
+  +line6usb-0.8.1-r1.ebuild, +files/line6usb-0.8.1-kernel-2.6.31-fix.patch:
+  Added patch for newer kernels and updated ebuild to accommodate kernel 
+  staging driver (however, the in-kernel driver is version 0.8.0).
 
   06 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> line6usb-0.7.3.ebuild,
   line6usb-0.8.1.ebuild:
diff --git a/media-sound/line6usb/Manifest b/media-sound/line6usb/Manifest
index 1d973b3d2522..2210e1f8a597 100644
--- a/media-sound/line6usb/Manifest
+++ b/media-sound/line6usb/Manifest
@@ -1,7 +1,8 @@
+AUX line6usb-0.8.1-kernel-2.6.31-fix.patch 739 RMD160 0b70e0098f23f26bdca9a80c8a2abf048100c3da SHA1 4e5e3e8bc961e8c02e6a4c6e0a5a2cbc2fb1046d SHA256 92f6d4b738b638ee14fead27ba8eff38369f86f1c6e7ff076cd1ac1c105fd1fd
 DIST driverdocs.pdf 139499 RMD160 71d6a5da001bc726df620b9085f1ef73276493fc SHA1 0119f5925139df29b0df639b0dbbab3f62af6596 SHA256 14cba5afb7bf39ba2dcbf76f095287d35f1542131631d5dc68f6a25648a36a9d
 DIST line6usb-0.7.3.tar.bz2 35600 RMD160 8bd73ec12fd045ec2b956293430edbc800640f54 SHA1 07d223884e69dce7ff0afd2ce640e8ec091ffe19 SHA256 70f66608bee71e6d9b15e9467961cdfa85bacc3616cec7f0b6758d4d1c90e8e4
 DIST line6usb-0.8.1.tar.bz2 38623 RMD160 1573c89a2c0579bf4de7add04c4b1c7146e71c0d SHA1 5fd8a0c12d576b60dbff6c0bda446e2604be5022 SHA256 e461035a4f48a09d8000bb9c719d559091cbb6d7db6f22bbb4cfbd8b67301459
 EBUILD line6usb-0.7.3.ebuild 2758 RMD160 f4eaa0c14f0b8b6810a2985ad5f0b146233b7a1a SHA1 561ed390129b42b3af9cf860c89581261905796a SHA256 f1e8dc77a90623a21cde3bea309aa6021e916f53d372a71354e6327d226b7548
-EBUILD line6usb-0.8.1.ebuild 2758 RMD160 0767edda7219a4984fe44d63a50bfc74e76c1de8 SHA1 df3b4ea2777913ac104586838f47f3542d3c6e24 SHA256 7fb6cccda6e8e017da835d7ce0d34188c4d2b1355eb927cf8b63e46f464dd21f
-MISC ChangeLog 1185 RMD160 90a6297ee044ac24ea39dee6782e6078b7fdb5bc SHA1 a8767d8849a27b3f3bbe0e881d4135a870b60015 SHA256 3a40abeae5963be8904fe7414bd7be2322f2b3b44bf8b73b354799375b518596
+EBUILD line6usb-0.8.1-r1.ebuild 4213 RMD160 d960e3f7296d0a2a3df37246f4ff6dc94e86751e SHA1 e80b003a5a10ce228d76d862f06c58490fc2ca40 SHA256 4fc460b50bab6fae75d683593bb9c955db5f6940924ba928a68cc65ceb74b53a
+MISC ChangeLog 1510 RMD160 ba360d2d8817ff7fbc01ca02446a8f987bbfe4a9 SHA1 f5a509c2a98969ddce775587cb6c29236db4fabd SHA256 ae60e55b7d716dd7f30a2b8c72e704bd28053ea44d16dc84d4244a091f22644b
 MISC metadata.xml 476 RMD160 fc95f23530882331e9ba2b753415e295c8a17aae SHA1 7fc39d818154998be85419d26534f8ee675f11c5 SHA256 f15e9c7d7b0dfe88b2e19994a427784f00e4e3e759ce4718ab928f690afe474d
diff --git a/media-sound/line6usb/files/line6usb-0.8.1-kernel-2.6.31-fix.patch b/media-sound/line6usb/files/line6usb-0.8.1-kernel-2.6.31-fix.patch
new file mode 100644
index 000000000000..e60b1991be7f
--- /dev/null
+++ b/media-sound/line6usb/files/line6usb-0.8.1-kernel-2.6.31-fix.patch
@@ -0,0 +1,35 @@
+*** audio.c	2009-04-04 11:53:29.000000000 -0700
+--- ../line6usb/audio.c	2009-12-31 12:42:49.827996851 -0800
+***************
+*** 12,17 ****
+--- 12,19 ----
+  #include "driver.h"
+  #include "audio.h"
+  
++ #include <linux/version.h>
++ 
+  #include <sound/core.h>
+  #include <sound/initval.h>
+  
+***************
+*** 28,37 ****
+--- 30,48 ----
+  	static int dev;
+  	struct snd_card *card;
+  
++ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+  	card = snd_card_new(line6_index[dev], line6_id[dev], THIS_MODULE, 0);
+  
+  	if (card == NULL)
+  		return -ENOMEM;
++ #else
++ 	int err;
++ 
++ 	err = snd_card_create(line6_index[dev], line6_id[dev], THIS_MODULE, 0,
++ 			      &card);
++ 	if (err < 0)
++ 		return err;
++ #endif
+  
+  	line6->card = card;
+  
diff --git a/media-sound/line6usb/line6usb-0.8.1.ebuild b/media-sound/line6usb/line6usb-0.8.1-r1.ebuild
index 12761111e997..93420ad1e361 100644
--- a/media-sound/line6usb/line6usb-0.8.1.ebuild
+++ b/media-sound/line6usb/line6usb-0.8.1-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/line6usb/line6usb-0.8.1.ebuild,v 1.3 2009/09/06 21:15:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/line6usb/line6usb-0.8.1-r1.ebuild,v 1.1 2010/01/24 01:31:49 nerdboy Exp $
+
+EAPI="2"
 
 inherit linux-mod eutils multilib
 
@@ -23,27 +25,54 @@ ERROR_PODXTPRO="${P} requires the podxtpro driver to be removed first."
 RDEPEND="virtual/modutils
 	dev-lang/perl"
 DEPEND="${RDEPEND}
-	virtual/alsa
-	>=virtual/linux-sources-2.6.25
+	>=media-sound/alsa-headers-1.0.10
+	>=media-libs/alsa-lib-1.0.10
 	sys-apps/debianutils"
 
+pod_kern_warn() {
+	eerror "Kernel config not found..."
+	eerror
+	eerror "You should decide if you want to use the package kernel"
+	eerror "driver or the in-kernel staging driver.  Please configure"
+	eerror "and build a kernel, either with or without the in-kernel"
+	eerror "Line6 POD driver (under staging drivers).  The current"
+	eerror "ebuild driver is one minor version ahead of the in-kernel"
+	eerror "driver."
+	eerror
+}
+
 pkg_setup() {
+	if kernel_is lt 2 6 25; then
+		eerror "POD support requres a host kernel of 2.6.25 or higher."
+		eerror "Please upgrade your kernel..."
+		die "kernel version not compatible"
+	elif ! linux_config_exists; then
+		eerror "Unable to check your kernel for POD driver"
+		pod_kern_warn
+	elif linux_chkconfig_present LINE6_USB; then
+		ewarn "You already have the Line6 staging driver installed."
+		ewarn "Ebuild kernel driver will not be installed..."
+	else
+		elog "Staging driver not found; ebuild kernel driver will be installed..."
+		INSTALL_LINE6_MOD="yes"
+	fi
+
 	ABI="${KERNEL_ABI}"
 	linux-mod_pkg_setup
 	BUILD_PARAMS="LINUX_DIR=${KV_DIR} OUTPUT_DIR=${KV_OUT_DIR}"
 	check_upgrade
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-kernel-2.6.31-fix.patch
+
 	convert_to_m Makefile
 
 	sed -i \
-	    -e "s:/lib/modules/\$(shell uname -r)/build:${KERNEL_DIR}:g" \
-	    -e "s:\$(shell uname -r):${KV_FULL}:g" \
-	    -e "s:\$(shell pwd):${S}:g" \
-	    Makefile || die "sed failed!"
+		-e "s:/lib/modules/\$(shell uname -r)/build:${KERNEL_DIR}:g" \
+		-e "s:\$(shell uname -r):${KV_FULL}:g" \
+		-e "s:\$(shell pwd):${S}:g" \
+		Makefile || die "sed failed!"
 }
 
 src_compile() {
@@ -54,8 +83,15 @@ src_compile() {
 }
 
 src_install() {
-	DESTDIR="${D}" make install-only || die "make install failed"
+	dodir /usr/share/doc/${P} /usr/share/${P}/examples
+
+	if [[ -n ${INSTALL_LINE6_MOD} ]] ; then
+		DESTDIR="${D}" make install-only || die "make install failed"
+	else
+		dobin *.sh *.pl
+	fi
 
+	mv "${D}"usr/bin/{aplay.sh,arecord.sh} "${D}"usr/share/${P}/examples/
 	# remove some cruft
 	rm "${D}"usr/bin/remove_old_podxtpro_driver.sh
 
@@ -70,8 +106,11 @@ pkg_postinst() {
 	linux-mod_pkg_postinst
 
 	elog
-	elog "This is an experimental driver.  Not responsible for runaway dogs,"
-	elog "hair-loss, or sterility.  You have been warned..."
+	elog "This is not such an experimental driver anymore, and should not"
+	elog "cause hair-loss or sterility.  There is a slightly older version"
+	elog "now in the kernel source tree under staging drivers.  Feel free"
+	elog "to enable it, and this package will only install the utilities"
+	elog "if you do.  See the docs and examples for more information."
 	elog
 }
 
@@ -90,7 +129,7 @@ check_upgrade() {
 	elif [[ -e \
 	    "/lib/modules/${KV_FULL}/kernel/sound/usb/${new}" ]]; then
 		ewarn
-		ewarn "Collisions are expected here, if you removed the ebuild"
+		ewarn "Depending on the portage version, collisions can be expected"
 		ewarn "(because kernel modules are protected by default).  Use"
 		ewarn "FEATURES=-collision-protect emerge ... for this package,"
 		ewarn "or remove the old kernel module (${new}) manually first"