Fix automake-1.13 compatibility per bug#467058, fix ltdl subpackage, thanks to Ulrich Müller

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xBF20DC51

3 files changed, 13 insertions, 8 deletions

diff --git a/dev-libs/libmcrypt/ChangeLog b/dev-libs/libmcrypt/ChangeLog
index 062074012d83..09c40e54aef7 100644
--- a/dev-libs/libmcrypt/ChangeLog
+++ b/dev-libs/libmcrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libmcrypt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.62 2013/05/04 21:15:16 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.63 2013/05/05 08:33:29 alonbl Exp $
+
+  05 May 2013; Alon Bar-Lev <alonbl@gentoo.org> libmcrypt-2.5.8-r3.ebuild:
+  Fix automake-1.13 compatibility per bug#467058, fix ltdl subpackage, thanks to
+  Ulrich Müller
 
 *libmcrypt-2.5.8-r3 (04 May 2013)
 
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index 6f67d7810b3a..f986c91efdc5 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX libmcrypt-2.5.8-rotate-mask.patch 1054 SHA256 19a8469b95ef413699fa024676d83be4bfc6310b1757ecdb161ea4b82e1fc691 SHA512 adaca6a830f9775ad11e6c7d73bfeb18780e8a95c7cda72fb524b61c56d5bda9b59343ac4173270f334658e3afa69748bee287123f17e47fbd1c5c2783f0a08f WHIRLPOOL 1d82e33546be85beecb3f2d2585f631ab6c5da5f9025ced491df0d858834bfa1bf83425762dc953bcdc683ddd340d446671f245b3c8324b28ea4585d3a4f2e9b
 DIST libmcrypt-2.5.8.tar.gz 1335178 SHA256 e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1 WHIRLPOOL 2fbe22466ecd42161e0de75dfdcdd42edd7f5f1422a2fd9b8bc4bf81f7005749e500058bbb62827f8be34fb707c70fd5920f37b2e27743814d96dd89c03f7deb
 EBUILD libmcrypt-2.5.8-r2.ebuild 1041 SHA256 ba47b6bfa11bacce31bb9255dcb3819fc62e16372d8971bb9105c5c4b897654c SHA512 8745869b155df574bd604a22e0f94d2e1e2113cd2e4d6f08df931614a93f951e2f2e492b9d4fdfc37696953aa2bc95c25ab4fbbbd1c327dbdeac44f5fd160fa5 WHIRLPOOL ac8eb0d3be3dffb33006f73c45216dedaa25f6399893854c23388d27fdda4b68ec20dc5e45add4fd19690c09a8593376f7edf34402aec64f5d7c13cb95ef22d3
-EBUILD libmcrypt-2.5.8-r3.ebuild 1090 SHA256 9825b85c4bf65af7e19b3fa524587c1bcdd2228629cce1393d8aa01e97a33123 SHA512 63b0676fa1428e2076f75de30d3b02378f4fb47844caa88696e0019bc385c06b94e4448bafd9cb8eb59a84c1e1cda14f84c58770208d77db676e5bfb1708b530 WHIRLPOOL 95a5987c2e6867ed8a5d2fa22fbf8eea724d7c70bbee06305380756188aaf02c66444edde38b0634f641630bf7b0dd015e699244ea269c654ea60172098cb499
-MISC ChangeLog 7738 SHA256 39f6b112f7f44f8b346fa8ff03b61ce8a2bab0e7148f3a413a1d01837e4b7ff8 SHA512 3c7b80c6c23239d5aa65598588e1a7081e5e11cf90a914432d12761fba48e69f052716a0f9f6243edbd1110a04babb9e89b336f042ca726b31ffeac9f44f8168 WHIRLPOOL 55e627d25fbf673ad256fe1f2380cd6271263234155c140e457928744aebaff62b8ab845c7150a230c96fdcb0dce716ff0189205fc2af742881d744dc75aae88
+EBUILD libmcrypt-2.5.8-r3.ebuild 1157 SHA256 937672060cc2855eeb618af6686ff2c12bc8ceec9908003d8efff8680370234e SHA512 42ac58490fcc9f1c670239558c0ff83610e0c356f0eda395405b67f780d5f141e369deba8f13cdc56862e397de1753b441557e79b16a317d92725670e03a7879 WHIRLPOOL a5a10521070db1e6f40fda9ff8c75e91c43a5063695b2dfc0cef1c112cabab07b0802d67851a1c4e792fbcd1ecbce25a4027db1589440a36bbf1079f629f4ad0
+MISC ChangeLog 7912 SHA256 21b728f66ae6e6cb12b32a2669e886a8806f5641f3354dc5c10656875fb2f0aa SHA512 627895f0ee81067f7cca2e6ce65cbb51fe1adb839a22e502368da542246ed021c9492ccd810cc38a126d388eb379b27a4ca04e9a72a294ff61e3fcf72e8c983b WHIRLPOOL 362d5787792d66accf2f11b746e19d1185ba4d98075dcadcd183b0ebc7890ef01d3d8884a1e5534279834713b0573b35347a5fde367091f607c69db75fe3566e
 MISC metadata.xml 278 SHA256 cdf12b5eab3aa2d9fc1e9fc4bb81ad42131e7d5e25483b7672a03fc3e486cda6 SHA512 176f10a7e71c131ae1360892e6caa9fdfcde541991e1e335e0db633ae3dc548ae18e5533ee1240eecfc237133f7e2839ceac094ba699e1d88490c1dedceccb20 WHIRLPOOL a2c01f8ae67af811103c9c5c2ff65f87b8c52bca1477423b1beeee95e9ee0ce88aed5544423eeda389c3b2974be441d54f8ace5fb50447ff37be078a52733312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGFemgACgkQXYk9GL8g3FHN7wD8CsAPuxqZruNfXXdiRpxt3CAP
-qfjY/95Jf9kiQocAIYEA/RHfkA1ZXCg48wrFZa717gSR8DML83NZ94pnnlzgzP3E
-=oMFt
+iF4EAREIAAYFAlGGGV4ACgkQXYk9GL8g3FGJWwD/WlP3iweaEILUH0iLJmnKuq0/
+Cqib+hVgvIbRlKu2hZcBAJ5GiN1+Rk2V9Bobslg+C2xYjOHHqiM3xrTmUJt4TDNS
+=+tUv
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild
index 2421b0f41009..b097a7dd11c6 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild,v 1.1 2013/05/04 21:15:16 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild,v 1.2 2013/05/05 08:33:29 alonbl Exp $
 
 EAPI="5"
 
@@ -21,7 +21,8 @@ RDEPEND=""
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-rotate-mask.patch
 	mv configure.in configure.ac
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	mv libltdl/configure.in libltdl/configure.ac
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac libltdl/configure.ac || die
 	eautoreconf # need new libtool for interix (elibtoolize would suffice for freebsd)
 }