Backport libtool logic from newer versions to fix building with newer autotools #539032 by Jeff.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 79 insertions, 20 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 37cc1963ced3..986ca741c04c 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.282 2015/02/15 02:18:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.283 2015/02/15 04:21:58 vapier Exp $
+
+  15 Feb 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/graphviz-2.26.3-libtool-configure.patch, graphviz-2.26.3-r4.ebuild:
+  Backport libtool logic from newer versions to fix building with newer
+  autotools #539032 by Jeff.
 
   15 Feb 2015; Mike Frysinger <vapier@gentoo.org> graphviz-2.26.3-r3.ebuild,
   graphviz-2.26.3-r4.ebuild:
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 079aab25d6bb..3125b4af59e2 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX graphviz-2.26.3-automake-1.11.2.patch 1207 SHA256 859e59ad317fdca86ee4fc85001f9988c28a88d5becc472e7174f91d51b084d3 SHA512 c3e3c155a36b3cd2910efe2fa9c69f51561a32686b51b0ce746fbebaadd044ce924e0c3c7909809b7383392c2601940f7a995064861d8f9af3875fa3e9f3b728 WHIRLPOOL 618ea0569731e1b89c0fca533c0c1ece8d79550dec9522efe86425e607bafa58bc52e4c5dadf5bb270bb0c9c16088b43924ff425453c6849030342d5d0c725fa
+AUX graphviz-2.26.3-libtool-configure.patch 1215 SHA256 c272bc4a6b19542e299e2f07f1a24d66acc3993ef22f83aa4a9becf6065af26f SHA512 a45c308c1252687b4dc2b47abfb4d15675f5c265737add66e6d0fd3018775e9aed7f6b54ef7b2bfa39c43185000c900e0f99a33d2a7f3f6b86092642f0d8c42b WHIRLPOOL e09e8d976d6eb69c8a01b3f6871313efb4c6c335eaa166db757843892276cbec45989ec2b817d710a762c80a5e8181d3703e5ac7ec05a7a147f5cc09913fead7
 AUX graphviz-2.26.3-libtool.patch 557 SHA256 a1d5f1ee6e181b78d1bd3daa36d49103ff1f2d90c85b58c1b5f3cfc7941f4b46 SHA512 89f94085fde3d496b64f903c2c1bc70b8714a89142a7ae4135aed25545e1a7cb3189617ca38606034bfa3946b089baf2917b08aed5a383e1ab62d75749a9f0c9 WHIRLPOOL 5987a50101800cc0c5db1e074628211f3ba94c220f0d457193b37c410615aa3d2ead98053435a000927bc5c90e3d7e1edda0f3b42e14abad3b102ec94f92c2f4
 AUX graphviz-2.28.0-Xaw-configure.patch 2129 SHA256 7c5c37aa637031aee0001ec57f80229a697ba184540366204fe99d2bc8ae878a SHA512 c87de7ccf1a2033499b5e4bce3765956a0b06df778a029a2db237120b8ef3870acc79a5b737e95611cffe65977f33f6ed2325ea8bc16404614d77011e6a1d6e6 WHIRLPOOL 4f41768ae1d9aa677c7e455e551c79746e90068ca2f4a71e38346a0a1403a957b3b9eb754dc5ba063e64e1e1f68039514d06f97b144f0a12f2d1ecf349b3c3cb
 AUX graphviz-2.28.0-automake-1.11.2.patch 1066 SHA256 3ce1b8b4cfc1ea5c34bcd41149216f0ae9792ee692bebca3fdd7483a3f6b88ad SHA512 04412f536b4b74f33b9fa23536ff383b6ef319d77705254253769fe85ae2e0a0b0ebdf0686ddb7e60e19059cbc3238480ae4cd2f6eaa9ca1b913c49c29badda3 WHIRLPOOL f88d6e0466325ecdc8c0e624a206d3e0d3516649ee14f0a07521ecd33daa6c12aa1bacc8b5c651d090ec5cace905aa9bdb2f3ece5550ba5db601668ed3fc7b7d
