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, 94 insertions, 6 deletions

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index f748459f3877..700371d8bc17 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hwloc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.47 2014/10/16 04:07:07 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.48 2014/11/06 05:48:50 vapier Exp $
+
+*hwloc-1.10.0-r1 (06 Nov 2014)
+
+  06 Nov 2014; Mike Frysinger <vapier@gentoo.org> +hwloc-1.10.0-r1.ebuild:
+  Depend on libltdl rather than libtool #528294 by Pacho Ramos.
 
 *hwloc-1.10.0 (16 Oct 2014)
 
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 6e42cde033b4..17b32819840c 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -8,18 +8,29 @@ DIST hwloc-1.6.2.tar.bz2 3066020 SHA256 fd4d47738afc9c5f60d2c35f0963f82feb78bb57
 DIST hwloc-1.7.2.tar.bz2 3165052 SHA256 a0b40c01eead1d4c254ab87c2ec75b8eeb9877331763fbd1e1b81990ad566848 SHA512 e6472fb0639a178683ea7bbef666255a73c1962c360d22490e4aee6642da1d30648d2f057e11b529d91bf76da05d47632331d84dd0a7771c5732cc7cc90e7d7c WHIRLPOOL 6f39a871777e28cfb1f87f6a5c9c7ef02a31bf4a8178f7eeb43ec9eeef42132c8d432d803e66198129017f68228e3aa738a774665d0e8400f5617af81cc61f7c
 DIST hwloc-1.8.1.tar.bz2 3647451 SHA256 976d1edb3ad141e3510c959fb47f415acc95a90170b361b390768512f30ca10d SHA512 3ef7db6e41186b1a3dd2df717d599813401a31f696530ca4196689c85ff8a18ef6f5a11be7feb656e49e0047058beb759c995d9b8a422367d99c52ae5274ee77 WHIRLPOOL 471796a5c32b6582b6b89cff24889826e63a6ed5e75bb3084c749d73b649fa562aa8272889f2218af35cfc93012bd05504017ae7f25447270363c9c7b85638c8
 DIST hwloc-1.9.tar.bz2 3682256 SHA256 24a81ff1c3810f16633bf5ad3fb80cbbaf882e466a788af4301b2911698c4f7e SHA512 6697f02c954525ae6b24fb22e738b8b8383f33bbd941ab757829e7406a96f037edc2841fb50335ec26bc53573e00bf9295c2e8d574b7b3bb687c02189d87fd74 WHIRLPOOL 4eb9d0bfb5c615577f4b2debd49d5c042c4b844362aaac6d757b2ab10d845aeeb9c918e2153d32d51ecb88b9d1fc0818fe1a2a90eed3413d7de88c9ab568929e
