Fix building with dev-libs/glib >= 2.31 wrt #419395 by Pacho Ramos

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 49 insertions, 13 deletions

diff --git a/x11-themes/gtk-engines-ubuntulooks/ChangeLog b/x11-themes/gtk-engines-ubuntulooks/ChangeLog
index defe78411a6d..60d3852827c3 100644
--- a/x11-themes/gtk-engines-ubuntulooks/ChangeLog
+++ b/x11-themes/gtk-engines-ubuntulooks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gtk-engines-ubuntulooks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-ubuntulooks/ChangeLog,v 1.13 2012/05/05 04:10:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-ubuntulooks/ChangeLog,v 1.14 2012/06/03 19:57:10 ssuominen Exp $
+
+  03 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  gtk-engines-ubuntulooks-0.9.12-r3.ebuild,
+  +files/gtk-engines-ubuntulooks-0.9.12-glib-2.31.patch:
+  Fix building with dev-libs/glib >= 2.31 wrt #419395 by Pacho Ramos
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   gtk-engines-ubuntulooks-0.9.12-r2.ebuild,
diff --git a/x11-themes/gtk-engines-ubuntulooks/Manifest b/x11-themes/gtk-engines-ubuntulooks/Manifest
index 7027024caf54..89b71da899ff 100644
--- a/x11-themes/gtk-engines-ubuntulooks/Manifest
+++ b/x11-themes/gtk-engines-ubuntulooks/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gtk-engines-ubuntulooks-0.9.12-glib-2.31.patch 239 RMD160 aebffac7322e3b4ef255f7d6e3caff6d62de11f0 SHA1 508442d7f5238ae61cecc5a8ce08a3f21f522d04 SHA256 45169b507fd8bd2c0fb8407189725962d511966775a84caa6aa4847ebcdb8301
 DIST ubuntulooks_0.9.12-11.diff.gz 8000 RMD160 b433718ea0cfd19159d416a6b344d7195e7bdd5d SHA1 3db04882a41c8c389f3810eebe534bed580050e7 SHA256 dc508eb0b6d24946f19945fb7b98adffe22f2b22620156c16f376a8f3ed72a60
 DIST ubuntulooks_0.9.12-12.diff.gz 8398 RMD160 3e87221e886dbe80be83f8e217932287efc703b1 SHA1 2d94c856f6c6fc615f43f18f1265124ca8fe5d61 SHA256 ac3675103e3bdd7a032e0a0ed0b959c9b2ed48e6d0d57c9ef73713b9b8233b5f
 DIST ubuntulooks_0.9.12.orig.tar.gz 345833 RMD160 451dc8a093f9c4f78e66065c7daddb8af91db9ff SHA1 7270727e42e5b1a790c1010e784ad29ac4430348 SHA256 88e3535c3c7a12c24b09fb057c2a6b52eb0d13f1b2fbdabb4a13bb7e164877fa
 EBUILD gtk-engines-ubuntulooks-0.9.12-r2.ebuild 1218 RMD160 51b4ab79fd70d794aea4788fbfbb292832878a96 SHA1 eb1af42fbf831174cf4d3b2c15dab4179f1b3d9b SHA256 285d8fb90efdadd2ebaea5c9bead42d9933ce633b2c3e04a169a639c055fb51e
