Depend on libltdl rather than libtool #528294 by Pacho Ramos.

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

3 files changed, 75 insertions, 5 deletions

diff --git a/app-emulation/ski/ChangeLog b/app-emulation/ski/ChangeLog
index cff7e767c9cf..2bcfdc19a10a 100644
--- a/app-emulation/ski/ChangeLog
+++ b/app-emulation/ski/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/ski
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ski/ChangeLog,v 1.7 2014/08/19 06:59:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ski/ChangeLog,v 1.8 2014/11/05 16:11:10 vapier Exp $
+
+*ski-1.3.2-r1 (05 Nov 2014)
+
+  05 Nov 2014; Mike Frysinger <vapier@gentoo.org> +ski-1.3.2-r1.ebuild:
+  Depend on libltdl rather than libtool #528294 by Pacho Ramos.
 
   19 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   +files/ski-1.3.2-binutils.patch, ski-1.3.2.ebuild:
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index 36be728503b9..3999adecc948 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -8,13 +8,24 @@ AUX ski-1.3.2-no-local-ltdl.patch 366 SHA256 2cf7edfe93c6e99e94b3311f9eadf4eec85
 AUX ski-1.3.2-remove-hayes.patch 682 SHA256 8773ce8867e7cde313ce32a84a427e5e593fea55d6d447ee09ff2e2414ead4f1 SHA512 efbaac0e9c6d1423def13d22b361aa9e7766b8959f2def6e146e12e74393f142b0212e2234ba2753aa71e19b6a0c30e86a74a05026efba2db01229d1a7e43a5e WHIRLPOOL 5b962643c5674612c1f9c713f3268dd2aeedeb7200b84c3bdcca77063773e36e5f158897b53490f1af5701d6bf8102b426af97bacb58ac543485a18aebcb508d
 AUX ski-1.3.2-syscall-linux-includes.patch 397 SHA256 0325662033c7674b275dbc2caa8e294a0d903e53266043d5a0551e67ba1ed56f SHA512 f0784af8eb8ecc8df92f96f1ce2f714f4cb1a9e60409a06c02cf300316a9680b01be6b6d1f83854b1fb3bd364cf0b08262a99a63190695fd9722691ef1fa3d6f WHIRLPOOL 0c76d91c77ebb3a5483971ab3c5f47612b59ca415eaee2f9278347f4afc755f67494386b0b3cba8350bacda60fbc05a05f4adeecac85bf69d136678ab19396eb
 DIST ski-1.3.2.tar.gz 2715791 SHA256 34b2a1b2575d6c8703df8f1f3980f7b668e744c4a03f20ed4ed91d40cf40c076 SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0 WHIRLPOOL a6b00dc928612a37c33dc3dacd8a53f749ffa660f3aef5572b214e5c97ed93728e987c4be8abb2d375e0a84eb3037f9de490f3f0474a579e3c0476e50d6010ef
+EBUILD ski-1.3.2-r1.ebuild 1255 SHA256 748cb03f1f1b2fd83a7b3e4cd88784a4de44ff3ad8b93564be121e8096b19564 SHA512 9729dda348d059603da4eceabaa4e5e4e9b6a29127a26c93b4cf8770646fce74b19988a6c1f21bd84bc1f8d0977554da73fdc9cc782f7dc8bfae7475254c0c20 WHIRLPOOL 7a23f3632a6a88babf6eebfe4fc3fc817850578cee86803fe55509727139e78e2133bcc93ee480a14da945f65ab58de7035b8ad698ae2a4020ab7d203d1a883a
 EBUILD ski-1.3.2.ebuild 1292 SHA256 a0a7572084c6673cc8d5ee55a66567abed1182055285669eb7726a1a3ed148e8 SHA512 1d88e2d4b98d68ea68e656400116fbf6b2a6f15b5ad1cb89f3c46cddea91f227e817a5ca545b17c2db510aa1086196ac5ba1346e82f22dd1bfd684f539b68cd7 WHIRLPOOL adc0ad05956ee86d68a2df6259a8f2d449f9a3d49893d8dab60b618944cdda5869590029d2803f3e4dde1b4936b6870ddb4a19a3999c9d48b9187554e850efcb
