Fix building with dev-libs/glib >= 2.31 wrt #419393 by Pacho Ramos. Remove useless libtool archive from GTK+ 2.x engine directory.

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

3 files changed, 37 insertions, 10 deletions

diff --git a/x11-themes/gtk-engines-aurora/ChangeLog b/x11-themes/gtk-engines-aurora/ChangeLog
index 178b7b3ef53a..1511e2ac37ec 100644
--- a/x11-themes/gtk-engines-aurora/ChangeLog
+++ b/x11-themes/gtk-engines-aurora/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/gtk-engines-aurora
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-aurora/ChangeLog,v 1.10 2012/05/05 04:10:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-aurora/ChangeLog,v 1.11 2012/06/03 08:54:11 ssuominen Exp $
+
+  03 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  gtk-engines-aurora-1.5.1.ebuild,
+  +files/gtk-engines-aurora-1.5.1-glib-2.31.patch:
+  Fix building with dev-libs/glib >= 2.31 wrt #419393 by Pacho Ramos. Remove
+  useless libtool archive from GTK+ 2.x engine directory.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gtk-engines-aurora-1.4.ebuild,
   gtk-engines-aurora-1.5.1.ebuild:
diff --git a/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-glib-2.31.patch b/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-glib-2.31.patch
new file mode 100644
index 000000000000..34897addd278
--- /dev/null
+++ b/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-glib-2.31.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/419393
+
+--- src/animation.c
++++ 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-aurora/gtk-engines-aurora-1.5.1.ebuild b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
index 5a524a07fad5..1baa67afd2a4 100644
--- a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
+++ b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
@@ -1,9 +1,9 @@
 # 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-aurora/gtk-engines-aurora-1.5.1.ebuild,v 1.5 2012/05/05 04:10:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild,v 1.6 2012/06/03 08:54:11 ssuominen Exp $
 
-EAPI=2
-inherit versionator
+EAPI=4
+inherit eutils versionator
 
 MY_MAJ=$(get_version_component_range 1-2)
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.10:2"
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2.10:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -25,17 +26,24 @@ S=${WORKDIR}/aurora-${MY_MAJ}
 src_unpack() {
 	unpack ${A}
 	cd "${WORKDIR}"
-	tar -xzf aurora-gtk-engine-${MY_MAJ}.tar.gz || die "unpack failed"
-	tar -xjf Aurora.tar.bz2 || die "unpack failed"
+	tar -xzf aurora-gtk-engine-${MY_MAJ}.tar.gz || die
+	tar -xjf Aurora.tar.bz2 || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.31.patch
 }
 
 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 NEWS README
+
 	insinto /usr/share/themes/Aurora
-	doins -r ../Aurora/* || die "doins failed"
+	doins -r ../Aurora/*
+
+	find "${ED}"/usr -name '*.la' -type f -exec rm -f {} +
 }