Fix building with dev-libs/glib >= 2.31 wrt #412731 by Anton Kochkov. Stabilize for amd64 (following lead set by x86). Remove useless libcandido.la libtool archive from the GTK+ 2.x engine directory.

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

3 files changed, 34 insertions, 11 deletions

diff --git a/x11-themes/gtk-engines-candido/ChangeLog b/x11-themes/gtk-engines-candido/ChangeLog
index 5ac503a4194c..5c02d6a4777b 100644
--- a/x11-themes/gtk-engines-candido/ChangeLog
+++ b/x11-themes/gtk-engines-candido/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/gtk-engines-candido
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-candido/ChangeLog,v 1.4 2010/08/16 20:33:35 abcd Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-candido/ChangeLog,v 1.5 2012/04/20 11:04:08 ssuominen Exp $
+
+  20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  gtk-engines-candido-0.9.1.ebuild,
+  +files/gtk-engines-candido-0.9.1-glib-2.31.patch:
+  Fix building with dev-libs/glib >= 2.31 wrt #412731 by Anton Kochkov.
+  Stabilize for amd64 (following lead set by x86). Remove useless libcandido.la
+  libtool archive from the GTK+ 2.x engine directory.
 
   16 Aug 2010; Jonathan Callen <abcd@gentoo.org>
   gtk-engines-candido-0.9.1.ebuild:
diff --git a/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-glib-2.31.patch b/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-glib-2.31.patch
new file mode 100644
index 000000000000..d8f7e3e70ff2
--- /dev/null
+++ b/x11-themes/gtk-engines-candido/files/gtk-engines-candido-0.9.1-glib-2.31.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/412731
+
+--- 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-candido/gtk-engines-candido-0.9.1.ebuild b/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
index a613731e965a..5177145cdecf 100644
--- a/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
+++ b/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-candido/gtk-engines-candido-0.9.1.ebuild,v 1.4 2010/08/16 20:33:35 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild,v 1.5 2012/04/20 11:04:08 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit autotools
 
 MY_P=candido-engine-${PV}
 
-DESCRIPTION="Candido GTK+ Theme Engine"
-HOMEPAGE="http://candido.berlios.de"
+DESCRIPTION="Candido GTK+ 2.x Theme Engine"
+HOMEPAGE="http://candido.berlios.de/"
 SRC_URI="mirror://berlios/candido/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.8:2"
@@ -22,15 +22,18 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+DOCS="AUTHORS ChangeLog CREDITS NEWS README"
+
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.31.patch
 	eautoreconf # required for interix
 }
 
 src_configure() {
-	econf --disable-dependency-tracking --enable-animation
+	econf --enable-animation
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog CREDITS NEWS README
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }