old version wipe. added curl-7.16 compitable version and limited the previous version. bug #157711

Package-Manager: portage-2.1.2.2

7 files changed, 49 insertions, 39 deletions

diff --git a/media-video/came/ChangeLog b/media-video/came/ChangeLog
index 1ca90d41d868..f5c583d60fb2 100644
--- a/media-video/came/ChangeLog
+++ b/media-video/came/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/came
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/came/ChangeLog,v 1.10 2007/02/03 20:57:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/came/ChangeLog,v 1.11 2007/04/17 12:43:43 dragonheart Exp $
+
+*came-1.9-r1 (17 Apr 2007)
+
+  17 Apr 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/came-1.9-curl-friendly.patch, -came-1.7.ebuild, came-1.9.ebuild,
+  +came-1.9-r1.ebuild:
+  old version wipe. added curl-7.16 compitable version and limited the
+  previous version. bug #157711
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-video/came/Manifest b/media-video/came/Manifest
index 700ce7ad7466..291c921f5959 100644
--- a/media-video/came/Manifest
+++ b/media-video/came/Manifest
@@ -1,38 +1,31 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.7-true-false.patch 391 RMD160 803a8c7800d215d80c1c04500f83f299c6352773 SHA1 efa9e71d9da50bcd927e76495e5bd652ffcd054b SHA256 93e53111c967a94844dd6df653bdddcbc915cbdffd9bf1476b3f3c2434e5ef49
 MD5 789d8429d5cdaa27f79660c1511ed047 files/1.7-true-false.patch 391
 RMD160 803a8c7800d215d80c1c04500f83f299c6352773 files/1.7-true-false.patch 391
 SHA256 93e53111c967a94844dd6df653bdddcbc915cbdffd9bf1476b3f3c2434e5ef49 files/1.7-true-false.patch 391
-DIST camE-1.7.tar.gz 38430 RMD160 34b37fd52608f3d30e26b27db002ca5b4ac993c3 SHA1 cd7c8e1d28677894063aba173758038795bc7117 SHA256 e29b73e0bf763dead4a6ed80e648aaaea683f1a5865e5c21fed31fb9428e9430
+AUX came-1.9-curl-friendly.patch 373 RMD160 7a2349cf832a9544a88d63470e7aa175a6be93ab SHA1 9b9615d07081331ba51ca8d460b82fa6f6e3a3e3 SHA256 0ddedb2cc6c1828813c7a3e4df050f24e1ad0d82b4e17f63e73131e17ace40e4
+MD5 e0f1375b7a554e11c1d161d5112dd53d files/came-1.9-curl-friendly.patch 373
+RMD160 7a2349cf832a9544a88d63470e7aa175a6be93ab files/came-1.9-curl-friendly.patch 373
+SHA256 0ddedb2cc6c1828813c7a3e4df050f24e1ad0d82b4e17f63e73131e17ace40e4 files/came-1.9-curl-friendly.patch 373
 DIST camE-1.9.tar.gz 39315 RMD160 75b7f0b6b63f7deb273d47c8226896264e6f323b SHA1 1718ff0662a3183fd8386711bb4b9195abbd170f SHA256 636b5d573ff9bb05be5a631ecf107152949b55eca3942f4a584a8b0325258db5
