Fix building against glib-2.32, bug #419391. Drop old.

(Portage version: 2.1.10.64/cvs/Linux x86_64)

4 files changed, 29 insertions, 43 deletions

diff --git a/x11-themes/gtk-engines-nodoka/ChangeLog b/x11-themes/gtk-engines-nodoka/ChangeLog
index 9d6f28358608..09d17102ec20 100644
--- a/x11-themes/gtk-engines-nodoka/ChangeLog
+++ b/x11-themes/gtk-engines-nodoka/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gtk-engines-nodoka
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-nodoka/ChangeLog,v 1.7 2012/06/04 12:58:06 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-nodoka/ChangeLog,v 1.8 2012/06/04 14:54:59 pacho Exp $
+
+  04 Jun 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gtk-engines-nodoka-0.7.5-glib2.32.patch,
+  -gtk-engines-nodoka-0.7.2.ebuild, gtk-engines-nodoka-0.7.5.ebuild:
+  Fix building against glib-2.32, bug #419391. Drop old.
 
   04 Jun 2012; Alex Legler <a3li@gentoo.org> metadata.xml:
   for real
diff --git a/x11-themes/gtk-engines-nodoka/files/gtk-engines-nodoka-0.7.5-glib2.32.patch b/x11-themes/gtk-engines-nodoka/files/gtk-engines-nodoka-0.7.5-glib2.32.patch
new file mode 100644
index 000000000000..0eb074c0ad5d
--- /dev/null
+++ b/x11-themes/gtk-engines-nodoka/files/gtk-engines-nodoka-0.7.5-glib2.32.patch
@@ -0,0 +1,13 @@
+Index: gtk-nodoka-engine-0.7.5/src/GTKEngine/animation.c
+===================================================================
+--- gtk-nodoka-engine-0.7.5.orig/src/GTKEngine/animation.c
++++ gtk-nodoka-engine-0.7.5/src/GTKEngine/animation.c
+@@ -23,7 +23,7 @@
+ #include "animation.h"
+ 
+ #ifdef HAVE_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+ 
+ struct _AnimationInfo
+ {
diff --git a/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.2.ebuild b/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.2.ebuild
deleted file mode 100644
index c22a13b53498..000000000000
--- a/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-nodoka/gtk-engines-nodoka-0.7.2.ebuild,v 1.3 2012/05/05 04:10:06 jdhore Exp $
-
-EAPI=1
-MY_P="gtk-nodoka-engine-${PV}"
-
-DESCRIPTION="GTK+ engine and themes developed by the Fedora Project"
-HOMEPAGE="https://fedorahosted.org/nodoka/"
-SRC_URI="https://fedorahosted.org/releases/n/o/nodoka/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="animation-rtl"
-
-RDEPEND=">=x11-libs/gtk+-2.8.0:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--enable-animation \
-		$(use_enable animation-rtl animationtoleft)
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO || die "dodoc failed"
-}
diff --git a/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.5.ebuild b/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.5.ebuild
index 1a9bf4535334..386ddb1fc471 100644
--- a/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.5.ebuild
+++ b/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.5.ebuild
@@ -1,8 +1,10 @@
 # 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-nodoka/gtk-engines-nodoka-0.7.5.ebuild,v 1.3 2012/05/05 04:10:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-nodoka/gtk-engines-nodoka-0.7.5.ebuild,v 1.4 2012/06/04 14:54:59 pacho Exp $
+
+EAPI=4
+inherit eutils
 
-EAPI=1
 MY_P="gtk-nodoka-engine-${PV}"
 
 DESCRIPTION="GTK+ engine and themes developed by the Fedora Project"
@@ -20,17 +22,18 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}/${P}-glib2.32.patch"
+}
+
+src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		--enable-animation \
 		$(use_enable animation-rtl animationtoleft)
-
-	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO || die "dodoc failed"
+	default
 	find "${D}" -name "*.la" -delete || die
 }