Version bump thanks to drac in bug 154555

Package-Manager: portage-2.1.2_rc3-r4

diff --git a/media-video/qc-usb/ChangeLog b/media-video/qc-usb/ChangeLog
index c675a208b787b87aee844548477ecfbd1d2d860e..daefe28edec047c163b8f7e8f51aee04a8914e41 100644 (file)
--- 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/Manifest b/media-video/qc-usb/Manifest
index 83047ce0a829999a5172010bd2c1040547402cd1..cab82a2a998d75cbba5ad645760e643e9d29079f 100644 (file)
--- a/media-video/qc-usb/Manifest
+++ b/media-video/qc-usb/Manifest
@@ -6,6 +6,10 @@ AUX qc-usb-0.6.4-koutput.patch 2883 RMD160 b22c184217dbf9c08b0c767cfe9a7524cc883
 MD5 3fd9a05c470b43285820ade497f62c44 files/qc-usb-0.6.4-koutput.patch 2883
 RMD160 b22c184217dbf9c08b0c767cfe9a7524cc8837cb files/qc-usb-0.6.4-koutput.patch 2883
 SHA256 bfc00a767fc92331c8355b33a89a45451103fe335fc71e3292c068b07d93291b files/qc-usb-0.6.4-koutput.patch 2883
+AUX qc-usb-0.6.6-koutput.patch 3177 RMD160 b1535321f207d5943f5cf1f5aef0024d6f3aa5a0 SHA1 bb2a9e4bb8a41ce4f0588aea173445c3982bea0f SHA256 520a01b91f537e01543e086dd5cef7f97b6cde4766c829b1ae804ea6c6cc415f
+MD5 ce2b86134a3ce427fb087c72dc2b7a8f files/qc-usb-0.6.6-koutput.patch 3177
+RMD160 b1535321f207d5943f5cf1f5aef0024d6f3aa5a0 files/qc-usb-0.6.6-koutput.patch 3177
+SHA256 520a01b91f537e01543e086dd5cef7f97b6cde4766c829b1ae804ea6c6cc415f files/qc-usb-0.6.6-koutput.patch 3177
 AUX qc-usb-gcc4.patch 4130 RMD160 e7d9d2831729c7f2ceac760ccf09601b182d5597 SHA1 7e702511588afe2f8636f6dcb7df60140c3e7b8b SHA256 99f17dcc452c805489b82df49779491708b6df3eb3988b43af6822f1f1d404d3
 MD5 d5dd1aeff751da16df31f84ced71d090 files/qc-usb-gcc4.patch 4130
 RMD160 e7d9d2831729c7f2ceac760ccf09601b182d5597 files/qc-usb-gcc4.patch 4130
@@ -20,6 +24,7 @@ RMD160 790c9741ba2354f9cede4e35d7b165776dab76dd files/qc-usb-linux-2.6.18-2.patc
 SHA256 f267fcd99d045138418f9d08d2b9ee1f90221cdd745065a035f8669d4633a986 files/qc-usb-linux-2.6.18-2.patch 348
 DIST qc-usb-0.6.3.tar.gz 148994 RMD160 248768b551dc810dea524567e73b591353c0f8ed SHA1 5583ab73c4cc8546fde78e5a29fe1b6482075a74 SHA256 fee6264949107e5d879525487c1c3b27ea208ea854792d8c87142143cb2f2aa5
 DIST qc-usb-0.6.4.tar.gz 144247 RMD160 8717f7664d760dd503b097dd8fb68a873112ccd9 SHA1 5ef041ea1d77c3659c667ac58229ab8d03f34be8 SHA256 366b454ffd99dc5afcb47443657801e38bcd0fbffe0bee6ad1663957d5b9cd8c
+DIST qc-usb-0.6.6.tar.gz 147072 RMD160 08dade63cac3b9c668769fb1446a43f55f6a7969 SHA1 947a9f1233586af71d82e413f455ef01ee388b43 SHA256 3c2485f21fc3ae2232a234c989a8256e802e589968f90d1357eba05fa5fc62a8
 EBUILD qc-usb-0.6.3.ebuild 1113 RMD160 0f6c972f748e77fd48b98d4e5acf834ebfc88c9d SHA1 83c4c398aaa52428921978fad35fd63ebabcc610 SHA256 158ae339256f60d668aef5c5874ea41cc2057795a35c8d5b89323d99610e8296
 MD5 2cd8b5f5ade79fa87cf82dcf888b392b qc-usb-0.6.3.ebuild 1113
 RMD160 0f6c972f748e77fd48b98d4e5acf834ebfc88c9d qc-usb-0.6.3.ebuild 1113
