From: Jim Ramsay <lack@gentoo.org>
Date: Tue, 20 Mar 2007 20:15:41 +0000 (+0000)
Subject: Fixed headless (USE="-X") build issue
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a94c9bbbf0aabb390733edd6abe8a32d11b2ae8a;p=gentoo.git

Fixed headless (USE="-X") build issue
Package-Manager: portage-2.1.2-r10
---

diff --git a/x11-plugins/gkrelltop/ChangeLog b/x11-plugins/gkrelltop/ChangeLog
index 32b10e454a26..3949fc0518db 100644
--- a/x11-plugins/gkrelltop/ChangeLog
+++ b/x11-plugins/gkrelltop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/gkrelltop
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/ChangeLog,v 1.18 2007/03/12 17:40:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/ChangeLog,v 1.19 2007/03/20 20:15:41 lack Exp $
+
+  20 Mar 2007; Jim Ramsay <lack@gentoo.org> gkrelltop-2.2.6-r1.ebuild:
+  Fixed headless (USE="-X") build issue
 
   12 Mar 2007; Jim Ramsay <lack@gentoo.org> -gkrelltop-2.2.ebuild,
   -gkrelltop-2.2.2.ebuild, -gkrelltop-2.2.3.ebuild, gkrelltop-2.2.4.ebuild,
diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
index 1d72595e4d78..a5b5db08ad5a 100644
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -4,18 +4,18 @@ EBUILD gkrelltop-2.2.4.ebuild 1004 RMD160 4063455747ffc737da2ad2c90a9f8ee1c7bfdc
 MD5 e9a29ab49cfb70932de1a9f33d2e0bf4 gkrelltop-2.2.4.ebuild 1004
 RMD160 4063455747ffc737da2ad2c90a9f8ee1c7bfdc82 gkrelltop-2.2.4.ebuild 1004
 SHA256 128d30803539dd3797046286786d4a706fc0760a5b8d42a6eb4b368699622099 gkrelltop-2.2.4.ebuild 1004
-EBUILD gkrelltop-2.2.6-r1.ebuild 1431 RMD160 14751df1a05573bbe09629702bf4a67639c34924 SHA1 42671cb926d20951b9f6ab882b82e33bca3995e0 SHA256 43525e7f8edab2a6dcbe473aeae30a6dfd9b94567b4122ae7efdb3b1e5c74231
-MD5 1f2b663d506d5b2362aa65580334b724 gkrelltop-2.2.6-r1.ebuild 1431
-RMD160 14751df1a05573bbe09629702bf4a67639c34924 gkrelltop-2.2.6-r1.ebuild 1431
-SHA256 43525e7f8edab2a6dcbe473aeae30a6dfd9b94567b4122ae7efdb3b1e5c74231 gkrelltop-2.2.6-r1.ebuild 1431
+EBUILD gkrelltop-2.2.6-r1.ebuild 1548 RMD160 a14aeba437d551e70167947a4084f8c287bfcb8b SHA1 7b2fdb7819afc1cc7ab42c763a67bfd64ba697a1 SHA256 e157f5c2aa9663ffc6bf5bbf0225784ab5daa274e94629c381f3e211c2fbb9ec
+MD5 f7d5c653842d61f1756431bbdd33bc2d gkrelltop-2.2.6-r1.ebuild 1548
+RMD160 a14aeba437d551e70167947a4084f8c287bfcb8b gkrelltop-2.2.6-r1.ebuild 1548
+SHA256 e157f5c2aa9663ffc6bf5bbf0225784ab5daa274e94629c381f3e211c2fbb9ec gkrelltop-2.2.6-r1.ebuild 1548
 EBUILD gkrelltop-2.2.6.ebuild 1012 RMD160 daf02860e795d05ac587fb81c7ddc04778de0997 SHA1 1793f5732611b90e3f262118da6b3b6e1d50fb1d SHA256 fe80342ab43ce2249e130df044977ce11e3b0d9fbbb4280ed57831949dd6e389
 MD5 d7f7d9e30f4777f36e64acab21cccbbf gkrelltop-2.2.6.ebuild 1012
 RMD160 daf02860e795d05ac587fb81c7ddc04778de0997 gkrelltop-2.2.6.ebuild 1012
 SHA256 fe80342ab43ce2249e130df044977ce11e3b0d9fbbb4280ed57831949dd6e389 gkrelltop-2.2.6.ebuild 1012
-MISC ChangeLog 2776 RMD160 6e1221731aed8dc4f575cfa1d29ad1a0d1973c30 SHA1 7853625c65296ef7bbd84f3f160dd8e87301d94b SHA256 8e093e5a1f5f2e8a1d3c272aa6c7bbb65abfcda759147d955a670239341b4ff1
-MD5 af2c1b29ff2169b6b44f42eb73b40a13 ChangeLog 2776
-RMD160 6e1221731aed8dc4f575cfa1d29ad1a0d1973c30 ChangeLog 2776
-SHA256 8e093e5a1f5f2e8a1d3c272aa6c7bbb65abfcda759147d955a670239341b4ff1 ChangeLog 2776
+MISC ChangeLog 2888 RMD160 217b781854630901b1e908040049e150d6af7063 SHA1 8b2cad649fa950d8af6a6b98165c785cd19be98e SHA256 7db6c892645caa494433335c198208dc041013641c64e6a8849fd256074081ea
+MD5 94ff605a4b32b18a0be4ba8f9a1b559d ChangeLog 2888
+RMD160 217b781854630901b1e908040049e150d6af7063 ChangeLog 2888
+SHA256 7db6c892645caa494433335c198208dc041013641c64e6a8849fd256074081ea ChangeLog 2888
 MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279
 MD5 599b71bb15dd853af7b7733ed80c5d79 metadata.xml 254
 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c metadata.xml 254
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild
index 3ad82b9fce79..7338ff8b4ad5 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild,v 1.2 2007/03/12 17:40:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrelltop/gkrelltop-2.2.6-r1.ebuild,v 1.3 2007/03/20 20:15:41 lack Exp $
 
 inherit gkrellm-plugin
 
@@ -20,8 +20,13 @@ PLUGIN_SO=gkrelltop2.so
 src_compile() {
 	# Unfortunately, the supplied Makefile won't work properly on
 	# non-x86, so we have to do this the hard way.
-	CONFIG="-DLINUX -DGKRELLM2 -fPIC `pkg-config gtk+-2.0 --cflags`"
-	LIBS="`pkg-config gtk+-2.0 --libs` -shared"
+	if built_with_use app-admin/gkrellm X; then
+		PKGCFG_ITEM="gtk+-2.0"
+	else
+		PKGCFG_ITEM="glib-2.0"
+	fi
+	CONFIG="-DLINUX -DGKRELLM2 -fPIC `pkg-config ${PKGCFG_ITEM} --cflags`"
+	LIBS="`pkg-config ${PKGCFG_ITEM} --libs` -shared"
 	OBJS="top_three2.o"
 	XOBJS="${OBJS} gkrelltop2.o"
 	DOBJS="${OBJS} gkrelltopd.o"