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.

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

4 files changed, 46 insertions, 28 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/Manifest b/x11-themes/gtk-engines-candido/Manifest
index 99c9444d52e6..841a459689ba 100644
--- a/x11-themes/gtk-engines-candido/Manifest
+++ b/x11-themes/gtk-engines-candido/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX gtk-engines-candido-0.9.1-glib-2.31.patch 225 RMD160 683cfb96339e89e7299d92ae449745655e2b5d01 SHA1 4639fa2a2aca95d2d5fefcdaf927a9c7e8f3985c SHA256 51f649d78ac94d665d6f5def8bf65ed70b5364752dee0de46b9c85a3c2114521
 DIST candido-engine-0.9.1.tar.bz2 319688 RMD160 b027b18e141ff4c946cfcf81d5788c4109b54443 SHA1 bbe57ef24b0ef6a344534d62e3c66d0f8f7218c2 SHA256 68a988142b8d5155cbfe3958c5bb684a814a2d6b985d672789efce780ee7613d
-EBUILD gtk-engines-candido-0.9.1.ebuild 870 RMD160 bead92e866c8535480605efd0e276bff87927322 SHA1 a1537c1776a99000dc7fd5bfb0f9005064294973 SHA256 008b37bf1ce3474ca95d20f898bb291142c076720683c52bfb2768cad27c3a56
-MISC ChangeLog 884 RMD160 476bd12b3e12a8bb8c2dac21b5316de4d7dfd21e SHA1 474c119bbe4c02a4f5e9f07ebac740a3cfb02e85 SHA256 23c47dc7f8b66f8244c7a96f06fab029bd7bb421dcbb6e04ec00c693406b4290
+EBUILD gtk-engines-candido-0.9.1.ebuild 885 RMD160 63315b6eec50a3d654f35d8105a0d40e947c6d21 SHA1 f23fe1ce7ac637ed8e9e63eac58acb464133b008 SHA256 26001a923e7a74e9944f465ece7f41b18c48a44345338c1c9e61a7247bd071a4
+MISC ChangeLog 1238 RMD160 e930b28381ec1d8a1221f08763947997fa5ba12a SHA1 8564aa70c15584121f49ca534a13d25d5872eeda SHA256 7decb2ee41d86e43b2769da8d74b42568ef8106debe7ae7364ef0efe41f12d0a
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMaaCqAAoJELHSF2kinlg4PRsQAKyOppqDl7RSVL27l382XO+3
-o/GboksYfSW0Zlwg34C2IA10rgRJgCJvS8yc1xuRh42+lY188Ty1henSdzwxsXrz
-vu4xr2Xk2Wl5M7o6VxQBcZx59A8TgExOP86a/uG7nIHPybTHUlLsc0mz/+mBlHph
-hwQWZu2QlacGnvJNYZKkAkhV0TW8bS21MRCZZTOgys13/uDXNQ19jBAvxkDsvij6
-jI2sDDsHYdBhpA/lXtoc3hT1Ih7fyfpLV7vQUf1k8PispdGuyI7Tb/rmkJGvut7j
-ZXj7qOQ5DvGMS0LQ9dXj6SQD7j9reWV25X+TPLBa71m5l4oQazewJQ7bQtHn6E2I
-GPnT4Q7wAQSx59+VgUyS3CqKp803M699a7LDZJZC+kHsVRC7nhEV9ni8rnr0AR9T
-qeirVrHrMFRW6Xp6usloq5jKPGZBfJIoaMHkkpIjMA4tmijkG3qweDSyZFMrQEcy
-prEeYqIvEAuZPhpg+OChtcOAk4hMD8yN35n7vPRuJBrrUsXkfQTFQCpc09XcZ3Q+
-NO+UaQZwE5qgCXXHOGQUvfQiHWRIzP86L1qtmzfii+gO+EIaTV38Sy9T1v/iPc9I
-HIGnnalzlovfvV8tZmW/qxyUv44yL7SZwB1WFfEIpaHxnLgtD/kAgjYZbCI3J8zr
-6IgIT2sWkzItLrzTJaFq
-=Bd9C
+iQEcBAEBAgAGBQJPkUJLAAoJEEdUh39IaPFNZDYH/1zx5qeglUDe0Q8J9kUitwQg
+FYqNt9Z2fQ66pLHYJc6q4KHA3E7hL7dPuNaDzxSjR90pLFQLqUZV8ttPw89sWT2u
+wE11yBtxPQyXlDnx+8NAiRKNYzKd4TxmeJw1VeUPJ1Dnb4YYb8H5qPvSIVbMPf4s
+vIR/IL6sRHsI2VCKx44hbzw+t+oc40wkraG+F8+nYSAJT+licW6ZnEfRrsuezdGf
+L1kDRf4jH6CvB+sYe9Mfph23ukfJWZp1IuSlsq8H07JLk9yeVGIgEtnTJdhnvJPr
+tNeDNzcxQK4SRArF6N+dF04iPQ8eTo7ubiMwtwu2KwF6QUk2wJ4PUHUti9teNZs=
+=uGu4
 -----END PGP SIGNATURE-----
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 {} +
 }