Bump to 0.3.1-r2. Fix forced as-needed, bug #248655. Make it work with qgtkstyle, bug #250504.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

5 files changed, 88 insertions, 26 deletions

diff --git a/x11-themes/gtk-chtheme/ChangeLog b/x11-themes/gtk-chtheme/ChangeLog
index 918c9b53a212..151e1bfcf806 100644
--- a/x11-themes/gtk-chtheme/ChangeLog
+++ b/x11-themes/gtk-chtheme/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-themes/gtk-chtheme
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-chtheme/ChangeLog,v 1.19 2008/06/29 14:08:45 nixnut Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-chtheme/ChangeLog,v 1.20 2009/02/25 23:56:53 eva Exp $
+
+*gtk-chtheme-0.3.1-r2 (25 Feb 2009)
+
+  25 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gtk-chtheme-0.3.1-asneeded.patch,
+  +files/gtk-chtheme-0.3.1-qgtkstyle.patch, -gtk-chtheme-0.3.1.ebuild,
+  +gtk-chtheme-0.3.1-r2.ebuild:
+  Bump to 0.3.1-r2. Fix forced as-needed, bug #248655. Make it work with
+  qgtkstyle, bug #250504.
 
   29 Jun 2008; nixnut <nixnut@gentoo.org> gtk-chtheme-0.3.1-r1.ebuild:
   Stable on ppc wrt bug 215121
diff --git a/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch b/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch
new file mode 100644
index 000000000000..8cceb98a7565
--- /dev/null
+++ b/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch
@@ -0,0 +1,24 @@
+# LDFLAGS is for linker flags, not libraries
+# Fixes issue with forced --as-needed
+#
+# https://bugs.gentoo.org/show_bug.cgi?id=248655
+--- a/Makefile	2009-02-26 00:43:54.000000000 +0100
++++ b/Makefile	2009-02-26 00:43:32.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ CFLAGS := $(if $(RPM_OPT_FLAGS), $(RPM_OPT_FLAGS), $(CFLAGS))
+ 
+-LDFLAGS = $(shell pkg-config --libs gtk+-2.0)
++LIBS = $(shell pkg-config --libs gtk+-2.0)
+ CFLAGS += -Wall
+ CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN
+ CFLAGS += -DPROJNAME='"$(PROJNAME)"' -DVERSION='"$(VERSION)"'
+@@ -17,7 +17,7 @@
+ all: $(EXENAME) $(EXENAME).1
+ 
+ $(EXENAME): $(addsuffix .o, $(SRC))
+-	$(CC) $(LDFLAGS) $^ -o $@
++	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ $(EXENAME).1: $(EXENAME).pod
+ 	pod2man $< | sed 's/^\.TH .*/.TH $(EXENAME) 1/' > $@
diff --git a/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-qgtkstyle.patch b/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-qgtkstyle.patch
new file mode 100644
index 000000000000..b6c2b7a03551
--- /dev/null
+++ b/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-qgtkstyle.patch
@@ -0,0 +1,12 @@
+# Make gtk-chtheme work with qgtkstyle
+# https://bugs.gentoo.org/show_bug.cgi?id=250504
+--- a/main.c	2004-02-09 06:33:28.000000000 +0200
++++ b/main.c	2008-12-10 12:47:42.000000000 +0200
+@@ -97,6 +97,7 @@
+ 		fprintf(gtkrc_fh, "gtk-font-name=\"%s\"\n\n", font);
+ 	}
+ 
++	fprintf(gtkrc_fh, "gtk-theme-name  = \"%s\"\n\n", themename); 
+ 	fprintf(gtkrc_fh, "include \"%s/.gtkrc.mine\"\n\n", getenv("HOME"));
+ 	fprintf(gtkrc_fh, "# -- THEME AUTO-WRITTEN DO NOT EDIT\n");
+ 	fclose(gtkrc_fh);
diff --git a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r2.ebuild b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..18f2463927e6
--- /dev/null
+++ b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r2.ebuild,v 1.1 2009/02/25 23:56:53 eva Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GTK-2.0 Theme Switcher"
+HOMEPAGE="http://plasmasturm.org/programs/gtk-chtheme/"
+SRC_URI="http://plasmasturm.org/programs/gtk-chtheme/${P}.tar.bz2"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2"
+
+RDEPEND=">=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# QA: stop Makefile from stripping the binaries
+	sed -i -e "s:strip:true:" "${S}"/Makefile || die "sed failed"
+	epatch "${FILESDIR}"/${P}-implicit.patch
+
+	# Fix forced as-needed, bug #248655
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+
+	# Make it work with qgtkstyle, bug #250504
+	epatch "${FILESDIR}/${P}-qgtkstyle.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1.ebuild b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1.ebuild
deleted file mode 100644
index 2991db95ead3..000000000000
--- a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1.ebuild,v 1.10 2007/11/28 09:34:08 corsair Exp $
-
-DESCRIPTION="GTK-2.0 Theme Switcher"
-HOMEPAGE="http://plasmasturm.org/programs/gtk-chtheme/"
-SRC_URI="http://plasmasturm.org/programs/gtk-chtheme/${P}.tar.bz2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-LICENSE="GPL-2"
-
-RDEPEND=">=x11-libs/gtk+-2"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-src_compile() {
-		emake || die
-}
-
-src_install() {
-		einstall DESTDIR=${D} || die
-}