Update gnometheme live ebuild

svn path=/overlay/; revision=436

5 files changed, 39 insertions, 11 deletions

diff --git a/metadata/cache/x11-themes/gnustep-gnometheme-9999 b/metadata/cache/x11-themes/gnustep-gnometheme-9999
index 2caac2c..44cadbe 100644
--- a/metadata/cache/x11-themes/gnustep-gnometheme-9999
+++ b/metadata/cache/x11-themes/gnustep-gnometheme-9999
@@ -1,5 +1,5 @@
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back dev-vcs/subversion net-misc/rsync
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+dev-util/pkgconfig gnome-base/gconf x11-libs/gtk+:2 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back dev-vcs/subversion net-misc/rsync
+gnome-base/gconf x11-libs/gtk+:2 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 0
 
 
diff --git a/x11-themes/gnustep-gnometheme/ChangeLog b/x11-themes/gnustep-gnometheme/ChangeLog
index 3ebbc9e..3394ab2 100644
--- a/x11-themes/gnustep-gnometheme/ChangeLog
+++ b/x11-themes/gnustep-gnometheme/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for x11-themes/gnustep-gnometheme
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  gnustep-gnometheme-9999.ebuild,
+  +files/gnustep-gnometheme-9999-pkgconfig.patch:
+  Use pkg-config in makefile, add dependencies. Working quite well now
+
 *gnustep-gnometheme-9999 (13 Jul 2010)
 
   13 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org>
diff --git a/x11-themes/gnustep-gnometheme/Manifest b/x11-themes/gnustep-gnometheme/Manifest
index bb3057f..d302273 100644
--- a/x11-themes/gnustep-gnometheme/Manifest
+++ b/x11-themes/gnustep-gnometheme/Manifest
@@ -1,3 +1,4 @@
-EBUILD gnustep-gnometheme-9999.ebuild 642 RMD160 bce0aa0d7acda0e6a848fe7a420c7cdee332b116 SHA1 993bf1b8e69ef0b519d0060576617b22fe46e20d SHA256 a6d00ef9914cd55e91f3a53a95381a433ea0ac36562ef34a5ef02c8d5e820d1b
-MISC ChangeLog 305 RMD160 9b3b9cd16d2df920c5653d41231dcd43611b96cf SHA1 81c5fffe04c400a739da21ab18ff366edc70dfae SHA256 807e3b7149ab1d014cd17e398b27bc475cba6bc798a769be9692661da5850478
+AUX gnustep-gnometheme-9999-pkgconfig.patch 1007 RMD160 4a956aca399cbce6028e661c0148669e0048648b SHA1 d76ea374a09fc26f990ed568fd742d576b0e8646 SHA256 6aa843a48041b4968ac92ac9b708aa244dcee8bd9c4872a7f47f2c8cb4b4af3f
+EBUILD gnustep-gnometheme-9999.ebuild 651 RMD160 06ce380dccd5e4fceedb7edc069c1dbdea3ef4f7 SHA1 c9151b72f46d5679d274294027d336350e55c7d2 SHA256 c618df88071b10b948f4d59f75b7f20f75b75f7e1f3644aec836e79153f7999b
+MISC ChangeLog 516 RMD160 4d40016a527d7374cc41209fd5985dfce76e2b6b SHA1 6508227e71104d1cced74ed92de802ddfcc542c7 SHA256 48dc94260193ea338a1f7bde40608c1f77a05958fed72867341fae9df7b389fd
 MISC metadata.xml 310 RMD160 6ee52b0a0f4241a80e9578554a6cae25d2fc01c2 SHA1 ccfdc2200501ccdc6815b9b66bd3af4c473226aa SHA256 602f13efbd565c15cd9e4b87ea3c05fcd134e6f9920c6f9c18b205917f91dcf0
diff --git a/x11-themes/gnustep-gnometheme/files/gnustep-gnometheme-9999-pkgconfig.patch b/x11-themes/gnustep-gnometheme/files/gnustep-gnometheme-9999-pkgconfig.patch
new file mode 100644
index 0000000..2b8dc81
--- /dev/null
+++ b/x11-themes/gnustep-gnometheme/files/gnustep-gnometheme-9999-pkgconfig.patch
@@ -0,0 +1,18 @@
+--- GNUmakefile.orig	2011-04-21 10:36:11.077814154 +0200
++++ GNUmakefile	2011-04-21 11:13:00.877039286 +0200
+@@ -8,13 +8,12 @@
+ 
+ include $(GNUSTEP_MAKEFILES)/common.make
+ 
+-MYCFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/gconf/2/
++MYCFLAGS = $(shell pkg-config --cflags gconf-2.0 gtk+-2.0)
+ 
+ ADDITIONAL_OBJCFLAGS = -Wno-import -g $(MYCFLAGS) -O0 # -Wall -O2
+ ADDITIONAL_CFLAGS = $(MYCFLAGS)
+ 
+-ADDITIONAL_LDFLAGS = -v -L/usr/lib/debug/usr/lib/ -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lgconf-2
+-
++ADDITIONAL_LDFLAGS = $(shell pkg-config --libs gconf-2.0 gtk+-2.0)
+ #
+ # Main
+ #
diff --git a/x11-themes/gnustep-gnometheme/gnustep-gnometheme-9999.ebuild b/x11-themes/gnustep-gnometheme/gnustep-gnometheme-9999.ebuild
index ede3ecc..bbf9b2a 100644
--- a/x11-themes/gnustep-gnometheme/gnustep-gnometheme-9999.ebuild
+++ b/x11-themes/gnustep-gnometheme/gnustep-gnometheme-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,11 +15,15 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND="gnome-base/gconf
+	x11-libs/gtk+:2"
+DEPEND="dev-util/pkgconfig
+	${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+}
 
 pkg_postinst() {
-	elog "As of now, SystemPreferences crashes on GnomeTheme,"
-	elog "but setting the theme like this works:"
-	elog "# defaults write NSGlobalDomain GSTheme GnomeTheme"
+	elog "Use gnustep-apps/systempreferences to switch theme"
 }