Use prune_libtool_files from eutils.eclass. Punt acinclude.m4 to ensure system .m4 files from dev-util/gtk-doc-am get used wrt #420913. Thanks to "Kevin" for reporting and Rafał Mużyło for solution.

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

3 files changed, 30 insertions, 9 deletions

diff --git a/x11-libs/libsexy/ChangeLog b/x11-libs/libsexy/ChangeLog
index d815ea7a4f82..1da8f071ca52 100644
--- a/x11-libs/libsexy/ChangeLog
+++ b/x11-libs/libsexy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libsexy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsexy/ChangeLog,v 1.57 2012/05/05 03:52:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsexy/ChangeLog,v 1.58 2012/06/19 10:14:45 ssuominen Exp $
+
+  19 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> libsexy-0.1.11-r3.ebuild:
+  Use prune_libtool_files from eutils.eclass. Punt acinclude.m4 to ensure
+  system gtk-doc-m4 from dev-util/gtk-doc-am get used wrt #420913. Thanks to
+  "Kevin" for reporting and Rafał Mużyło for solution.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> libsexy-0.1.11-r3.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/x11-libs/libsexy/Manifest b/x11-libs/libsexy/Manifest
index 632a5000b878..9bf5f9002880 100644
--- a/x11-libs/libsexy/Manifest
+++ b/x11-libs/libsexy/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libsexy-0.1.11-fix-null-list.patch 1908 RMD160 8e50b3c1f56f494e66855414ceb62a982ce85bc6 SHA1 4831af6107fce5105ff6e395e80fd3dc5553eb55 SHA256 1e3e7bbe4eb231c67b572ac2dc7408274104c99a70238f69db51718a073811dc
 AUX libsexy-0.1.11-pkgconfig-pollution.patch 281 RMD160 fddc2998097f2ed82e688e500df2400f5069d9e2 SHA1 24be7e86ccc7b4a32d07b4771d5bf17614450950 SHA256 b83e84a0fd78b506ddf837f4b2ba6e4a71cbc03332356cf91a8766d34bc39284
 DIST libsexy-0.1.11.tar.bz2 267376 RMD160 3e0dd0be95776e600877f09b3bcc83d4656f4c59 SHA1 0b804d98d4746906c9546a26bb699dd51f80090d SHA256 ba113ff5148e9ac137381a1da7045caa750a3b0c0113d4b97549bdbb6c1c8bb6
-EBUILD libsexy-0.1.11-r3.ebuild 1302 RMD160 be31807a8e04f548180f1c817b2170d2626084a6 SHA1 25125dde5209488c490b814e82d95f56675d9861 SHA256 a4037070cfd2772384f611d34dc6a4add4e618754e5fd2feb61642e409d25ffc
-MISC ChangeLog 6998 RMD160 ac997cbb766589f745b1a9655c8a1e247066dcf4 SHA1 eb1685942f95564c00f5905d76836dc02b6c15f7 SHA256 7ef52fb05aef7ffd6425822a0271cca691400998112f8431924339bc29f6e5e3
+EBUILD libsexy-0.1.11-r3.ebuild 1304 RMD160 10aa0c5cd715de42af83a4e0f8812e0b076e2553 SHA1 ad75611a7e4813e5a8c9e60c2aafc40750205405 SHA256 5bcc512310177956795272b77e8e137ff21cb252ba1bc2810e2f92c458242dbb
+MISC ChangeLog 7291 RMD160 37df3443d53741dd6b4627c6613366befbf24dd4 SHA1 97df5deff0fe3373c5cff2bd346a6c31e0504c6e SHA256 b6be32981d4412bd6d6c29ae422e426aeefd55c03d4fe6647d6bc05f86620995
 MISC metadata.xml 166 RMD160 5c642d8e45b484a15923871de6184d2576580cf8 SHA1 e829c9c3f6115637652b2124e34eb131fcdbcbb5 SHA256 9dd5c26b126ce4ce0fa6fd94105810917c675ee9ff30ffa63100e049ac66da04
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP4FAIAAoJEEdUh39IaPFNrnYH/1J8p9q7n4xZBnZFuEJiVomk
+xT6sUA7f+4hR53lnS6i9tOfNPpP9zb/3K4TICrMu3SCtAhsiCfrOd7JYS5hshkLL
+Y945U4fpK/+fESlGHr0FRMqV5elRhX620Erks5kJpdX4lM1Ix4x9kpBMuO86W30p
+89gfAHVctqJP7PV5Wb6lEI8U88U1ZCiDTrcQ78cgJ4r1XxpZCuTxUE4b4rBrWlpm
+Hc+CZCzQph+x5VPrWPOzj5pwPlh2ketVgqZ/dU22tFzTPE4ruWAgU11N+em1m7BJ
+o+mPt/zdgFo5Kmr41RedKCA12OX8SwPN6YQ+40OfBntGFlb5hLu0TFj9WmlvS5Y=
+=0yId
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild b/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild
index 4bbdc8f14c6b..06e5c8e4af1f 100644
--- a/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild
+++ b/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild,v 1.3 2012/05/05 03:52:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild,v 1.4 2012/06/19 10:14:45 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc static-libs"
 
-RDEPEND=">=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.6:2
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2.20:2
 	dev-libs/libxml2
-	>=x11-libs/pango-1.4.0
+	>=x11-libs/pango-1.4
 	>=app-text/iso-codes-0.49"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1.4 )"
 
-DOCS=( AUTHORS ChangeLog NEWS )
+DOCS="AUTHORS ChangeLog NEWS"
 
 src_prepare() {
 	epatch \
@@ -36,6 +36,8 @@ src_prepare() {
 		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
 		tests/Makefile.am || die
 
+	rm -f acinclude.m4 #420913
+
 	eautoreconf
 }
 
@@ -48,5 +50,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files
 }