gentoo resync : 16.06.2019

4 files changed, 6 insertions, 78 deletions

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 4ed888b0b37f..04efeb69d834 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,12 +1,10 @@
 AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33
 DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41 SHA512 9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
-DIST hwloc-1.11.11.tar.bz2 4114437 BLAKE2B 57666c4a0a49898f55eba991a52954bb9dbc84202cd3e4d7db832a55efc09bb7477593bfa903cadc9e58ac5ba298cbdce3469926f16b8ed65dfa15e2ebb38d5d SHA512 cac1283c603ebe58e6e2c35d3122f349f3251da6b4f4671bdc8a335b2dd7cc2131107fe239dcc25915b07e193784dbf1b86561433acaeef4e4c3ea103f7d54c5
+DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
-DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044 SHA512 f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
-DIST hwloc-2.0.2.tar.bz2 6032384 BLAKE2B 868c57b434f7722202ec07747dcc62b320ed265ff8334347d824151eb0d37ff626a90f8b66828f82e9ea9e17b95f41f4ffe509f00e7aa9c822bb5080fb4edbd8 SHA512 b3bbf56bea99e3c381f72989aa18bc2329f15d7d12d9386ea7049fc875be4b5f89f2476a3c6cbaea562d1c91f147a3a2c80a50e93b824c7ef6323eed1d6126ef
+DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 EBUILD hwloc-1.11.10.ebuild 2201 BLAKE2B 4980f997dd06d6b5bfd621cccfba878f373900ce134485c59a0b41a01120950c1c083915a2cd1752c3da2811914d8c007d7d726a1b9c8ee37d7ead9a27e92a70 SHA512 e3d6fdbb65ccfe9a19bbadac45e19c2d485b303995ef790cacbf441e30009c808dc6e2981822e246ea5db662a03eb6382ec21b63bd7d63948a6778f4da4e47be
-EBUILD hwloc-1.11.11.ebuild 2182 BLAKE2B 469799a5cf4adb7fb5698a07eaf7e8e2eb3106c2247a79d68b4f1f4293279642a6a32b78e9dfc848d58c4bdab7105031e1e7c02a0186c3f0c4663915a70eb8e0 SHA512 bc4a29313f2c771847a09c2a59d2eeff560e0a74947b8d12cbaba6665540ab87e3f7378e0391bacaa9c83bc6d35de61c10ab623b8cd76870ef5962eeb12fce8c
+EBUILD hwloc-1.11.13.ebuild 2182 BLAKE2B 6597d78e44eb15ea1a24cda4633109f6c10e6198c56f298a53dbb5dd237968c372b1fea0fb84769547d3d0422039835fad231f0618e0fc629775c1f9027530bf SHA512 8b6f4536484e2712c67d079961ef353446801ed59ea04819a0bcfba2841d0bfb0c76afcceadc6b328283fc3b2db92f548f98807611e36b11211270fac540ef53
 EBUILD hwloc-1.11.2-r1.ebuild 2169 BLAKE2B 938851b64cc610349a7a204953fbad5914d238afc5f170ef48b56b7905184747c2b5d84261478a3921946743a35e2a9da0d723cc09b97f785b4acb4c32899cfd SHA512 7b5931e6e1d4670a7f8aa6a93b367351da99bce3dfcea04c88865e47a617e93928c24eefec5a6a92d85950e3081cb08d61a4aa1e0842f2d11eea670d27d487a3
-EBUILD hwloc-1.11.7.ebuild 2180 BLAKE2B eccaadf693dbe56efb83112b561af209370bcef87618bd89e96ff05a90c74b08bbebd3fc481d67b45a5aefe1cb0e220233a4e4169bcd6f5cb03730c52df944fc SHA512 7c2209cc58dd22e76cfcde886b2d8bec3bf0732f3f48c8cc47b19adc1626f9034246681e4ca9e11d0c9f97445da581792ea8a31ebacd1c21faae54a248d6e107
-EBUILD hwloc-2.0.2-r1.ebuild 2052 BLAKE2B c0535eec4938ba73803929bad5f973d3f7fe00ee3baf1162e803ea664679d7147b9a91b1f39cd83421fcbbb86bc9e06fcb8f1b38c5814e4158e724bfef86bcf0 SHA512 3a3c1b95ca08bc51875461baa84f742688b1f2f8418976b5f2cc3cdb942d1dde95608072031e642fc91028f3cc06d7582a89af2e0e750fc7e8d2f45bb0e2cd1f
+EBUILD hwloc-2.0.4.ebuild 2053 BLAKE2B 64d882e86ce13b75342678aba12510047875bda3432cd2da5682d2565c046ccf15e25d43f0433d9dd67352273fbbc37cdf0022f5fafc6e89ae53ac29c6786357 SHA512 ad144a98b81cc886152eb13c46890290f2d7351bc0973ecf79099a6735a8ec78910f35307fb66ca661b86a5fe77d0921150b63175b001de57207e2986768e5e6
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.11.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 971dfae0ef6d..f3a4a7fc25a8 100644
--- a/sys-apps/hwloc/hwloc-1.11.11.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-apps/hwloc/hwloc-1.11.7.ebuild b/sys-apps/hwloc/hwloc-1.11.7.ebuild
deleted file mode 100644
index d0ae44270893..000000000000
--- a/sys-apps/hwloc/hwloc-1.11.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools cuda flag-o-matic versionator multilib-minimal
-
-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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
-
-# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
-# Anyone with hardware is welcome to step up and help test to get it re-added.
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
-	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
-	pci? (
-		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-	)
-	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
-DOCS=( AUTHORS NEWS README VERSION )
-
-src_prepare() {
-	default
-	eautoreconf
-
-	if use cuda ; then
-		append-cflags -I"${EPREFIX}"/opt/cuda/include
-		append-cppflags -I"${EPREFIX}"/opt/cuda/include
-	fi
-}
-
-multilib_src_configure() {
-	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
-
-	if use cuda ; then
-		local -x LDFLAGS="${LDFLAGS}"
-		append-ldflags -L"${EPREFIX}"/opt/cuda/$(get_libdir)
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		$(use_enable static-libs static) \
-		$(use_enable cairo) \
-		$(use_enable cuda) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable gl) \
-		$(use_enable pci) \
-		$(use_enable plugins) \
-		$(use_enable numa libnuma) \
-		$(use_enable xml libxml2) \
-		$(use_with X x)
-}
diff --git a/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild b/sys-apps/hwloc/hwloc-2.0.4.ebuild
index 57d0a74d2dde..42cab5ea370b 100644
--- a/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.4.ebuild
@@ -12,7 +12,7 @@ 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"
+SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +pci plugins svg static-libs xml X"