Fix eautoreconf call and use new la files punt function from eutils. Fixes bug#435292. Patch provided by Alphat-PC.

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

3 files changed, 31 insertions, 11 deletions

diff --git a/app-text/enchant/ChangeLog b/app-text/enchant/ChangeLog
index 3c628c540231..86bd37170fce 100644
--- a/app-text/enchant/ChangeLog
+++ b/app-text/enchant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/enchant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enchant/ChangeLog,v 1.122 2012/05/18 08:30:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/enchant/ChangeLog,v 1.123 2012/09/19 19:31:17 scarabeus Exp $
+
+  19 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> enchant-1.6.0.ebuild:
+  Fix eautoreconf call and use new la files punt function from eutils. Fixes
+  bug#435292. Patch provided by Alphat-PC.
 
   18 May 2012; Alexis Ballier <aballier@gentoo.org> enchant-1.6.0.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 224ab34b2381..1686b2e001b8 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST enchant-1.6.0.tar.gz 607018 SHA256 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f SHA512 0ca1634bb783df51512df4abecc89abdadee6baf7330d6e5f90cc15d10779896a3521a1c079ecc07e4df4f7a018ce398cca9d0125a7845a314a059840ebc9137 WHIRLPOOL f6677a11f1d05e210cbd6a7b13f3987ea93b3f1e73537b048093c14686b0310e75a89fdb8798ad0ed386a7e1cd793f60820006df8c1f7919c46c7245ee6a74c9