@@ -28,10 +33,14 @@ EBUILD qc-usb-0.6.4.ebuild 1056 RMD160 d68e83510ad4eb33f12fab5717fc3e1a294c3bcc
 MD5 927edce4f5e3d11098ddb087a9eccd4b qc-usb-0.6.4.ebuild 1056
 RMD160 d68e83510ad4eb33f12fab5717fc3e1a294c3bcc qc-usb-0.6.4.ebuild 1056
 SHA256 7c54e9024ff14fb2de21af0f3a98644b85fe7386c17165f732ddf4f139edba58 qc-usb-0.6.4.ebuild 1056
-MISC ChangeLog 2973 RMD160 e65cee77382315fdbe0cb41e60eefeb4adde9b05 SHA1 7dfa53171a485c1f7d9f6f3db9b5ed53dcad2ff2 SHA256 703dea9c7cb5273a18287187b1b9790d681875320b70dbea63b8138416aaed8f
-MD5 bd91dfed795b699f284c598f5466a324 ChangeLog 2973
-RMD160 e65cee77382315fdbe0cb41e60eefeb4adde9b05 ChangeLog 2973
-SHA256 703dea9c7cb5273a18287187b1b9790d681875320b70dbea63b8138416aaed8f ChangeLog 2973
+EBUILD qc-usb-0.6.6.ebuild 1013 RMD160 921431bede6b28d654582c630692e1b697b4700d SHA1 f5e30a84d1a450147ff058b7430ca0d71490bc91 SHA256 c2a317d29149f9e8323ef9fdbbf8e7c6d9c0bff935eb0f4b00b12b0df7473e64
+MD5 31f1161798067599ef90d292d7019f86 qc-usb-0.6.6.ebuild 1013
+RMD160 921431bede6b28d654582c630692e1b697b4700d qc-usb-0.6.6.ebuild 1013
+SHA256 c2a317d29149f9e8323ef9fdbbf8e7c6d9c0bff935eb0f4b00b12b0df7473e64 qc-usb-0.6.6.ebuild 1013
+MISC ChangeLog 3163 RMD160 b5497b5f6da0c64c5e031b6bc6f727f91a73dbda SHA1 df4b2b32fe488bf4b32c85c6549ab54f2d27562f SHA256 181b41268eb77bc8cbb7a2239900098c743fdcb6793f80eec0646444a22ab070
+MD5 2b95bc47c676ec7e69b448e643bbce94 ChangeLog 3163
+RMD160 b5497b5f6da0c64c5e031b6bc6f727f91a73dbda ChangeLog 3163
+SHA256 181b41268eb77bc8cbb7a2239900098c743fdcb6793f80eec0646444a22ab070 ChangeLog 3163
 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219
@@ -42,3 +51,6 @@ SHA256 32aa60f0c06c1ca50c8d9c06383cb90cb274a2d1338153e8adf8e9ed03a111e0 files/di
 MD5 1c3df1e286f83e9511fb1c816e040190 files/digest-qc-usb-0.6.4 238
 RMD160 4a5fc67a679fe67866e97ae88a6eee6f2e9e54eb files/digest-qc-usb-0.6.4 238
 SHA256 24794cfc143f1848862c216c4e6dea7c6c57fce3fe01e8762f8309db6442ff04 files/digest-qc-usb-0.6.4 238
+MD5 33d113bb181cdf3acef423c76c543d6d files/digest-qc-usb-0.6.6 238
+RMD160 1af5039a2058db7557ecc39e14b103e3977d5b0b files/digest-qc-usb-0.6.6 238
+SHA256 722350a1c42471e267721d90c4e534321df84ab1dac26ea2779526cf07112fbb files/digest-qc-usb-0.6.6 238

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 (file)
index 0000000..1a76cfb
--- /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 (file)
index 0000000..1b13514
--- /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 (file)
index 0000000..0a0e508
--- /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
+}