Make this ebuild not suck.

Package-Manager: portage-2.1.2_pre2

6 files changed, 103 insertions, 28 deletions

diff --git a/media-video/gqcam/ChangeLog b/media-video/gqcam/ChangeLog
index a9275eba1bd7..7ce74741a40a 100644
--- a/media-video/gqcam/ChangeLog
+++ b/media-video/gqcam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/gqcam
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gqcam/ChangeLog,v 1.10 2005/09/03 23:26:00 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gqcam/ChangeLog,v 1.11 2006/10/04 21:56:58 vapier Exp $
+
+  04 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/gqcam-0.9-build.patch, +files/gqcam-0.9-strlen.patch,
+  gqcam-0.9.ebuild:
+  Make this ebuild not suck.
 
   03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gqcam-0.9.ebuild:
   Don't install COPYING and INSTALL files.
diff --git a/media-video/gqcam/Manifest b/media-video/gqcam/Manifest
index 7a1559e98540..7732f6c5927d 100644
--- a/media-video/gqcam/Manifest
+++ b/media-video/gqcam/Manifest
@@ -1,14 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9e6d40b8596dfc6f8ea1dbf4fbf3e48d gqcam-0.9.ebuild 804
-MD5 1f9c38fb40eaec786a1d8c7afaeff66b ChangeLog 1011
+AUX gqcam-0.9-build.patch 1326 RMD160 58c978660eba2b961651211ef8d35f5cb022b96c SHA1 f46b9a8cd80b0c4822617980833668003d1d5179 SHA256 e076883b9f1c79615be9c6b4c4a128e712962e6020e068fd34308fb555c38e12
+MD5 297a190cc6262e606563e78e858e3063 files/gqcam-0.9-build.patch 1326
+RMD160 58c978660eba2b961651211ef8d35f5cb022b96c files/gqcam-0.9-build.patch 1326
+SHA256 e076883b9f1c79615be9c6b4c4a128e712962e6020e068fd34308fb555c38e12 files/gqcam-0.9-build.patch 1326
+AUX gqcam-0.9-strlen.patch 401 RMD160 2d03442cfcf13c75ce2adf9768b2c493c3c138e7 SHA1 d9aabf221fd5c93bfab431f82d440734400f4fb4 SHA256 e05e008894edd5c46e2b390132cb06c70fa03409f9ac8e8a6781a4f7f83dfa95
+MD5 fc438d0af5142e43aa26eaf65695ce31 files/gqcam-0.9-strlen.patch 401
+RMD160 2d03442cfcf13c75ce2adf9768b2c493c3c138e7 files/gqcam-0.9-strlen.patch 401
+SHA256 e05e008894edd5c46e2b390132cb06c70fa03409f9ac8e8a6781a4f7f83dfa95 files/gqcam-0.9-strlen.patch 401
+DIST gqcam-0.9.tar.gz 32442 RMD160 17d43897ef02a3b9a23dba893229fe453e5c3e08 SHA1 0685a5b481275d61b36a8b6e6b90e0c47e5f828e SHA256 1955f2de1489aed3e9fd8583099c977d127bed49c72fba02eea92530eb17c79d
+EBUILD gqcam-0.9.ebuild 772 RMD160 f9134d836b06c3ee96851c67a4b9701e16f97aa4 SHA1 ee8935a135fe9dded25f20bcd7feaa80655064bc SHA256 8103aadd70a4377350a5519dfee40c4078a0a8eef7e38fcf026a55a690f650ad
+MD5 aba237d0deb1c6429c0aa512481230f7 gqcam-0.9.ebuild 772
+RMD160 f9134d836b06c3ee96851c67a4b9701e16f97aa4 gqcam-0.9.ebuild 772
+SHA256 8103aadd70a4377350a5519dfee40c4078a0a8eef7e38fcf026a55a690f650ad gqcam-0.9.ebuild 772
+MISC ChangeLog 1171 RMD160 9dff6ebc0bcd5e0657093cc23d09e3e779c38654 SHA1 85e09600105e02dc59d58b04cb6ddce352b964f8 SHA256 ac23c72384cea842c62090d1b32a3a3a9c2c8de9ffb75c69b00ccd75d11a3dca
+MD5 089c6ce3fb5d17df0b28b1d80a06a887 ChangeLog 1171
+RMD160 9dff6ebc0bcd5e0657093cc23d09e3e779c38654 ChangeLog 1171
+SHA256 ac23c72384cea842c62090d1b32a3a3a9c2c8de9ffb75c69b00ccd75d11a3dca ChangeLog 1171
+MISC metadata.xml 247 RMD160 fc0e9739fc567bd23ecc117760050cc83fea6112 SHA1 d1365527d90a5eea2e788c9cb01ba4d13a579069 SHA256 1fb2ff4a1a8de2bbd2be16118f018760a2483db81b3c556f08eb7009333fa6b2
 MD5 284a70da1011bec7eafebb5d5e4b0fb5 metadata.xml 247
