From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- sys-apps/hwloc/Manifest | 2 +- sys-apps/hwloc/hwloc-2.0.2-r1.ebuild | 67 ++++++++++++++++++++++++++++++++++ sys-apps/hwloc/hwloc-2.0.2.ebuild | 70 ------------------------------------ 3 files changed, 68 insertions(+), 71 deletions(-) create mode 100644 sys-apps/hwloc/hwloc-2.0.2-r1.ebuild delete mode 100644 sys-apps/hwloc/hwloc-2.0.2.ebuild (limited to 'sys-apps/hwloc') diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index a8210efc90a4..4ed888b0b37f 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -8,5 +8,5 @@ EBUILD hwloc-1.11.10.ebuild 2201 BLAKE2B 4980f997dd06d6b5bfd621cccfba878f373900c EBUILD hwloc-1.11.11.ebuild 2182 BLAKE2B 469799a5cf4adb7fb5698a07eaf7e8e2eb3106c2247a79d68b4f1f4293279642a6a32b78e9dfc848d58c4bdab7105031e1e7c02a0186c3f0c4663915a70eb8e0 SHA512 bc4a29313f2c771847a09c2a59d2eeff560e0a74947b8d12cbaba6665540ab87e3f7378e0391bacaa9c83bc6d35de61c10ab623b8cd76870ef5962eeb12fce8c 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.ebuild 2182 BLAKE2B 469799a5cf4adb7fb5698a07eaf7e8e2eb3106c2247a79d68b4f1f4293279642a6a32b78e9dfc848d58c4bdab7105031e1e7c02a0186c3f0c4663915a70eb8e0 SHA512 bc4a29313f2c771847a09c2a59d2eeff560e0a74947b8d12cbaba6665540ab87e3f7378e0391bacaa9c83bc6d35de61c10ab623b8cd76870ef5962eeb12fce8c +EBUILD hwloc-2.0.2-r1.ebuild 2052 BLAKE2B c0535eec4938ba73803929bad5f973d3f7fe00ee3baf1162e803ea664679d7147b9a91b1f39cd83421fcbbb86bc9e06fcb8f1b38c5814e4158e724bfef86bcf0 SHA512 3a3c1b95ca08bc51875461baa84f742688b1f2f8418976b5f2cc3cdb942d1dde95608072031e642fc91028f3cc06d7582a89af2e0e750fc7e8d2f45bb0e2cd1f MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166 diff --git a/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild b/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild new file mode 100644 index 000000000000..57d0a74d2dde --- /dev/null +++ b/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal + +MY_PV=v$(ver_cut 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 ~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" + +# 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. + +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}] ) + 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 \ + --disable-opencl \ + $(use_enable static-libs static) \ + $(use_enable cairo) \ + $(multilib_native_use_enable cuda) \ + $(use_enable debug) \ + $(multilib_native_use_enable gl) \ + $(use_enable pci) \ + $(use_enable plugins) \ + $(use_enable xml libxml2) \ + $(use_with X x) +} diff --git a/sys-apps/hwloc/hwloc-2.0.2.ebuild b/sys-apps/hwloc/hwloc-2.0.2.ebuild deleted file mode 100644 index 971dfae0ef6d..000000000000 --- a/sys-apps/hwloc/hwloc-2.0.2.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 eapi7-ver multilib-minimal - -MY_PV=v$(ver_cut 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 ~mips ~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) \ - $(multilib_native_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) -} -- cgit v1.2.3