@@ -13,26 +14,26 @@ DIST graphviz-2.28.0.tar.gz 19620087 SHA256 d3aa7973c578cae4cc26d9d6498c57ed0668
 DIST graphviz-2.34.0.tar.gz 23921350 SHA256 d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764 SHA512 73dc8c25bc5747fda717d6d2162a8b37bf883544a13b487354a6000d528816a69a021f33cbeec0f6e718a7e9905ab2a04ee63f787ca7f79226055b2da21f4832 WHIRLPOOL 0fe3bf7420eccef9de51789ae9a8d8cab55b6fae7382e557604fb974e04eaa1e0610392dc7f6d5fa85a0b83a3cc955a4ff08d594bf8805c7f06625c7d9ac9007
 DIST graphviz-2.36.0.tar.gz 23846318 SHA256 37fd66d8def158575c75c4f6dbf536839e4ee468aa59314eb472d1aecb076361 SHA512 cca1339cea8d36acbae647a78ff6743a4f77bfa208e74fef615a99dc7d380d2a0a0f0b3fc00de09a9f67c3fad16dc3837ef3aefbfce5a8a3d0f974ed5afbbab5 WHIRLPOOL c9f25f28869afef943121a24b580518d822eb76f30b4c874554f2f1dd4f16ffaf2683644c59746f4295aa574c4b5541f1205787870eed5567cd4bd5c755e5f8b
 EBUILD graphviz-2.26.3-r3.ebuild 5816 SHA256 88e45bb787f7883700f10fc8901087a65e6d7118428976b39b7bced512af7773 SHA512 f61e38fdffc0ffbfbe3e4193a94814abde28ec16a73a44dd6835431472db608510fcc14eb98c6ef238d6129345a351a91bbca0a98cbea841ad5f18eed3bc610c WHIRLPOOL 4f480bfe8f338c5b351ef9402a543a6b313078a8c7ebe54a8766f1d411dd8315c34694b055fa4d18e83103c7fba8e063678335eb3fe8aeea6d3149f2cd5ba1fc
-EBUILD graphviz-2.26.3-r4.ebuild 6067 SHA256 7bb7a3400c04410f0816ff0f78dcdb28f0d709059678b10b2c9688987e2e498e SHA512 89a61e171e3521048d0f8c32838c4b3848ce9fc9de2b661cf6d9834dc753fdfda84ca72e9d18ea07d7cf827e46839aabce145b606dd1126e2a7eeee21825782f WHIRLPOOL dc76666031a4eacc78f0da12a663666c08b5a65a2e248fb1312c6417cf59c6bbdf4ea9857b1c087e49e484a257ea2e4ea9ecdcace3fa4f8862d1e9fde89c9714
+EBUILD graphviz-2.26.3-r4.ebuild 6122 SHA256 e82ec4786ed1ed2f0c8ae01108371b5c75194621a2f18b2d3441afa989fb7482 SHA512 e735c49b7d747a759225918c8790e8520c9305c042ac923f47fe69b9f429afe6b32d8bdebb4015003074be2755a6ac86c6c2c445c071fbc06ac2e12fd28c3aea WHIRLPOOL bb8a22a2169bc811cd8369ee6c7e2f74d13e89def4008e2271fdfd03cb91a548d01bbd2ab9d4c48f4b49ff49795ddfa91225022fd5b903d8e2b1750e792c442a
 EBUILD graphviz-2.28.0.ebuild 7570 SHA256 f54830c17e11a40aa67697ca064234bf1323e6d6b87333cb8b2555b30cdfc87b SHA512 10446d13f97301ff7bbf2b158961aa0af4153f5192979b74dfe564c3b178a037dd7a158071bc2731e10b1c7e84234c706017f0282f821139c80db7f43ef8a863 WHIRLPOOL a9d3f3ea88458676d2bd5e1a9f06d1fce3de2317d0a29b664316b1ebaf302e35f6cd68789cc3707a0bfe7cf99e9570db60b0227b6041c19fac293d146527d62b
 EBUILD graphviz-2.34.0.ebuild 7758 SHA256 7809ed007e350175b5d9339eae08a897b897fa5dbee8fc2f51bf256ed4ff8ead SHA512 53e08239802086055e3ea67d6f5fd03748ab6aae007ae9eee2e6834e39ac70333e892093c6968539e4a8e30aef0f5ef4d2133bc2b22ca8aeffabbf5be83373c2 WHIRLPOOL 6cd05f19207070cddf8b1f849705a2c51f6e3e600d6a7c3b9df05bb5297cc7d5448d7f432219b2dcdce88f85bc343f56a655804524fe1dfd790e1c1ca66a5de5
 EBUILD graphviz-2.36.0.ebuild 7551 SHA256 c7ce5f48264d3720551ee2700fb77570e70114b69165f684b4a69d5acd350259 SHA512 41c26ea92b75b5493137f5ac90a7916d59799a9d5029c29b5b2a0d5df2e5aa5e68d76f3eee07927b1fbf6eb3bc6414e8672cae1417b11034359757fadfa9e5b8 WHIRLPOOL fb5664ceb805efdc3db0b7c1071d451b2d363a361a69da442e0f4a21119b645c79a4cc695bab7798ced27e25d6d534cd93d5ab0dfb5ddbce9f75c2b3f5325405
-MISC ChangeLog 42071 SHA256 e19c74f9912da6352db717fd3a370c62e8289a945e0e85f6937cb66bbd5bfc86 SHA512 04513a9ab88b838940e6b135fac36b1735dec13b65df4319b1f045e9ca20b90208c3ab02be5ced9f48c0c3708ef0475452e03c8c34e4c1a2715ae12abc4bc10d WHIRLPOOL 92160aca36ebff28ea22ab59d6a1404b8ceed49061f255811697c178838744b14b90bde6515e0c8c08ea04ffc2b1cf126db8d747508a73657dc219a3cd19926f
+MISC ChangeLog 42300 SHA256 93b9181538a6d43dff6ffb789283a8c91f3b42e04f5668ba6ea544924f50e574 SHA512 e9880e4219406b2cb5524fe95bddb4ca7bb7ba0a86913abc90fd9ebeaa738760e778553a67913592cb1e997388b6ba9a1c0a0c6f91565f2787f34a23c50d9263 WHIRLPOOL aa08865cabf3d9300b4b477e9944d4608b59fd1f2df0899707b48a0211d56e72f66491fd7280dfccb1619d220b5cfec6e118074742daec3a7aee18765a278470
 MISC metadata.xml 2141 SHA256 6b3987caeb4fa056866bd10ccbc02e70c0b265a171444e79a580566e9f36bfc9 SHA512 e1d5704faecb2d5ba8011cc9eaaaf0a7efe5c92ab06765d14db78cf29933589bbc6b802e9b0661a9808cd145b314caf9f3b3f767dfbd1d4e243a7d8ae7fab4fc WHIRLPOOL 960b186445cee7e15d60eed6702adccec21b6da296085fad91316a5bb1acff29e8a656446af7bcc0add5966f402bac251253f2b26c5c13dedcc9879156a0dad5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4AIVAAoJEPGu1DbS6WIAVwEP/RDcoqiQgWw0hz5EwVGzdXoQ