-EBUILD gtk-engines-ubuntulooks-0.9.12-r3.ebuild 1276 RMD160 8c41ad442f812af5928cf1ce2598de60f880839b SHA1 23e626620ffcbab9fc37eb53d132807a4ad79f8b SHA256 6b74dfe2b762e753c2b01ef673c01660eab0a21dbb9a89cc31924547a714cc75
-MISC ChangeLog 2110 RMD160 d31847ad18f8b6c6f94bcbe2b5312b8e8cd01a3a SHA1 928c1e65ede9fb8c3d5bffa373cae706be770e0c SHA256 a9e401fb2cf00e87f520b46a28227fd876ba625c5a0da5d5ee96200e618864c8
+EBUILD gtk-engines-ubuntulooks-0.9.12-r3.ebuild 1337 RMD160 b20b548683538fd573c73f1c4328964eeb2f80f8 SHA1 1c97be7c0b4fe8642fcb6b3f6198ff3052ce1f05 SHA256 eaee2e6dbc2557cfce6c83c7f007afbfcb201b6c57cdfda91421d72ffa5bdb45
+MISC ChangeLog 2338 RMD160 82855744e2cbf82b6f3946d771cb66aa59fc4001 SHA1 b6ef232af4ea6880133f9f5b4d22d872e108c82f SHA256 c3a3de6f8df5dbbdf86fdaec86afb44fa85080ce29878e373525eb257124bda4
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPy8C5AAoJEEdUh39IaPFNsncH/iTzWLHR72pdwd67ZOwjbFfe
+r8kx/X+XtLEGa7Xx8pB70llpV/HjRkuU1QlcVRLIXRH9cpR8zA4Z3QooKHwzMMtp
+gxtl4zMiYSlQYT6p0Ihfy7NqAcIZQncwyRgC2BLj4uLNIHYJU3RFheNVRIKOUBmO
+dAmE2RyJg7fH5CZVfvAJQLZIPApihkARTAwc1N0Qrlyu8J61SYi18Wz3LUr5VcZ9
+WyYm3xGip2DePDWwzQrVAqNUW9d5UGnZhWb5366Zr3JQ/Y607MmPT5syj1XQk2VI
+ne5qluNfw3qHY7bjQn520TyrKYR1M99WZT9JYRJ/DyMGD6yqhBi9RQLoHL1HLI0=
+=1qJl
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines-ubuntulooks/files/gtk-engines-ubuntulooks-0.9.12-glib-2.31.patch b/x11-themes/gtk-engines-ubuntulooks/files/gtk-engines-ubuntulooks-0.9.12-glib-2.31.patch
new file mode 100644
index 000000000000..453407f14ee1
--- /dev/null
+++ b/x11-themes/gtk-engines-ubuntulooks/files/gtk-engines-ubuntulooks-0.9.12-glib-2.31.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/419395
+
+--- engine/src/animation.c
++++ engine/src/animation.c
+@@ -7,7 +7,7 @@
+ #include "animation.h"
+ 
+ #ifdef HAVE_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+ 
+ struct _AnimationInfo {
+ 	GTimer *timer;
diff --git a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild b/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
index 079d278d313a..e481bba81868 100644
--- a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
+++ b/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild,v 1.6 2012/05/05 04:10:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild,v 1.7 2012/06/03 19:57:10 ssuominen Exp $
 
-EAPI=2
-inherit eutils autotools
+EAPI=4
+inherit autotools eutils
 
 PATCH_LEVEL=12
-MY_PN=${PN/gtk-engines-/}
+MY_PN=${PN/gtk-engines-}
 
-DESCRIPTION="a derivative of the standard Clearlooks engine, using a more orange approach"
+DESCRIPTION="A derivative of the standard Clearlooks GTK+ 2.x engine with more orange approach"
 HOMEPAGE="http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks"
 SRC_URI="mirror://ubuntu/pool/main/u/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz
 	mirror://ubuntu/pool/main/u/${MY_PN}/${MY_PN}_${PV}-${PATCH_LEVEL}.diff.gz"
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.8:2"
+RDEPEND=">=dev-libs/glib-2
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -26,17 +27,19 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 src_prepare() {
 	epatch "${WORKDIR}"/${MY_PN}_${PV}-${PATCH_LEVEL}.diff
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch debian/patches
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch debian/patches
+	epatch "${FILESDIR}"/${P}-glib-2.31.patch #419395
 
-	eautoreconf # need new libtool for interix
+	eautoreconf # update libtool for interix
 }
 
 src_configure() {
-	econf --disable-dependency-tracking --enable-animation
+	econf --enable-animation
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog README
 	newdoc debian/changelog ChangeLog.debian
+	find "${ED}"/usr -name '*.la' -type f -exec rm -f {} +
 }