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

(Portage version: 2.1.2.2)

6 files changed, 30 insertions, 13 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/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