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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 102 insertions, 28 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/Manifest b/x11-themes/gtk-chtheme/Manifest
index cab234fdad8b..5451da6d50ce 100644
--- a/x11-themes/gtk-chtheme/Manifest
+++ b/x11-themes/gtk-chtheme/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gtk-chtheme-0.3.1-asneeded.patch 798 RMD160 d807366e3b2b0800080267dc6173bd00e46fed27 SHA1 579c4eded2664c3138b26446960770b687bdc9c1 SHA256 c2c52c2d2d1c2949a6576d9b491db6a86463421c89675e6c0be4bfaa5835dc20
 AUX gtk-chtheme-0.3.1-implicit.patch 542 RMD160 6b743379eaffe8ff131662a6bfc5f1112d83bec5 SHA1 9883eda3a50a4e1f89b04cb6ed65d4f10378145b SHA256 3b0f3d8c68651f1ae42c33919a082af04d16ade91eecc4e65e8ee9ed485e2ba4
+AUX gtk-chtheme-0.3.1-qgtkstyle.patch 484 RMD160 60b881c3d69426fcbc7ab9944479bd3abd439d90 SHA1 96d4766a500dee9c15d8918d47dfd4e5fa34a628 SHA256 09d8aa6072d4bc3552c275db38f8547212817760755e3cccc6aba5874987f18a
 DIST gtk-chtheme-0.3.1.tar.bz2 18205 RMD160 5d080e905fc5d60c085e8c46d9338ddad805f38c SHA1 dbea31f4092877e786fe040fae1374238fada94a SHA256 26f4b6dd60c220d20d612ca840b6beb18b59d139078be72c7b1efefc447df844
 EBUILD gtk-chtheme-0.3.1-r1.ebuild 869 RMD160 b6581ff53ffd4a329d8564ce29fe78e23fbe0733 SHA1 445f1fd7e6def52849ac7b202429776f10b3827e SHA256 df04b75d23147782b33eb986645c10a2c605d3c9bee509013ad486166bdf0323
-EBUILD gtk-chtheme-0.3.1.ebuild 612 RMD160 35b1010f48a31cc6ab5ec496a4b3090ee6b290cd SHA1 6a02c3d38b49ef050f1a213ba5233fb5050704dd SHA256 611df48e593140c802066675809b8a164762b520c2229e77f978f9ee96a6fcf3
-MISC ChangeLog 2462 RMD160 78dd2813d98138cb421a5355e348f4e33c008cca SHA1 c6ff8bba47b6a53b83f512f2cab36b6e1d805988 SHA256 a6d50599c671e38ae65d6a7e272f9ec44778f8296e15efecd30a0463c18678ad
+EBUILD gtk-chtheme-0.3.1-r2.ebuild 1076 RMD160 87938e852c8577836aaa0099b1984a0ae42b5f37 SHA1 6759b6a864e483056d6061640bebb0a41f80a8a9 SHA256 b4d751d84a56f870673457be7e84640aec46318841c4ec9df2db48be960c0f81
+MISC ChangeLog 2796 RMD160 f67ca66f95cd79e1838f9ade37ef48d2c1521f92 SHA1 79bea5630190cb26f9f4d8283ac0bc1168d264d3 SHA256 46ab65a8e71a114881fd95aacfa1779749d712703589fd9575217cc3b3e5ab84
 MISC metadata.xml 159 RMD160 488f58f504e5c2e7b10e253fd9db5f1e6f9d3a21 SHA1 16c86b590ee3d78c8ccd5b5044835ed4a4038d93 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkml2ssACgkQ1fmVwcYIWAbCWwCfV0ZYB050cL3hGg89LjSwk04G
+QkoAoN3tThPo3qxTHed8M4V5sDtbVVVX
+=hS2W
+-----END PGP SIGNATURE-----
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
-}