-EBUILD came-1.7.ebuild 846 RMD160 180a453d9a8cf196e009abbfe4b894a9898e4068 SHA1 347a0321f8a9e936b3b0118cb3396bc8d9e6f702 SHA256 f62c87bd6f897ef6a418d32d8951231cf3542ccbf9fc22d2de359443b9093fd0
-MD5 b1a58a9eebfee381f6414ee4125be12b came-1.7.ebuild 846
-RMD160 180a453d9a8cf196e009abbfe4b894a9898e4068 came-1.7.ebuild 846
-SHA256 f62c87bd6f897ef6a418d32d8951231cf3542ccbf9fc22d2de359443b9093fd0 came-1.7.ebuild 846
-EBUILD came-1.9.ebuild 730 RMD160 883d3868d17a4b1329cfe78ac49df6e7c3f7cd85 SHA1 41d133c9a6b71b838b271e9e5385151d03ee883c SHA256 6e5f56f6c6134c311f12746296e506601093620a8648ae0c6e1d2e1448878452
-MD5 cfb43c02f4ed5d9b15f60f7aff7e1ace came-1.9.ebuild 730
-RMD160 883d3868d17a4b1329cfe78ac49df6e7c3f7cd85 came-1.9.ebuild 730
-SHA256 6e5f56f6c6134c311f12746296e506601093620a8648ae0c6e1d2e1448878452 came-1.9.ebuild 730
-MISC ChangeLog 1436 RMD160 333936fc47f9d84aaec96afa98b8d654ccaff1e2 SHA1 1fd9494fd03c442dcc39012928d4adeab36ee8d5 SHA256 13c5e2903b70d02b06029e78e29f21401b76a9f0302d4a44b096107c23b4a478
-MD5 5105b3c0aa6e88d943b36d9a7849a657 ChangeLog 1436
-RMD160 333936fc47f9d84aaec96afa98b8d654ccaff1e2 ChangeLog 1436
-SHA256 13c5e2903b70d02b06029e78e29f21401b76a9f0302d4a44b096107c23b4a478 ChangeLog 1436
+EBUILD came-1.9-r1.ebuild 816 RMD160 1110b1581aac2f5950feb47e66ca3ca158f897e7 SHA1 0a9f3d22a1d8dd4bf2af966971f84bbbe0ccb0d7 SHA256 5b1e7e288bc94f3216d026f094c9570294766790e180f0efb9eed81d59cb5665
+MD5 1ea12dbd4d0c316e7401fc9dc55cfc90 came-1.9-r1.ebuild 816
+RMD160 1110b1581aac2f5950feb47e66ca3ca158f897e7 came-1.9-r1.ebuild 816
+SHA256 5b1e7e288bc94f3216d026f094c9570294766790e180f0efb9eed81d59cb5665 came-1.9-r1.ebuild 816
+EBUILD came-1.9.ebuild 735 RMD160 4e5b4bae953e0f38b0abba7db0000baa23233f38 SHA1 aabec765f708f14ef433d20e9b119fae933dc919 SHA256 be1bfbb17c5ba17a555c552132063f15a8d4e5202cc46126b9de72127805443c
+MD5 9b03256974a2c37f80a3ee749c61c21f came-1.9.ebuild 735
+RMD160 4e5b4bae953e0f38b0abba7db0000baa23233f38 came-1.9.ebuild 735
+SHA256 be1bfbb17c5ba17a555c552132063f15a8d4e5202cc46126b9de72127805443c came-1.9.ebuild 735
+MISC ChangeLog 1720 RMD160 e3553e6a4cc61e835c456af18eebd7568ddc841b SHA1 1c9cc2bb8dfba348ff9de24aa338eda9b01153eb SHA256 8d9df35add8058bc00de4ae8f1061a1a894172c4117ea3185ff98a628e286131
+MD5 12fd9424e25458dfb5aa47821fb0c4f7 ChangeLog 1720
+RMD160 e3553e6a4cc61e835c456af18eebd7568ddc841b ChangeLog 1720
+SHA256 8d9df35add8058bc00de4ae8f1061a1a894172c4117ea3185ff98a628e286131 ChangeLog 1720
 MISC metadata.xml 219 RMD160 d496f2f1e74ede2ab7e16596690925b15a46555b SHA1 9ba2776dc0c1785f9340c7e652d3047093281e19 SHA256 00b81f015201b369357d57502738b08ac96398175d18d6d28a3773128b931a84
 MD5 3ab58c86719dde2a493f617bed8aa556 metadata.xml 219
 RMD160 d496f2f1e74ede2ab7e16596690925b15a46555b metadata.xml 219
 SHA256 00b81f015201b369357d57502738b08ac96398175d18d6d28a3773128b931a84 metadata.xml 219
-MD5 1d8d73dfd29988042b6177f5d1701799 files/digest-came-1.7 223
-RMD160 c0b920bc8b4a7aeeab550df58af1ed88dcc8dab8 files/digest-came-1.7 223
-SHA256 435cfa8346385e0c8a16a5aa83ce8d3b47b61542fbca11299c13326bf08b4b7c files/digest-came-1.7 223
 MD5 99e99a206bab33188d5e578964c44396 files/digest-came-1.9 223
 RMD160 55ff36bc49afe6339bea03e81bef6e2942fa07db files/digest-came-1.9 223
 SHA256 d1da9cd7ee5719216497beea7dc6431215c2b04e6740a58128cd04d5520039b9 files/digest-came-1.9 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxPc1AiZjviIA2XgRAptBAKDT80crWngmf1vPtUtpJNzx5OLo9QCgsap3
