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

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

3 files changed, 32 insertions, 11 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/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 {} +
 }