-MD5 b8c1e451d3454ca158a17c74b58031c8 files/digest-gqcam-0.9 60
+RMD160 fc0e9739fc567bd23ecc117760050cc83fea6112 metadata.xml 247
+SHA256 1fb2ff4a1a8de2bbd2be16118f018760a2483db81b3c556f08eb7009333fa6b2 metadata.xml 247
+MD5 c4ecabd31c9ff7fcefd85275742b6d8c files/digest-gqcam-0.9 226
+RMD160 0eb517b87d7f9bb28d5ff9cfe9a3db155460a43c files/digest-gqcam-0.9 226
+SHA256 db757b6a93cae6bc542233dc02780e2350ac8731930881bcf576528cc0663c21 files/digest-gqcam-0.9 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFDGjEYj5H05b2HAEkRAgGVAKCjNiRUGpC2cV1qSO1Hw9T/FgVW4QCeIbXc
-TJQB4soupqb8OdzdnazZ9os=
-=20Pd
+iD8DBQFFJC4xamhnQswr0vIRAj8vAJ9hyegHheCZpCNpV8apdFWRdxB5nwCgiD+E
+kISSQNQj0uXB6qtnio6hdbg=
+=5sQH
 -----END PGP SIGNATURE-----
diff --git a/media-video/gqcam/files/digest-gqcam-0.9 b/media-video/gqcam/files/digest-gqcam-0.9
index 8b2dd73c68bc..b220da21a938 100644
--- a/media-video/gqcam/files/digest-gqcam-0.9
+++ b/media-video/gqcam/files/digest-gqcam-0.9
@@ -1 +1,3 @@
 MD5 6e9ab1d86d96776bd5436b0e42a9e6b7 gqcam-0.9.tar.gz 32442