-G7efzx1hJpv3yq1h0/UXp4k=
-=nHEC
------END PGP SIGNATURE-----
+MD5 99e99a206bab33188d5e578964c44396 files/digest-came-1.9-r1 223
+RMD160 55ff36bc49afe6339bea03e81bef6e2942fa07db files/digest-came-1.9-r1 223
+SHA256 d1da9cd7ee5719216497beea7dc6431215c2b04e6740a58128cd04d5520039b9 files/digest-came-1.9-r1 223
diff --git a/media-video/came/came-1.7.ebuild b/media-video/came/came-1.9-r1.ebuild
index 0586f402d922..5b28c6cca179 100644
--- a/media-video/came/came-1.7.ebuild
+++ b/media-video/came/came-1.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/came/came-1.7.ebuild,v 1.5 2005/05/10 13:06:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/came/came-1.9-r1.ebuild,v 1.1 2007/04/17 12:43:43 dragonheart Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://linuxbrit.co.uk/downloads/camE-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=net-misc/curl-7.9.1
@@ -20,9 +20,7 @@ S=${WORKDIR}/camE-${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -i -e "s:/usr/local:/usr:" Makefile
-	epatch ${FILESDIR}/${PV}-true-false.patch
+	epatch "${FILESDIR}"/${P}-curl-friendly.patch
 }
 
 src_compile() {
diff --git a/media-video/came/came-1.9.ebuild b/media-video/came/came-1.9.ebuild
index 476b6f8cff6b..1ca98a41e6dd 100644
--- a/media-video/came/came-1.9.ebuild
+++ b/media-video/came/came-1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/came/came-1.9.ebuild,v 1.1 2005/07/17 11:07:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/came/came-1.9.ebuild,v 1.2 2007/04/17 12:43:43 dragonheart Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=net-misc/curl-7.9.1
+DEPEND="<net-misc/curl-7.16.0
 	>=media-libs/giblib-1.2.3"
 
 S=${WORKDIR}/camE-${PV}
diff --git a/media-video/came/files/came-1.9-curl-friendly.patch b/media-video/came/files/came-1.9-curl-friendly.patch
new file mode 100644
index 000000000000..028c56e22c1c
--- /dev/null
+++ b/media-video/came/files/came-1.9-curl-friendly.patch
@@ -0,0 +1,11 @@
+--- camE-1.9/webcam.c.orig	2007-04-17 22:33:33.000000000 +1000
++++ camE-1.9/webcam.c	2007-04-17 22:36:34.000000000 +1000
+@@ -987,8 +987,6 @@
+     /* shut up completely */
+     if (ftp_debug)
+       curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1);
+-    else
+-      curl_easy_setopt(curl_handle, CURLOPT_MUTE, 1);
+ 
+     curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1);
+ 
diff --git a/media-video/came/files/digest-came-1.7 b/media-video/came/files/digest-came-1.7
deleted file mode 100644
index fc35fee3b71e..000000000000
--- a/media-video/came/files/digest-came-1.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 afdab327ca50ee15197d2d9e19491df7 camE-1.7.tar.gz 38430
-RMD160 34b37fd52608f3d30e26b27db002ca5b4ac993c3 camE-1.7.tar.gz 38430
-SHA256 e29b73e0bf763dead4a6ed80e648aaaea683f1a5865e5c21fed31fb9428e9430 camE-1.7.tar.gz 38430
diff --git a/media-video/came/files/digest-came-1.9-r1 b/media-video/came/files/digest-came-1.9-r1
new file mode 100644
index 000000000000..7dff88935365
--- /dev/null
+++ b/media-video/came/files/digest-came-1.9-r1
@@ -0,0 +1,3 @@
+MD5 8bdc049b01cd32088eef8cccf3c096ab camE-1.9.tar.gz 39315
+RMD160 75b7f0b6b63f7deb273d47c8226896264e6f323b camE-1.9.tar.gz 39315
+SHA256 636b5d573ff9bb05be5a631ecf107152949b55eca3942f4a584a8b0325258db5 camE-1.9.tar.gz 39315