-MISC ChangeLog 1433 SHA256 df4af9155e2c889d7eeb980c4466b0fd936ce8b3c8aace4efc116193748445f0 SHA512 b23843c1163f971ff514721d94f59c9499335b5e55ae6e81f9217802e33c9a66b3b8cc3c50096645e6d1b6bed9dc21e601b1503d34747e42d407b013b0ebaf93 WHIRLPOOL 8243b64b9eaa3c461e99b5130956e1066a44838285a8f142adf7aa763c3bcd2e1b940fe3803e146fbafee4fed1df1f82d5b79fd535587118eccbd73e23985003
+MISC ChangeLog 1599 SHA256 258c10a2c1785e1740662e3e3c5e4ee0f694a61bcdcea28ac488ebab139599ca SHA512 24371648cd03acd51a72f098df8e37bfb8e6f11cfaa6bdc465f37ce77c831c7497454d24c5e9cf2f1abad319c9432b6c4d44825a4d6bb0af8730465051ce454e WHIRLPOOL c52639b09ff5d63818893f802b510d67e4df5c51832d01459688e63621f47703ddd57ad1ecff945d725d9112529cb887be129b1af6aff6d9a2fdba3e0486f744
 MISC metadata.xml 157 SHA256 7e261fbe78f2088ab2a27fe3bd23a4224dde9a11031edcb4b7bb95dd3ba1fe4a SHA512 0d0a45c88d8f80bd12c6f182387db789e11fb77de5f17f6896e638d1f57be0e207f8a0bdb63c4cbf570d30fb9d4d9928374bddd26bd035dd13485779158e078f WHIRLPOOL 431702b09d79742c3946fca1ee4adc8c7dc7bc1f35b8baa9db077208d540808a9dd774077e268a18b72cbe97305165b599a2cb4553f514691697da7f2251418b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPy9ccACgkQcaHudmEf86o5twCeO+x17a78WYWCm9j62r6hzaW+
-aiQAnRC8FHFRex5XICp8J/PexkZOFtOd
-=uSMw
+iQIcBAEBCAAGBQJUWkwfAAoJEPGu1DbS6WIAqkoP/0+DYrgw0S36YNxa/quzi6Rf
+l3WnbxAoftXEYQnVssj5qbdrejM+Fjldv8CN+ZrQuRUazlA5uRWIWcu/4OVOyFZ3
+2Zn3GklteQAwfwwefDPp3hrTN8vl4H5F6k7msQsPzz797AHRu232anmuQH6pfJdb
+Y28FKEQ8bwYK94WleeGr+0Ac5XA76mKP45TEKNjWaEBEFS0pa8qqSKXzycIsB4Av
+dZwleL9pTS/Wv9HvhSSRUhsswqRbCSlhAgy2VuQJUItqWmP9H52Cg8VmPJOUNMZO
+yCfWvHoc6m0lOZ/7b5usyGWVJY5Nwl82571ZUJ9nPBUiGzpksaY9CDs/nGHSwuFN
+KMk1CCmhXQlgo93mY9TPglILGrdAV0JZBzlggXibp0iKl9timuNl9gwkU2Igx/Dg
+ljmPNrJKQphfBXsxvDrCRS6t2+phf0HabKcHSltqEccA15CN1Hk3dsYVRJM8X6xe
+qGIVVfjVHS+473kAQyy74m39stgtv9E384EJ+q07nO5niGDEQiuij32Rcn3abtqs
+p8wZkR6/8J8+M0Z5uv58SE/rfG9lSktKGrnMIcFc8Jk23Hk/QAGHjL2YY4kpjGOU
+Dj+vBLBsQlSb796Gd01VPItRCSno9dvWfigqpISMoxH7M6ofuoy2WuYuGxtWhaUd
+vsfuMigXheWJRhAt06K0
+=FQc7
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ski/ski-1.3.2-r1.ebuild b/app-emulation/ski/ski-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..46e9c937a890
--- /dev/null
+++ b/app-emulation/ski/ski-1.3.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ski/ski-1.3.2-r1.ebuild,v 1.1 2014/11/05 16:11:10 vapier Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="ia64 instruction set simulator"
+HOMEPAGE="http://ski.sourceforge.net/ http://www.gelato.unsw.edu.au/IA64wiki/SkiSimulator"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk motif"
+
+RDEPEND="dev-libs/libltdl
+	|| ( dev-libs/elfutils dev-libs/libelf )
+	sys-libs/ncurses
+	gtk? (
+		gnome-base/libglade:2.0
+		gnome-base/libgnomeui
+		x11-libs/gtk+:2
+	)
+	motif? ( x11-libs/motif )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	dev-util/gperf"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-syscall-linux-includes.patch
+	"${FILESDIR}"/${P}-remove-hayes.patch
+	"${FILESDIR}"/${P}-no-local-ltdl.patch
+	"${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
+	"${FILESDIR}"/${P}-configure-withval.patch
+	"${FILESDIR}"/${P}-binutils.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
+
+	AT_M4DIR="macros" eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-included-ltdl \
+		$(use_with gtk) \
+		$(use_with motif x11)
+}