+RMD160 17d43897ef02a3b9a23dba893229fe453e5c3e08 gqcam-0.9.tar.gz 32442
+SHA256 1955f2de1489aed3e9fd8583099c977d127bed49c72fba02eea92530eb17c79d gqcam-0.9.tar.gz 32442
diff --git a/media-video/gqcam/files/gqcam-0.9-build.patch b/media-video/gqcam/files/gqcam-0.9-build.patch
new file mode 100644
index 000000000000..e69c09b80eed
--- /dev/null
+++ b/media-video/gqcam/files/gqcam-0.9-build.patch
@@ -0,0 +1,41 @@
+--- Makefile
++++ Makefile
+@@ -1,13 +1,14 @@
+ #
+-CC = gcc
++CC ?= gcc
+ LD = $(CC)
+ 
+-LDFLAGS = `gtk-config --libs gthread` -ljpeg -lpthread -lpng
++LDLIBS := $(shell gtk-config --libs gthread) -ljpeg -lpthread $(shell libpng-config --libs)
+ 
+ PROG = gqcam
+ VERSION = 0.9
+ 
+-CFLAGS = `gtk-config --cflags` -DVERSION=\"$(VERSION)\"
++GTK_CFLAGS := $(shell gtk-config --cflags)
++CPPFLAGS += $(GTK_CFLAGS) -D_GNU_SOURCE -DVERSION=\"$(VERSION)\"
+ INCLUDES = 
+ OBJS = 
+ 
+@@ -40,20 +41,11 @@
+ 	cp README ../$(PROG)-$(VERSION)/
+ 	cp README.threads ../$(PROG)-$(VERSION)/
+ gqcam: gqcam.o frontend.o color.o greyscale.o save.o timer.o filters.o preferences.o
+-	$(LD) $(LDFLAGS) gqcam.o frontend.o save.o color.o greyscale.o timer.o filters.o preferences.o -o gqcam 
+ greyscale.o: greyscale.c gqcam.h frontend.h greyscale.h
+-	$(CC) $(CFLAGS) -c greyscale.c
+ color.o: color.c gqcam.h frontend.h color.h
+-	$(CC) $(CFLAGS) -c color.c
+ preferences.o: preferences.c preferences.h gqcam.h
+-	$(CC) $(CFLAGS) -c preferences.c
+ frontend.o: frontend.c frontend.h gqcam.h
+-	$(CC) $(CFLAGS) -c frontend.c
+ timer.o: timer.c timer.h gqcam.h
+-	$(CC) $(CFLAGS) -c timer.c
+ save.o: save.c save.h gqcam.h
+-	$(CC) $(CFLAGS) -c save.c
+ filters.o: filters.c filters.h gqcam.h
+-	$(CC) $(CFLAGS) -c filters.c
+ gqcam.o: gqcam.c gqcam.h
+-	$(CC) $(CFLAGS) -c gqcam.c
diff --git a/media-video/gqcam/files/gqcam-0.9-strlen.patch b/media-video/gqcam/files/gqcam-0.9-strlen.patch
new file mode 100644
index 000000000000..890018cd840f
--- /dev/null
+++ b/media-video/gqcam/files/gqcam-0.9-strlen.patch
@@ -0,0 +1,11 @@
+--- timer.c
++++ timer.c
+@@ -63,7 +63,7 @@
+ 
+   camera->on_timer = 1;
+   
+-  if(strnlen(gtk_entry_get_text(GTK_ENTRY(camera->timer_struct.commandentry))) != 0){
++  if(strlen(gtk_entry_get_text(GTK_ENTRY(camera->timer_struct.commandentry))) != 0){
+     strcpy(camera->timer_struct.command, gtk_entry_get_text(GTK_ENTRY(camera->timer_struct.commandentry)));
+     camera->timer_struct.iscommand = 1;
+   }
diff --git a/media-video/gqcam/gqcam-0.9.ebuild b/media-video/gqcam/gqcam-0.9.ebuild
index cd19033e7bcf..a348ee543fd6 100644
--- a/media-video/gqcam/gqcam-0.9.ebuild
+++ b/media-video/gqcam/gqcam-0.9.ebuild
@@ -1,34 +1,30 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gqcam/gqcam-0.9.ebuild,v 1.15 2005/09/03 23:26:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gqcam/gqcam-0.9.ebuild,v 1.16 2006/10/04 21:56:58 vapier Exp $
 
-DESCRIPTION="A V4L-compatible frame grabber - works with many webcams."
-SRC_URI="http://cse.unl.edu/~cluening/gqcam/download/${P}.tar.gz"
+inherit eutils
+
+DESCRIPTION="A V4L-compatible frame grabber - works with many webcams"
 HOMEPAGE="http://cse.unl.edu/~cluening/gqcam/"
+SRC_URI="http://cse.unl.edu/~cluening/gqcam/download/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~mips amd64 ppc ~sparc"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
 IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/libpng-1.2.1-r1"
+	>=media-libs/jpeg-6b-r2
+	>=media-libs/libpng-1.2.1-r1"
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
-	mv Makefile Makefile.bad
-	sed -e "s:-lpng:\`libpng-config --libs\`:" Makefile.bad > Makefile
-}
-
-src_compile() {
-	emake || die
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-strlen.patch
 }
 
-src_install () {
-	dobin gqcam
-
+src_install() {
+	dobin gqcam || die
 	dodoc CHANGES README README.threads
 }