Version bump thanks to drac in bug 154555

(Portage version: 2.1.2_rc3-r4)

4 files changed, 107 insertions, 1 deletions

diff --git a/media-video/qc-usb/ChangeLog b/media-video/qc-usb/ChangeLog
index c675a208b787..daefe28edec0 100644
--- a/media-video/qc-usb/ChangeLog
+++ b/media-video/qc-usb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/qc-usb
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.19 2006/11/09 15:00:59 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.20 2006/12/13 21:28:39 genstef Exp $
+
+*qc-usb-0.6.6 (13 Dec 2006)
+
+  13 Dec 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/qc-usb-0.6.6-koutput.patch, +qc-usb-0.6.6.ebuild:
+  Version bump thanks to drac in bug 154555
 
   09 Nov 2006; Daniel Drake <dsd@gentoo.org> qc-usb-0.6.3.ebuild:
   Backport 2.6.18 fix to stable tree
diff --git a/media-video/qc-usb/files/digest-qc-usb-0.6.6 b/media-video/qc-usb/files/digest-qc-usb-0.6.6
new file mode 100644
index 000000000000..1a76cfb03618
--- /dev/null
+++ b/media-video/qc-usb/files/digest-qc-usb-0.6.6
@@ -0,0 +1,3 @@
+MD5 9eab8fb3a75326d1565d59b0c7256075 qc-usb-0.6.6.tar.gz 147072
+RMD160 08dade63cac3b9c668769fb1446a43f55f6a7969 qc-usb-0.6.6.tar.gz 147072
+SHA256 3c2485f21fc3ae2232a234c989a8256e802e589968f90d1357eba05fa5fc62a8 qc-usb-0.6.6.tar.gz 147072
diff --git a/media-video/qc-usb/files/qc-usb-0.6.6-koutput.patch b/media-video/qc-usb/files/qc-usb-0.6.6-koutput.patch
new file mode 100644
index 000000000000..1b13514c61f7
--- /dev/null
+++ b/media-video/qc-usb/files/qc-usb-0.6.6-koutput.patch
@@ -0,0 +1,53 @@
+diff -ur qc-usb-0.6.6.orig/Makefile qc-usb-0.6.6/Makefile
+--- qc-usb-0.6.6.orig/Makefile	2006-10-24 05:06:19.000000000 +0300
++++ qc-usb-0.6.6/Makefile	2006-12-10 10:19:06.000000000 +0200
+@@ -44,11 +44,7 @@
+ #RELEASE := $(shell awk -F \" '/[ 	]*\#[ 	]*define[ 	]*UTS_RELEASE[ 	]*/ { print $$2 }' $(LINUX_DIR)/include/linux/version.h|tail -n 1)
+ # This seem to work better
+ #LINUX_DIR := /usr/src/linux
+-RELEASE := $(shell if test -r $(LINUX_DIR)/include/linux/version.h && fgrep -q UTS_RELEASE $(LINUX_DIR)/include/linux/version.h; then \
+-		((echo "\#include <linux/version.h>" ; echo "kernsrcver=UTS_RELEASE") | cpp -I $(LINUX_DIR)/include | grep "^kernsrcver=" | cut -d \" -f 2); \
+-	elif test -r $(LINUX_DIR)/include/linux/utsrelease.h && fgrep -q UTS_RELEASE $(LINUX_DIR)/include/linux/utsrelease.h; then \
+-		((echo "\#include <linux/utsrelease.h>"; echo "kernsrcver=UTS_RELEASE") | cpp -I $(LINUX_DIR)/include | grep "^kernsrcver=" | cut -d \" -f 2); \
+-	fi)
++RELEASE := $(shell awk -F \" '/[       ]*\#[   ]*define[       ]*UTS_RELEASE[  ]*/ { print $$2 }' $(OUTPUT_DIR)/include/linux/version.h|tail -n 1)
+ MODULE_DIR := /lib/modules/$(RELEASE)
+ endif
+ endif
+@@ -58,6 +54,10 @@
+ LINUX_DIR := $(MODULE_DIR)/build
+ endif
+ 
++ifndef OUTPUT_DIR
++OUTPUT_DIR := $(LINUX_DIR)
++endif
++
+ HAVE_UTSRELEASE_H := $(shell if test -r $(LINUX_DIR)/include/linux/version.h && fgrep -q UTS_RELEASE $(LINUX_DIR)/include/linux/version.h; then \
+ 		echo 0; \
+ 	elif test -r $(LINUX_DIR)/include/linux/utsrelease.h && fgrep -q UTS_RELEASE $(LINUX_DIR)/include/linux/utsrelease.h; then \
+@@ -75,7 +75,7 @@
+ DEPMOD  := $(shell which depmod || which /sbin/depmod || echo "true You should now run depmod")
+ 
+ # Get VERSION_CODE (from version.h in kernel source directory)
+-VERSION_CODE := $(shell awk '/[ 	]*\#[ 	]*define[ 	]*LINUX_VERSION_CODE[ 	]*/ { print $$3 }' $(LINUX_DIR)/include/linux/version.h|tail -n 1)
++VERSION_CODE := $(shell awk '/[ 	]*\#[ 	]*define[ 	]*LINUX_VERSION_CODE[ 	]*/ { print $$3 }' $(OUTPUT_DIR)/include/linux/version.h|tail -n 1)
+ 
+ ifeq ($(shell if [ $(VERSION_CODE) -ge 132608 ]; then echo y; fi),y)
+ MODULE_NAME := quickcam.ko	# for 2.6.x
+@@ -91,6 +91,7 @@
+ 	@echo "make all - Compile driver and utilities against current running kernel"
+ 	@echo "make all USER_OPT=-DDEBUG - Compile with debugging code and messages"
+ 	@echo "make all LINUX_DIR=/usr/src/linux - Compile against specified kernel source"
++	@echo "make all OUTPUT_DIR=/var/tmp/kernel-output/2.6.19 - Specify binary output dir"
+ 	@echo "make install - Copy driver and utilities into standard locations (needs root)"
+ 	@echo "make install PREFIX=/usr - Copy utilities to /usr/bin instead of /usr/local/bin"
+ 	@echo "make install MODULE_DIR=/lib/modules/2.4.0 - Copy module to /lib/modules/2.4.0/misc"
+@@ -130,7 +131,7 @@
+ else
+ # No, 2.4.x or older
+ 
+-MODULE_INC    := -I$(LINUX_DIR)/include -nostdinc -iwithprefix include
++MODULE_INC    := -I$(LINUX_DIR)/include -I$(OUTPUT_DIR)/include -nostdinc -iwithprefix include
+ MODULE_DEF    := -DMODULE -D__KERNEL__ -DNOKERNEL
+ MODULE_OPT    := -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common
+ MODULE_WARN   := -Wall -Wstrict-prototypes -Wno-trigraphs
diff --git a/media-video/qc-usb/qc-usb-0.6.6.ebuild b/media-video/qc-usb/qc-usb-0.6.6.ebuild
new file mode 100644
index 000000000000..0a0e5083b785
--- /dev/null
+++ b/media-video/qc-usb/qc-usb-0.6.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/qc-usb-0.6.6.ebuild,v 1.1 2006/12/13 21:28:39 genstef Exp $
+
+inherit linux-mod eutils multilib
+
+DESCRIPTION="Logitech USB Quickcam Express Linux Driver Modules"
+HOMEPAGE="http://qce-ga.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qce-ga/${P}.tar.gz"
+
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+CONFIG_CHECK="USB VIDEO_DEV"
+MODULE_NAMES="quickcam(usb:)"
+BUILD_TARGETS="all"
+
+RDEPEND="!media-video/qc-usb-messenger"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	ABI=${KERNEL_ABI}
+	linux-mod_pkg_setup
+	BUILD_PARAMS="LINUX_DIR=${KV_DIR} OUTPUT_DIR=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	convert_to_m ${S}/Makefile
+	epatch ${FILESDIR}/${P}-koutput.patch
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dobin qcset
+	dodoc README* APPLICATIONS CREDITS TODO FAQ
+
+	insinto /usr/share/doc/${PF}
+	doins quickcam.sh debug.sh freeshm.sh
+}