-a2M41bqUKjTe953aFBDBDNHRTIEUtXhONrkSYsYiIwmd9thGGTsStIfdC6WhHjBC
-OJj5aErQ4wfFk8+rB/ibbQXBe+Or+JZ3Q0TGI30WVYUBUsMjJ3+RUAjs8taoA+T9
-TMS5tUSUlgZ0VFVgYNXj5C+hQtz265NluoP7hTVq2eYtO+4o7J1z3VZFqSiYT8Vi
-vL86fMRWzKRYF6DBSYHv7N96V3fz85l8Si6OZEipK1wS6Av7doxjIS0datmnYeaQ
-k3+oOJ229OvQBZ0Lx5V3KXYTIGV+hPXLYYqdYWgK4F+vZ8n2zylaQ/Be3j0Kt+rv
-tJfkrCGffzbK7/ik1erIzCRWknNhzZJojeN2UPZqgHPaZspfBwVh73tR21LVp+KG
-aJ5TBwasiBjsO7PtFSoG713R2n5avz7gVEoXRopO0SYapGuawqqrTzCPnkXuedSY
-Nn0T855jGgf/RmHMFy+WL4GvyMD9BFRC3jbn+eWNIDK/gKYl6DuQgWCcGDaUA+M5
-8kvGzSwoeYTeGWJp/sxUCUlOG0pixulzVl/PkQTJGyQQwT8g7YezW0FYUeEeMzxK
-KDdOQ+HqNt4qLgL9cDICGebJyDPBh6wf1IdVv4M8rrIesSPjsxydkxCoQfJ64BP6
-6ah74slZ5KTOCUuMZGMa
-=J7A1
+iQIcBAEBCAAGBQJU4B7oAAoJEPGu1DbS6WIA4eEP/32X/pwdC3LQ1SlMRxGWQvIB
+nC7Ru7N6YpNTr0KkKITIf5jtbcPZWuqQ7F79VrBj9o5GIS8JGkiwE2Uzb8P+gdW9
+8dVRN9FV9EwT7oB8wFsWlYpf6SWYIbXmPJs4erwx25s7S0lGCqdGKceoTAm71+V3
+2O/dLAHUfIw0L16/Atq/PY4TKtsAZXdDm4NG2losBAx04egI/0Z8fDFZf7sLR6T9
+uMvA61InUT/Lk2YUz8UgeRV+lwlDazfRY0hr4rFl1xSbeM9fGcJbZC7qiWVrwqd/
+ohMY3PLsdOQ/1OACma5hAcxl5oc9WmK+DQrhkGCZB+R+h6y7eicVpj4U2jkBb7w7
+N12Sb+0xJ8mQk03XL5LnPbgMF4r6oN/5K/zx/Bf0TCeuLWI+9l/+e8Z+4iq9GX6D
+VpDPwINx2xmTETV5sBmfv3LWrVQcajc1Y0Pr6M3S+G5y+ctNKfyP8GRILSAqS4Ce
+tB0PHDrgIO/VPEsFZZM8wagA9EosltDqtCyC0Uxuj2OCQa9otTkmDSxys7fwPfpt
+DzQNXYDxOq8eAAiRqHsYw+NMonwegRiVZZOPN09b35A6qn5B30M42Sm1L9BekV8G
+rvodgRa7khhM8fM+HvO6h6fwEhTM0poZeedosUSb5R9adUK1Yn+h4SFNdFywG8ws
+Ze1Ya9F7CsxaCG5PDtnr
+=zFiq
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch b/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch
new file mode 100644
index 000000000000..142aea2843fd
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch
@@ -0,0 +1,52 @@
+backport newer libtool logic
+
+https://bugs.gentoo.org/539032
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -464,28 +464,15 @@
+ dnl -----------------------------------
+ dnl libtool ltdl on-demand plugin loading
+ 
+-m4_ifdef([LT_INIT],
+-    [ #code that is for Libtool 2.x
+-AM_PROG_LIBTOOL
+-    ],
+-    [ #code that is for 1.5.x
+-    ])
++LT_INIT([dlopen])
++LT_CONFIG_LTDL_DIR([libltdl])
++LTDL_INIT
++
+ AC_ARG_ENABLE(ltdl,
+   [AS_HELP_STRING([--enable-ltdl],[support on-demand plugin loading])])
+ if test "x$enable_ltdl" != "xno"; then
+   AC_DEFINE(ENABLE_LTDL,1,[Define if you want on-demand plugin loading])
+-  AC_LIBTOOL_DLOPEN
+-m4_ifdef([LT_INIT],
+-    [ #code that is for Libtool 2.x
+-  LT_CONFIG_LTDL_DIR([libltdl])
+-  LTDL_INIT
+-    ],
+-    [ #code that is for 1.5.x
+-  AC_CONFIG_SUBDIRS([libltdl])
+-    ])
+   use_ltdl="Yes"
+-  
+-  AC_LIBLTDL_CONVENIENCE
+   if test "x$DARWIN9" = "xyes"; then
+      LIBLTDL_LDFLAGS="-Wl,-unexported_symbol,_lt_*"
+   fi
+@@ -494,12 +483,6 @@
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+ AC_SUBST(LIBLTDL_LDFLAGS)
+-m4_ifdef([LT_INIT],
+-    [ #code that is for Libtool 2.x
+-    ],
+-    [ #code that is for 1.5.x
+-AM_PROG_LIBTOOL
+-    ])
+ 
+ # Checks for libraries.
+ #AC_CHECK_LIB([ICE], [main])
diff --git a/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild
index 1affe207b3f6..cac27cf0efb1 100644
--- a/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild
+++ b/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild,v 1.15 2015/02/15 02:18:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild,v 1.16 2015/02/15 04:21:58 vapier Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2"
@@ -107,6 +107,7 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-libtool.patch \
+		"${FILESDIR}"/${P}-libtool-configure.patch \
 		"${FILESDIR}"/${P}-automake-1.11.2.patch
 
 	# ToDo: Do the same thing for examples and/or
@@ -118,9 +119,9 @@ src_prepare() {
 	fi
 
 	# This is an old version of libtool
+	# use the ./configure option to exclude its use, and
+	# delete the dir since we don't need to eautoreconf it
 	rm -rf libltdl
-	sed -i -e '/libltdl/d' configure.ac || die
-	sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac || die
 
 	# no nls, no gettext, no iconv macro, so disable it
 	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
@@ -139,7 +140,7 @@ src_prepare() {
 
 src_configure() {
 	# libtool file collision, bug 276609
-	local myconf="--disable-ltdl-install"
+	local myconf="--without-included-ltdl --disable-ltdl-install"
 
 	# Core functionality:
 	# All of X, cairo-output, gtk need the pango+cairo functionality