+EBUILD hwloc-1.10.0-r1.ebuild 1924 SHA256 6b38a0c1d1daf4829c5a97a8068e4486abaa01a4d65ccd5c8d639531b885a85b SHA512 1b4a9652cdea59b3cc19da23d254f13b37ed0a08295dbc00a2f2b12736037ee08baafc5214d259794ea504bd0a1746915278cb53531a28daaa6b260a24b59529 WHIRLPOOL 4cc51b06e47e346b046d9d101c37bd14b63afb7a0b90213fafa8dfbe04b47ef42bda3792f1eeee03476d28081af2a9c49b6e6e7b73838714f77bb66dfec22687
 EBUILD hwloc-1.10.0.ebuild 1926 SHA256 e8bd56a78401f7931b752e986e9cac57473170cfc9e1e38f92447ef0dd07e78c SHA512 808a3ae1d47a4f6cc3b63c68314511a791e2d4630c8c1d4556b677a9cd4a4c5b2e087f486ff0e156c52e63a3ab77288be6d547fbbdf723692f540031f4f3b74e WHIRLPOOL 06e00d41d9b7c1b570b561fac1c868466d27f7c8b4faaa0c3345751bfc10e1135f359e65837eaae8106c766cddf58e6339af08ee39b73ee241f60d52f94fb50b
 EBUILD hwloc-1.6.1.ebuild 1453 SHA256 d91234859bd604c2c8929abe72222474efbb93b554353883c274451f7dcb7b2d SHA512 c92f077b48ad56c00ede4a874cedf43db9196bb89670264b8f7d3cd0af7d7bd17efb7f5ad17c455d37678bc729e52b0d590ee9f2468a6533240c85f03582be07 WHIRLPOOL 7d8403d6fea9e613342d254100bab2dfb597f124074608f75e7b0d79805a3fe2717f4fb3c0fe5e2a75e59f186928e0d42f26c93e252bfff39de98703a9c82c8c
 EBUILD hwloc-1.6.2.ebuild 1523 SHA256 f91e750cea7804116a6d6775e525adcefc7caa1aba864589d2be24896571b0b0 SHA512 6bd67511256fadbd19198652e1bf3384531c2f7d744a767785ac757fc984a169ff93371ef979aa5dcf9fc9d8b4008aede9409db00c65ea96d259e6925560ba1d WHIRLPOOL 8acc45dcd43d73eb0c1c647d32fe4678423cb37afb2b5fff304de53f4ffacfc6e08e65bec645a8f16ec4f142d677bedde0338677d700c21ac349b91124c09fdd
 EBUILD hwloc-1.7.2.ebuild 1947 SHA256 86f2a22d201175589053d63e6b88d66572bc527f9b1dfd9d01054f55f54519ce SHA512 813ae72383d3c39afc11f991953bf6db9d6a68a4f989a954b2fd9fd3f8aab962a26aedcd767e0d5354f6f8207123b067b697c76b94281cc71747f3b236e2c494 WHIRLPOOL de63dfeaa396ecc3c9d4460a6304bde57e7e9e5a8c6fbd3337954a813f935eb297b4ff27cbf65d44c66d071e00b099f65c32660bbd358a8b97d250cb7abffe2c
 EBUILD hwloc-1.8.1.ebuild 1944 SHA256 a336488b3b7aa4f35167549d67ff289219154942d800eb3e35eff2c81ce0380f SHA512 41a7c15c308eb326b5a9d540d1ae4c6d1e9b9ca3e68f2d63d7b404a03a335facfa88909a21ade9dbee5a225eb9dd223bfe6f5852e31af5c81238ea7c9cae1071 WHIRLPOOL 446bc844e833d3a5b12373d4d58e61362236172fd0fa66d5017e92581361001642d15b8a77d802ecd9306750185105b356fc31cb9420efe8c7e117fa21faf368
 EBUILD hwloc-1.9.ebuild 1947 SHA256 1c9e6b7eed9baf9d802fb11ea4157a5454b313046c5b758cbe420f300f4a58a1 SHA512 705e1f2e1e2cc734574572a6b44d068a441ddc7a7dcd90fbc1e7f49e1faac8d4ef5c92d6bc0021eae4db1b8da8a4d2e6297b66cc10525010999477e9cf6c411d WHIRLPOOL f6a8518a527f15b8f3ff53f29b928ca6159209922d0cc8dfce7df6f61d2ffc094e2044a70812e0db238f29e1c5e120d272e1b034da8e1154865da2f03c0b9d74