-EBUILD enchant-1.6.0.ebuild 1613 SHA256 a66dbf01551742545563d747ac33b78ed218560844c3a7fed286260035ea4f28 SHA512 258fc84643bd75a4aa6aabb8cdc9784027c77eba205ea85ed44fbed43b2acc449858e33926f319171bce340abe1a822a578275580c3ff7e28a2f2bc9ad066d6b WHIRLPOOL 1251e3e342ae638f1bcfb32485574aca386d98519964f40a05a68deba18cf7d9096f6c7a539edd802facc6bfea8f2290a01ed2a6228c9fe5aa1ccab4d14dd575
-MISC ChangeLog 13839 SHA256 291168f1f4091fb97e88ca8077865ff6e833abe726768ffcaf312e69ecb655d8 SHA512 a49d9bca8baf7b770b32f3096d20bf4f687b011777727fb0647e7c031f5b73cc015522d848d458edb3ea3f6a3673d8a81c9fa02a55b7ed89dc50869e5e774a80 WHIRLPOOL b484b9ca8d07dbfe731b6be7695cbbe71ebb1d17ad0bff9bad440baaca81ce6bbb07a5eae49b7e1c41f26de1e5dd675090544092ab0eee2971d4885208b495b1
+EBUILD enchant-1.6.0.ebuild 1476 SHA256 bb0a6af51909aaa82a83b74f3f2ebd51a52b7ed26f17c2716e79e74438b53493 SHA512 bffe19cad2b0b9494ef1704117eb8bab9ccb54ea6f06d850d3f9b59c249a3bde53e0c518f3ecd64591833bcef4b0a76c30b1180f683b687727eaed0d77f71a93 WHIRLPOOL b88c0a30320242d209594fbc9976a0e38d0d2be3b510bc413a129b57799603990c06545a7263ef2356ea15c459e5089d94874f6074fc2d2f5f86539a9f1005c6
+MISC ChangeLog 14038 SHA256 3d812baa257b05cb52997a734246de971bc2d0dcdfc1442a959185bf58e7659a SHA512 895a751710df1b48baed680459806030fd5041ad1795403ce78c269596167c9b391f4712935d99e0131d89def0e5810b24c172c879ff519ba1ddcabf41d4cf31 WHIRLPOOL 3c0c541fef95c66db0accaff6951bfec09b060f6892396bafc9c078e2d15256de659bbeb1464891550965d72656d31071e90982f1b4f00ff9405d77eef9ac207
 MISC metadata.xml 622 SHA256 cd66e8b18f230a42b2f33706115eed1c75119bb367a9268e6143260302a44282 SHA512 b0da3a3b57153f0be70714aebf293ea829f712fbe2774e955498f5465df52e75f39d8b411c31e54445b1d93256faaa061070dc6518b884d78b8752e72019e4be WHIRLPOOL 71d00054bbe36ea54aefde39784b6d8ee0effbd3dc689cb61792889ae802fa0c87877629e8a1d3c484d0a03ff76c94511957bd8b0d7e85ed34c1660788c69602
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQWh2RAAoJEOSiRoyO7jvoHEAQAKh3zsPT1X+jK3WdpiF8Yvj9
+SK3mS/8bV3ekdWc04nB4yduN7TzxJ5J6zLHhmZT/WnnuNGTLD5ivnJYoRDDeC2l6
+Ha0H3oKP1utyZUhGRcLhuz+KG4iTPqrPIolo5y3Ndm+uflMUD1l8XnJWtEVH9CXV
+I+wo3grKRYTV2CdhCw6rnqkpt0H0qr/+5FJxu1P0dBTlHTF7O4BrjjxvK37OfmmU
+XPc4e3cDRBsGHGfSVg/QosbbU9NNEFxSVzrz2509TCMsfD5FMYWKVdLoYoBoCKIR
+3uR5TzaoIcEDurbbXGTWvVuQ1tAZ7aH7VJXMZMBOfkFN+MoVqMmy/8IaeU+mRhwh
+0utYdzyaAZNM1E1mfQV5rwMUFLu/lRzm9eRHIMEcHq9J9BgxC9TLUAUaSkgqx6Y6
+Nzr1gLSxR0sYQCS584PeqhqJBpgVc1Y6VOvhU2J6V/QUhCRrWOQaVfkqCAwz0snZ
+8c29Ih+6bvwBwTGdu91hxnWAKWEvyG0G4wluLHBMu9aRR+iGxSI1/+Xjn2fz7HyM
+dddPBz9ql1QpWkVGBTbJ/nW/HpMj4y3J876M/SvTeLz/iHrY+Ga9HmxRyTgRJtmq
+URfiRpBzEpfNoA6W1KdwvbJxyvDb3E0CnDE5SwYPV4wNogXKBZATHw24Eoi6D/uq
+2zT9PyWXUqUHwWK/2cjL
+=rwIC
+-----END PGP SIGNATURE-----
diff --git a/app-text/enchant/enchant-1.6.0.ebuild b/app-text/enchant/enchant-1.6.0.ebuild
index 7e368842c940..e28f8074144f 100644
--- a/app-text/enchant/enchant-1.6.0.ebuild
+++ b/app-text/enchant/enchant-1.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enchant/enchant-1.6.0.ebuild,v 1.16 2012/05/18 08:30:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/enchant/enchant-1.6.0.ebuild,v 1.17 2012/09/19 19:31:17 scarabeus Exp $
 
 EAPI=4
 
-inherit libtool autotools
+inherit eutils autotools
 
 DESCRIPTION="Spellchecker wrapping library"
 HOMEPAGE="http://www.abisource.com/enchant/"
@@ -23,7 +23,6 @@ COMMON_DEPENDS="dev-libs/glib:2
 RDEPEND="${COMMON_DEPENDS}
 	zemberek? ( app-text/zemberek-server )"
 
-# libtool is needed for the install-sh to work
 DEPEND="${COMMON_DEPENDS}
 	virtual/pkgconfig"
 
@@ -35,7 +34,7 @@ src_prepare() {
 	sed -i \
 		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
 		tests/Makefile.am || die
-	eautoreconf
+	AT_M4DIR=ac-helpers eautoreconf
 }
 
 src_configure() {
@@ -52,8 +51,5 @@ src_configure() {
 src_install() {
 	default
 
-	if ! use static-libs; then
-		# Remove useless .la files
-		find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-	fi
+	prune_libtool_files --all
 }