commit: f1cd3db22adef7ab23e0da9d329d98f19f9be9ed Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org> AuthorDate: Wed May 10 23:24:51 2017 +0000 Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org> CommitDate: Wed May 10 23:25:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1cd3db2
sys-apps/hwloc: remove old x11-drivers/ati-drivers is gone (#582406), so older versions may as well be removed now. Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-apps/hwloc/Manifest | 7 -- ...er-topology-fix-lstopo-path-after-install.patch | 26 -------- sys-apps/hwloc/hwloc-1.10.0-r2.ebuild | 76 ---------------------- sys-apps/hwloc/hwloc-1.10.0.ebuild | 71 -------------------- sys-apps/hwloc/hwloc-1.10.1-r1.ebuild | 71 -------------------- sys-apps/hwloc/hwloc-1.6.1.ebuild | 51 --------------- sys-apps/hwloc/hwloc-1.6.2.ebuild | 55 ---------------- sys-apps/hwloc/hwloc-1.7.2.ebuild | 71 -------------------- sys-apps/hwloc/hwloc-1.8.1.ebuild | 72 -------------------- sys-apps/hwloc/hwloc-1.9.ebuild | 72 -------------------- sys-apps/hwloc/metadata.xml | 1 - 11 files changed, 573 deletions(-) diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index 0cd4cd3ca3d..2f05d766bc7 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -1,9 +1,2 @@ -DIST hwloc-1.10.0.tar.bz2 3765051 SHA256 b765f72507cf1cc98b398e0ec85b8f30e640bf1cd0a886c286d0b70d648d7be3 SHA512 0f1c011dbafbd4a78566b2ebc26b1c91a0e091e041f6e7996cea6812aeefd7fe4e8e7cb688634157c721dd9deea48ca32de823f8a9e0a1c341853b925a9c89c0 WHIRLPOOL a3eb47450f9e3fc97cb484ad4cab93f4eab10c5039da113029a0e918f654a878f44a9460b4606616d43580ea56ba21fc54ab4fc671b290f480e2e19514e524d7 -DIST hwloc-1.10.1.tar.bz2 3771665 SHA256 35ce13a9a0737d2de1c6facb5c3c0438f7c83b45d6ce652e05ba000f6f2e514a SHA512 47cc1f084730021996ae0c18996e13dde5b991004fe9160bc1e118b6cb0288fe5d65d149450f05bd7b9e13bd6f16dfe82181d1e731dd1b0e46a43fd4435850cc WHIRLPOOL b7e089c1de3f967295768dc2dbc6acec80fa99f66d9340cedf3b02c1d2e869a339fa9fdd71a5f8ef77554ec8622a246abae6ca5f41354790bf09bf2d0d8236d7 DIST hwloc-1.11.2.tar.bz2 4019136 SHA256 8c029b6b1638245837707bfa6c865f448af4e49e7d352335e019d818b51fecf8 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68 WHIRLPOOL 783752a449f907bca5dd0b42445f8291d8cdc3a09f4e1bdb677cf34c3bc56ef739def0c1684455979d36570a51bdc99cefccbd5052e0996226dfc832ade9664a DIST hwloc-1.11.7.tar.bz2 4187754 SHA256 ab6910e248eed8c85d08b529917a6aae706b32b346e886ba830895e36a809729 SHA512 f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e WHIRLPOOL 4cbc3bb5639f01cd16f12e92a59daadb978c9c09126941e0cab6b69beb33a5e7ced1c91cf281c66175b0c3c13a4887ede556cbfe6e8823589a233ee409813584 -DIST hwloc-1.6.1.tar.bz2 3075453 SHA256 8bb0a13d70852442cfce8883a99113e9238e187a91b3160279e260a10048057b SHA512 9bf613c35e27d7e0e7e4aee39602e949dd035c84ceab37a716c48d9be25f319cd7888448c9771e8a8408dcf958370e9b54f7e1f764349fa5d39c2bd4358032ff WHIRLPOOL a319c94d306e18bd0f9a721eb637df667fc0831e2c84770255736205ba30abb9cc18e4b401cbbd3c419369b1c3aae638253bb826e973ff6c763a233c9c986742 -DIST hwloc-1.6.2.tar.bz2 3066020 SHA256 fd4d47738afc9c5f60d2c35f0963f82feb78bb57f2bc239e84e93ad376169df1 SHA512 3e1a0b28f6f867c82c8d61110afc07cb0019fb8d4284a171cef36346ea9746acab11250f7f382260f8f40d3c28c2517b24f2a222427cb2951149a58a30cb0990 WHIRLPOOL 7f2a9a58f4f7b1aae18f6d50338553eaa8c26e0cd54add29395e8366cfb076ec4e790b3411978c581da1b67342ad14443040e08a766e727a7cf9b27530e356f1 -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 diff --git a/sys-apps/hwloc/files/hwloc-gather-topology-fix-lstopo-path-after-install.patch b/sys-apps/hwloc/files/hwloc-gather-topology-fix-lstopo-path-after-install.patch deleted file mode 100644 index f383b3ab3a7..00000000000 --- a/sys-apps/hwloc/files/hwloc-gather-topology-fix-lstopo-path-after-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6d42748f8604f3c1d0ca6cf122e8776b3c153ac4 Mon Sep 17 00:00:00 2001 -From: Brice Goglin <brice.gog...@inria.fr> -Date: Thu, 12 Mar 2015 10:01:13 +0100 -Subject: [PATCH] hwloc-gather-topology: fix lstopo path after install - -Broken when utils moved to utils/ subdirectories. - -(cherry picked from commit 0a32f719c48fb7dabf4882f8f2477017c25b15a9) ---- - NEWS | 1 + - tests/linux/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/linux/Makefile.am b/tests/linux/Makefile.am -index f0a2f8a..27c261a 100644 ---- a/tests/linux/Makefile.am -+++ b/tests/linux/Makefile.am -@@ -171,7 +171,7 @@ LOG_COMPILER = $(builddir)/test-topology.sh - bin_SCRIPTS = hwloc-gather-topology - - install-exec-hook: -- $(SED) -e 's/HWLOC_top_builddir\/utils/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-gather-topology > $(DESTDIR)$(bindir)/hwloc-gather-topology.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-gather-topology.tmp $(DESTDIR)$(bindir)/hwloc-gather-topology -+ $(SED) -e 's/HWLOC_top_builddir\/utils\/lstopo/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-gather-topology > $(DESTDIR)$(bindir)/hwloc-gather-topology.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-gather-topology.tmp $(DESTDIR)$(bindir)/hwloc-gather-topology - chmod +x $(DESTDIR)$(bindir)/hwloc-gather-topology - - SUBDIRS = gather diff --git a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild deleted file mode 100644 index de1b886a91e..00000000000 --- a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~arm 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? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] 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 - - # Fixed by upstream, but it seems overkill to require an autoregen for what - # is just a sed fix. - # https://github.com/open-mpi/hwloc/commit/6d42748f8604f3c1d0ca6cf122e8776b3c153ac4?diff=unified - sed -i 's|bindir/lstopo/|bindir/|' "${ED}"/usr/bin/hwloc-gather-topology || die -} diff --git a/sys-apps/hwloc/hwloc-1.10.0.ebuild b/sys-apps/hwloc/hwloc-1.10.0.ebuild deleted file mode 100644 index d09075ddeae..00000000000 --- a/sys-apps/hwloc/hwloc-1.10.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) - opencl? ( x11-drivers/ati-drivers ) - pci? ( - sys-apps/pciutils - x11-libs/libpciaccess - ) - plugins? ( sys-devel/libtool ) - 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 -} diff --git a/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild b/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild deleted file mode 100644 index d6b1b6c2243..00000000000 --- a/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit flag-o-matic cuda autotools-multilib 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 ~arm ~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 -# dev-util/nvidia-cuda-toolkit is always multilib - -RDEPEND=">=sys-libs/ncurses-5.9-r3[${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] media-video/nvidia-settings ) ) - opencl? ( x11-drivers/ati-drivers:* ) - 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}]" - -DOCS=( AUTHORS NEWS README VERSION ) - -PATCHES=( - "${FILESDIR}/${PN}-1.8.1-gl.patch" - "${FILESDIR}/hwloc-gather-topology-fix-lstopo-path-after-install.patch" -) -AUTOTOOLS_AUTORECONF=1 - -src_prepare() { - if use cuda ; then - append-cflags -I/opt/cuda/include - append-cppflags -I/opt/cuda/include - fi - autotools-utils_src_prepare -} - -multilib_src_configure() { - export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467 - use cuda && local LDFLAGS="${LDFLAGS} -L/opt/cuda/$(get_libdir)" - local myeconfargs=( - --disable-silent-rules - --docdir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable cairo) - $(use_enable cuda) - $(use_enable debug) - $(multilib_native_use_enable gl) - $(multilib_native_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 -} diff --git a/sys-apps/hwloc/hwloc-1.6.1.ebuild b/sys-apps/hwloc/hwloc-1.6.1.ebuild deleted file mode 100644 index 3d7c3e774a8..00000000000 --- a/sys-apps/hwloc/hwloc-1.6.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit 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" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux" -IUSE="cairo debug +numa +pci plugins svg static-libs xml X" - -RDEPEND="sys-libs/ncurses - cairo? ( x11-libs/cairo[X?,svg?] ) - pci? ( sys-apps/pciutils ) - plugins? ( sys-devel/libtool ) - numa? ( sys-process/numactl ) - xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS README VERSION ) - -src_configure() { - export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467 - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable pci) \ - $(use_enable plugins) \ - $(use_enable numa libnuma) \ - $(use_enable static-libs static) \ - $(use_enable xml libxml2) \ - $(use_with X x) \ - --disable-silent-rules -} - -src_install() { - default - if ! use static-libs; then - rm "${D}"/usr/$(get_libdir)/lib${PN}.la - use plugins && rm -f "${D}"/usr/$(get_libdir)/${PN}/*.la - fi -} diff --git a/sys-apps/hwloc/hwloc-1.6.2.ebuild b/sys-apps/hwloc/hwloc-1.6.2.ebuild deleted file mode 100644 index b4deb54424c..00000000000 --- a/sys-apps/hwloc/hwloc-1.6.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit 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" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux" -IUSE="cairo debug +numa +pci plugins svg static-libs xml X" - -RDEPEND="sys-libs/ncurses - cairo? ( x11-libs/cairo[X?,svg?] ) - pci? ( - sys-apps/pciutils - x11-libs/libpciaccess - ) - plugins? ( sys-devel/libtool ) - numa? ( sys-process/numactl ) - xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS README VERSION ) - -src_configure() { - export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467 - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable pci) \ - $(use_enable pci libpci) \ - $(use_enable plugins) \ - $(use_enable numa libnuma) \ - $(use_enable static-libs static) \ - $(use_enable xml libxml2) \ - $(use_with X x) \ - --disable-silent-rules -} - -src_install() { - default - if ! use static-libs; then - rm "${D}"/usr/$(get_libdir)/lib${PN}.la - use plugins && rm -f "${D}"/usr/$(get_libdir)/${PN}/*.la - fi -} diff --git a/sys-apps/hwloc/hwloc-1.7.2.ebuild b/sys-apps/hwloc/hwloc-1.7.2.ebuild deleted file mode 100644 index fd53c91c218..00000000000 --- a/sys-apps/hwloc/hwloc-1.7.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit flag-o-matic 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" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-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? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) - opencl? ( x11-drivers/ati-drivers ) - pci? ( - sys-apps/pciutils - x11-libs/libpciaccess - ) - plugins? ( sys-devel/libtool ) - numa? ( sys-process/numactl ) - xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS README VERSION ) - -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 -} - -src_configure() { - export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467 - econf \ - --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 pci libpci) \ - $(use_enable plugins) \ - $(use_enable numa libnuma) \ - $(use_enable static-libs static) \ - $(use_enable xml libxml2) \ - $(use_with X x) \ - --disable-silent-rules -} - -src_install() { - default - if ! use static-libs; then - rm "${D}"/usr/$(get_libdir)/lib${PN}.la - use plugins && rm -f "${D}"/usr/$(get_libdir)/${PN}/*.la - fi -} diff --git a/sys-apps/hwloc/hwloc-1.8.1.ebuild b/sys-apps/hwloc/hwloc-1.8.1.ebuild deleted file mode 100644 index b286886bbcf..00000000000 --- a/sys-apps/hwloc/hwloc-1.8.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) - opencl? ( x11-drivers/ati-drivers ) - pci? ( - sys-apps/pciutils - x11-libs/libpciaccess - ) - plugins? ( sys-devel/libtool ) - numa? ( sys-process/numactl ) - xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS README VERSION ) - -PATCHES=( "${FILESDIR}/${P}-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 pci libpci) - $(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 -} diff --git a/sys-apps/hwloc/hwloc-1.9.ebuild b/sys-apps/hwloc/hwloc-1.9.ebuild deleted file mode 100644 index f4122116e5a..00000000000 --- a/sys-apps/hwloc/hwloc-1.9.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) ) - opencl? ( x11-drivers/ati-drivers ) - pci? ( - sys-apps/pciutils - x11-libs/libpciaccess - ) - plugins? ( sys-devel/libtool ) - 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 pci libpci) - $(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 -} diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml index b733fa4b6b4..baae6b031db 100644 --- a/sys-apps/hwloc/metadata.xml +++ b/sys-apps/hwloc/metadata.xml @@ -17,7 +17,6 @@ <flag name="cuda">Enable CUDA device discovery</flag> <flag name="gl">Enable GL display device discovery (NVCtrl)</flag> <flag name="numa">Add support for numa memory allocation</flag> - <flag name="opencl">Enable OpenCL device discovery (AMD only)</flag> <flag name="pci">Enable PCI device discovery using libpci</flag> <flag name="plugins">Build hwloc components as plugins so that the hwloc core library does not directly depend on their dependencies (for instance the libpci library)</flag> </use>