-MISC ChangeLog 6833 SHA256 1d41ae8179ffdea7e0bfdbcef3ccc00675b7bc39ca5e4fa48b6a8098b5dea605 SHA512 f4bccc19efde4d455e7e33c6590b76fa4d39d653e18cb98d961a40893ab362eeb5e523ed50f3ac4b6c1290e793a65f4549c246129208628c6938a71c1968778d WHIRLPOOL 6876f28f8aa335650f7b7da4c1ecfa8b9fe1c49040e0223f8331b3173b5b675a24888d91628a684ff10ee2670e0a72c15e51b29e321cd02c505b1753fb88f111
+MISC ChangeLog 7002 SHA256 a3446549c7430ac661dbc0a2f4437515453a6891c677588c480dd0d042bfa625 SHA512 d719f075ea49da2eff440ff46033e3b176b2e584cd189238151e152dfd41406c066fbe19bd8459925d37bd2c7b514e0ca71cd5636496ca7b421b4deed5881aa9 WHIRLPOOL 60c83a3349724684abef04540c71643951ce9989636390fd2c0ee8921ce01df31975c1f28a434e70ab3f841337424e2c0612200f830199000eef3b6460ba28c7
 MISC metadata.xml 1239 SHA256 8d030f189afcb2ce6a1540d604b934963ef75392d799be65df7eb3bd6a762e3a SHA512 7c1889b10fd6cba32b52114ebaf5a7c862b382a189b5601526d203781017559b37cf985f86fcd896c491f9afed8067e9f91fcb131a4eb8f977e952751d293151 WHIRLPOOL 1d44687f08db352c598221285b86ec15c5586c58ba9b35aaf475550ecd4ffd7abe3d31e4880e3e4992c9f90e6bdd7cab9fdc5adfe48e5dee94b416cf45c44286
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlQ/RHoACgkQ4MrvBE1wQ8nC6QCfWX/vXuW5wg/fO9+fE9l/XrKB
-HtMAnjKi+OTX0Vn8OGb3mqfCd/yFOfbu
-=3MRQ
+iQIcBAEBCAAGBQJUWwvEAAoJEPGu1DbS6WIASggP/RDzMbu7Kce9Pp8N0AHVHqFg
+FMJkpAGWP3zHX6k3x/bxvmjPkwmUhTeH46BMnCFepPhB4v4dp5MghkFuV2EzGptK
+IaE+Su0GGzZjNI19QFUMGabETYY9Jz6GWH8BWU++y5pfaWtETzCis4j4+Ssdggp8
+HfRBCHhFpVPiq1B1MQAY1leqU2AwPC1/hYQuG3gxHWFRq2PbCL9ufRnqJraQ6/4n
+jlb6XmrFs8Yy0k0R/9ZCc8insSDaVzHQ8gIMuwc31dLm32OwaWgs7BmBM9keTtVj
+w3p8JYi7j1PrEGr8f3icXBM8jb9XoROyWF5ZaJ+DoYU3KDj9d6sndcyGOrNv0ZRq
+1PYZWavFqd80UwGOl+qIHiEgO89ovJxWKlVLnWvc/StrSyBnqD2pvkszA9/ik4AQ
+IhNEONiM6auiniOJDueQg/MXHfEZlEHBFg3YgK9wYEmUliI6gAxYMWRmD34J9KM/
+PLYnMxi/D8Mfe/PYYsQA2+XtqHNjXlu+VZAMACOLlKG4ykb1+1gIK7mU2Ngty1ow
+F1NXFRht6po/dG6hGPdqvpSdtf5mM37U7q19LZqUexsVW5rahPqs3zcgSH7/IzXe
+Oy3i8p8XhcPR+svZeRlQ3K5o0nqyZczB+bUONyDjq3MNwS9aFESEods0GC2/oI47
+oePuRS+55+VE5GkVc8hH
+=npip
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild b/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..3a6e35fec033
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild,v 1.1 2014/11/06 05:48:50 vapier Exp $
+
+EAPI=5
+
+inherit flag-o-matic cuda autotools-utils multilib versionator
+
+MY_PV=v$(get_version_component_range 1-2)
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"
+
+# TODO opencl only works with AMD so no virtual
+
+RDEPEND="sys-libs/ncurses
+	cairo? ( x11-libs/cairo[X?,svg?] )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	gl? ( media-video/nvidia-settings )
+	opencl? ( x11-drivers/ati-drivers )
+	pci? (
+		sys-apps/pciutils
+		x11-libs/libpciaccess
+	)
+	plugins? ( dev-libs/libltdl:0 )
+	numa? ( sys-process/numactl )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README VERSION )
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+AUTOTOOLS_AUTORECONF=1
+
+src_prepare() {
+	if use cuda ; then
+		append-cflags -I/opt/cuda/include
+		append-cppflags -I/opt/cuda/include
+		append-ldflags -L/opt/cuda/$(get_libdir)
+	fi
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
+	local myeconfargs=(
+		--disable-silent-rules
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cairo)
+		$(use_enable cuda)
+		$(use_enable debug)
+		$(use_enable gl)
+		$(use_enable opencl)
+		$(use_enable pci)
+		$(use_enable plugins)
+		$(use_enable numa libnuma)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+}