4 files changed, 84 insertions, 3 deletions
diff --git a/x11-misc/grabc/ChangeLog b/x11-misc/grabc/ChangeLog
index 12ee1cd71aba..a8b2acc7b533 100644
--- a/x11-misc/grabc/ChangeLog
+++ b/x11-misc/grabc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/grabc
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/grabc/ChangeLog,v 1.11 2007/02/21 23:39:05 jokey Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/grabc/ChangeLog,v 1.12 2010/02/08 11:25:33 jer Exp $
+
+*grabc-1.1-r1 (08 Feb 2010)
+
+  08 Feb 2010; Jeroen Roovers <jer@gentoo.org> +grabc-1.1-r1.ebuild,
+  +files/grabc-1.1-makefile.patch:
+  Respect CC, LDFLAGS, CFLAGS (bug #241544). Use pkg-config.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-misc/grabc/Manifest b/x11-misc/grabc/Manifest
index 49190436588b..da1ddf2093ac 100644
--- a/x11-misc/grabc/Manifest
+++ b/x11-misc/grabc/Manifest
@@ -1,4 +1,6 @@
+AUX grabc-1.1-makefile.patch 893 RMD160 06684bcf88ed511b6f40ec581d385725a89ea50e SHA1 76bd6929b24399860c7eb00d0ead8cde37d72cd3 SHA256 81f4a7c9771c46e16c1639f8bcce96e2f6364f76e1cb788f506a3354d72b2100
 DIST grabc1.1.tar.gz 2983 RMD160 405ef38ca88c30565b2d7acab81589294fd57515 SHA1 2260dfbcb16f77ac17e9c3b2ae4c8363c0fc86f8 SHA256 f0492a8ea33b46a16bdb94644420f54724e31c4436e4cd77937a30b2de3bb00e
+EBUILD grabc-1.1-r1.ebuild 918 RMD160 91cf426937f38848d7e996b369455880b93ee3a3 SHA1 44e95239681584197e7f06fbe6805533569ae054 SHA256 18107c866237bd68f472ed9747d07067614f232640deead4003e41babb357bdb
 EBUILD grabc-1.1.ebuild 870 RMD160 d6d69799eb2b4abd2f241ad4ec639e430081c491 SHA1 4bc8faea0386c2133f4967c17cc72fba5e174b93 SHA256 f14556b80997153f5931f0b853c34a5ef32c20976500896d8adc8873d64e59b7
-MISC ChangeLog 1185 RMD160 58c20f7161389221adbaa81341e16e49651314c8 SHA1 23ced4661e6b41916e4d59440f3b74f09822e2f4 SHA256 263221b17722a8a4b87bf14d883c3d404a07666656e0e9b6f3469c9f22832963
+MISC ChangeLog 1378 RMD160 fe811d21ec95ba0d009cb04ad1e80d7e545e5d1b SHA1 16155b24714d112104b1ee896ffdabef46ed3077 SHA256 1df176d4b450b5ee090fb972d3cdbc3491da7211b3c5eb0cf379de29b2e26712
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/grabc/files/grabc-1.1-makefile.patch b/x11-misc/grabc/files/grabc-1.1-makefile.patch
new file mode 100644
index 000000000000..4815ae5675c5
--- /dev/null
+++ b/x11-misc/grabc/files/grabc-1.1-makefile.patch
@@ -0,0 +1,37 @@
+--- grabc1.1/Makefile.org	1997-03-17 06:51:39.000000000 +0100
++++ grabc1.1/Makefile	2010-02-08 12:18:34.000000000 +0100
+@@ -2,17 +2,15 @@
+ # Makefile automatically generated by genmake 1.0, Mar-16-97
+ # genmake 1.0 by ma_muquit@fccc.edu, RCS
+ ##
+-CC= cc
+ DEFS=  
+ PROGNAME= grabc
+-LIBS= -L/usr/X11R6/lib -lX11
++LIBS= $(shell pkg-config --libs x11)
+ 
+ INCLUDES=  -I.
+ 
+-# replace -O with -g in order to debug
++# replace -O2 -pipe -Wall -march=athlon-xp with -g in order to debug
+ 
+ DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1
+-CFLAGS= -O $(DEFINES)
+ 
+ SRCS = grabc.c
+ 
+@@ -20,12 +18,12 @@
+ 
+ .c.o:
+ 	rm -f $@
+-	$(CC) $(CFLAGS) -c $*.c
++	$(CC) $(CFLAGS) $(DEFINES) -c $*.c
+ 
+ all: $(PROGNAME)
+ 
+ $(PROGNAME) : $(OBJS)
+-	$(CC) $(CFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
+ 
+ clean:
+ 	rm -f $(OBJS) $(PROGNAME) core
diff --git a/x11-misc/grabc/grabc-1.1-r1.ebuild b/x11-misc/grabc/grabc-1.1-r1.ebuild
new file mode 100644
index 000000000000..a8a4e78fa390
--- /dev/null
+++ b/x11-misc/grabc/grabc-1.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/grabc/grabc-1.1-r1.ebuild,v 1.1 2010/02/08 11:25:33 jer Exp $
+
+inherit eutils toolchain-funcs
+
+S="${WORKDIR}/${PN}${PV}"
+DESCRIPTION="A simple but useful program to determine the color string in hex (or RGB components) by clicking on a pixel on the screen"
+HOMEPAGE="http://www.muquit.com/muquit/software/grabc/grabc.html"
+SRC_URI="http://www.muquit.com/muquit/software/${PN}/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin grabc  || die "dobin failed"
+	dodoc README || die "dodoc failed"
+}