Add amd64 love and make sure LDFLAGS are respected.

Package-Manager: portage-2.1.3.6

3 files changed, 37 insertions, 19 deletions

diff --git a/media-video/w3cam/ChangeLog b/media-video/w3cam/ChangeLog
index cf6e2039b399..55b62ad6a08b 100644
--- a/media-video/w3cam/ChangeLog
+++ b/media-video/w3cam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/w3cam
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/w3cam/ChangeLog,v 1.10 2007/02/22 01:57:12 peper Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/w3cam/ChangeLog,v 1.11 2007/08/24 07:29:09 vapier Exp $
+
+  24 Aug 2007; Mike Frysinger <vapier@gentoo.org> w3cam-0.7.2.ebuild:
+  Add amd64 love and make sure LDFLAGS are respected.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-video/w3cam/Manifest b/media-video/w3cam/Manifest
index 9f5925b604d0..c6f4578dc195 100644
--- a/media-video/w3cam/Manifest
+++ b/media-video/w3cam/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST w3cam-0.7.2.tar.gz 144712 RMD160 c6829181d10d1d9cc8afdda7e084732b34c33d2e SHA1 dad43fdcc66799ec476c0495f61e3a751d36ecdd SHA256 96d659d916fafe555311068c9bf8662b93f10d099b12b17ed04d8a8fffbc72e0
-EBUILD w3cam-0.7.2.ebuild 1270 RMD160 fe25d747f33ee938d5a0f058d8af1b72cb7c994d SHA1 ab382afa65138eb0f23698758092520359f8db9c SHA256 9d72c54b5a1a47cd19a7e7bf34f2b3573433dcfd0d449c62ac5a093415b1e04d
-MD5 af08b707b8cf208068981b362740add3 w3cam-0.7.2.ebuild 1270
-RMD160 fe25d747f33ee938d5a0f058d8af1b72cb7c994d w3cam-0.7.2.ebuild 1270
-SHA256 9d72c54b5a1a47cd19a7e7bf34f2b3573433dcfd0d449c62ac5a093415b1e04d w3cam-0.7.2.ebuild 1270
-MISC ChangeLog 1648 RMD160 520ca30416e483b1b67a3cf0d41a8f25400ddaca SHA1 0b53effb359cc8178192a0deb7ff102bd6a21243 SHA256 4d765b0a7f1d6f932ab1cb1aacc2da27e385983c8d7f57584502914db43a96fe
-MD5 7ba734c016f432f958a5bc2a92c6207e ChangeLog 1648
-RMD160 520ca30416e483b1b67a3cf0d41a8f25400ddaca ChangeLog 1648
-SHA256 4d765b0a7f1d6f932ab1cb1aacc2da27e385983c8d7f57584502914db43a96fe ChangeLog 1648
+EBUILD w3cam-0.7.2.ebuild 1349 RMD160 1e2aa3e6f6c7160181d52f90c4a09ea401d9561f SHA1 e9c181f0a64294db78f35e963d8119e893a34c71 SHA256 736d7e711ae91769874aee10b8e5a316691123f9588649076ecaa93bc0e80a51
+MD5 107fdd1b0807d2ab206739b01558410b w3cam-0.7.2.ebuild 1349
+RMD160 1e2aa3e6f6c7160181d52f90c4a09ea401d9561f w3cam-0.7.2.ebuild 1349
+SHA256 736d7e711ae91769874aee10b8e5a316691123f9588649076ecaa93bc0e80a51 w3cam-0.7.2.ebuild 1349
+MISC ChangeLog 1774 RMD160 3446e72b303926dbec78995ebf7824a6e881430d SHA1 2125e90fbce56c5bf80c77042fbfd084159ad5e6 SHA256 8b70f11d09217bfc260e9fe6f827a16af92f4538b2298827b3797b3b43970980
+MD5 268f3291919d655104fa086143f4c6fe ChangeLog 1774
+RMD160 3446e72b303926dbec78995ebf7824a6e881430d ChangeLog 1774
+SHA256 8b70f11d09217bfc260e9fe6f827a16af92f4538b2298827b3797b3b43970980 ChangeLog 1774
 MISC metadata.xml 245 RMD160 680c86000ef80336b5c1b6256a4baf5f2083bc7a SHA1 90b56312be36a875943a2b66ff8061fa01f17bca SHA256 ebbc25532e5c563ed85007cb1d35399e5a8bfc66ce96f257efcb77ecdc69351f
 MD5 88bd2748caabcccb7f12ac9b7672b291 metadata.xml 245
 RMD160 680c86000ef80336b5c1b6256a4baf5f2083bc7a metadata.xml 245
@@ -14,3 +17,10 @@ SHA256 ebbc25532e5c563ed85007cb1d35399e5a8bfc66ce96f257efcb77ecdc69351f metadata
 MD5 2219707a551ce4804284b14612329aa1 files/digest-w3cam-0.7.2 235
 RMD160 879a2c31652b1aa520c8e440623c60a0282e9a74 files/digest-w3cam-0.7.2 235
 SHA256 04dbd9e2d38e80af0d345cee7e20522aec11a6873d6463513c6c5e8508ce0fc7 files/digest-w3cam-0.7.2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGzokJp/wUKkr7RBoRAittAKCHdHdZ8p3k7uFNCWji/BjoGUJQxgCfXpu+
+1qeAoD54poCYHoB0Ko/cpiU=
+=Vxud
+-----END PGP SIGNATURE-----
diff --git a/media-video/w3cam/w3cam-0.7.2.ebuild b/media-video/w3cam/w3cam-0.7.2.ebuild
index d16cda1e60cc..78f6cceeb561 100644
--- a/media-video/w3cam/w3cam-0.7.2.ebuild
+++ b/media-video/w3cam/w3cam-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 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/w3cam/w3cam-0.7.2.ebuild,v 1.11 2006/03/07 17:21:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/w3cam/w3cam-0.7.2.ebuild,v 1.12 2007/08/24 07:29:09 vapier Exp $
 
 #
 # You can set the default device that vidcat and w3camd use by setting
@@ -16,7 +16,7 @@ SRC_URI="http://mpx.freeshell.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="truetype"
 
 DEPEND="sys-libs/zlib
@@ -24,21 +24,26 @@ DEPEND="sys-libs/zlib
 	media-libs/libpng
 	truetype? ( media-libs/freetype )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i '/-lpthread/s:$: $(LDFLAGS):' w3camd/Makefile.in
+}
+
 src_compile() {
 	local myconf
-
-	[[ -n "${W3CAM_DEVICE}" ]] && \
-		myconf="${myconf} --with-device=${W3CAM_DEVICE}"
-
 	use truetype && \
 		myconf="${myconf} --with-ttf-inc=/usr/include/freetype"
 
-	econf ${myconf} || die "econf failed"
+	econf \
+		--with-device=${W3CAM_DEVICE:-/dev/video0} \
+		${myconf} \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	dobin vidcat w3camd/w3camd
+	dobin vidcat w3camd/w3camd || die
 	doman vidcat.1
 	dodoc ChangeLog.txt FAQ.txt README SAMPLES TODO.txt \
 		index.html w3cam.css w3cam.cgi w3cam.cgi.scf