[sys-apps/hwloc] Version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF82F92E6

5 files changed, 96 insertions, 113 deletions

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index 6fa709ede035..79c51e721611 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.45 2014/03/17 07:01:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.46 2014/04/08 08:47:02 alexxy Exp $
+
+*hwloc-1.9 (08 Apr 2014)
+
+  08 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> +hwloc-1.9.ebuild,
+  -hwloc-1.4.2.ebuild, -hwloc-1.5.ebuild:
+  [sys-apps/hwloc] Version bump
 
   17 Mar 2014; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
   Remove myself from metadata.xml
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 4863c485c864..4198a65dac8c 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,34 +2,32 @@
 Hash: SHA256
 
 AUX hwloc-1.8.1-gl.patch 542 SHA256 0e424b4207df696cb3601ffd2c3680eda6e6aefc1886876e1bcbf0f2dc5a09fa SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33 WHIRLPOOL ee497fac66b5de36adb6ab2a792c83c2f00f30030c42b7a2ff4521c61751a69f7548ab1a1b2b5245c0b546d7d755e2e4078d8b0a4553bb81c407f0ffb4e48991
-DIST hwloc-1.4.2.tar.bz2 2703403 SHA256 bcb917dfa5b5ccc150f54afef74d77ee11cb4c6fcd402273d828b83c97655575 SHA512 5f65e18da0f1599d0b4ae0b868e404f8f0e9586a8a9b141fb3863a7d724bcada6ed2eb7327e06e30f01e70c66535be62ec3ca83dfff4d573adaa54b08897ae6b WHIRLPOOL c47c56fb26a092711c50e8bbf922aca66273c8d33dd74d9e871e551014683f77eb29e9132016504a6b6b06a8a610b8d88ea83260fd30e056bb3a37946ebcdb7d
-DIST hwloc-1.5.tar.bz2 2887977 SHA256 ba8519c27eb5637d184a0673a701265a94c4e8ab1ca6bfcf903bcd1f627474ea SHA512 eebd0dbb8181d9c67934b457ed4ca4526a2bbd8b59fb65c752b4709df2a69781e3b1f946ff749e72c29fb2fa4b9b316776fb5e732bc95ec75b6324ba66c23a92 WHIRLPOOL 00e56be78525bf44ec7ec111b5ab478a2f2fc424a60b019370dba60c6227db052b74730dead796df8a8fe712542a3cd9497bfffce09eeb2c885742b309755a77
 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
-EBUILD hwloc-1.4.2.ebuild 1329 SHA256 9c20da289d5f6c6cf0fa1b0926c05fd560a83c22bcf6d69585d0d331d6a948a9 SHA512 a0de1653834c21ac2577a8ca746544637d873d9e96787a1921672136c0c8dc2ca30bc9dc80190cbd61cd86aa1852580ad3263fed333166e7e94e8ef231aed08d WHIRLPOOL 6b7d4144c8995da358e6c83ed8487d56350e149d356fb537b933324ac53873eb48bfe879778dc13f28ebf1c2af775b8a48eace962b41516ba3eafc0e7f9b2333
-EBUILD hwloc-1.5.ebuild 1323 SHA256 6846c0743a80d69f3b1e72408975a5f0a198bae77ba58b223a6ea116871a624a SHA512 1486cffeeeff5a9f7da9f558c89e648c547fff1daac70c4747999eae4a9d283cf9d999e7eb68930975566c57a66b2a62226eee9c245a9604fc6db6a8483ec1e8 WHIRLPOOL 78348b0f0cca81a7758512b0d86cec994331a89d358a5b04c69efdef11d042c7ae536a036d1afbe057407299814a4e0b2ba5a9d0d81dfc03e996dbb41cfd5761
+DIST hwloc-1.9.tar.bz2 3682256 SHA256 24a81ff1c3810f16633bf5ad3fb80cbbaf882e466a788af4301b2911698c4f7e SHA512 6697f02c954525ae6b24fb22e738b8b8383f33bbd941ab757829e7406a96f037edc2841fb50335ec26bc53573e00bf9295c2e8d574b7b3bb687c02189d87fd74 WHIRLPOOL 4eb9d0bfb5c615577f4b2debd49d5c042c4b844362aaac6d757b2ab10d845aeeb9c918e2153d32d51ecb88b9d1fc0818fe1a2a90eed3413d7de88c9ab568929e
 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
-MISC ChangeLog 6507 SHA256 0cd76fcb3533bb97dfa9c09e2500c6f941ce3812049819000298192ca6986c63 SHA512 7c11fc63729af91dc3713313034a14625bcf66862f452e9b83a1d6b322c9c6803915ef3419ac0a48c8618c699239abe76e420a2486de8fe818ec30c8b619ec03 WHIRLPOOL 1f091a0e776e341e76bcacb8f9647cd650f147b43ff1afb3408d10e3438e837f60f7ed91b4fe8c424f90760f03ae527869da4c65e58c9fe15a771b4f0e1d5d0f
+EBUILD hwloc-1.9.ebuild 1947 SHA256 1c9e6b7eed9baf9d802fb11ea4157a5454b313046c5b758cbe420f300f4a58a1 SHA512 705e1f2e1e2cc734574572a6b44d068a441ddc7a7dcd90fbc1e7f49e1faac8d4ef5c92d6bc0021eae4db1b8da8a4d2e6297b66cc10525010999477e9cf6c411d WHIRLPOOL f6a8518a527f15b8f3ff53f29b928ca6159209922d0cc8dfce7df6f61d2ffc094e2044a70812e0db238f29e1c5e120d272e1b034da8e1154865da2f03c0b9d74
+MISC ChangeLog 6674 SHA256 4c6fd7e4cbeaecf930530bee92d1660dc523ce5601ea078d170b2d76194380db SHA512 debf02c7d549316b2a1e0240955bcd9eca68927cc32c3b67c362e297d1dc362448a0bd2000d1dbda38549c0f22289594ec5fce3f316b0acd19e248f91bf46f12 WHIRLPOOL 401876d2a83f45cb0948662469fc9724fb91df2cbe39dbd83a12771127ed0ca80cef8d09934e52c3096a6edca9411b27b576e81b09df03aefbd86034b91c0e38
 MISC metadata.xml 1239 SHA256 8d030f189afcb2ce6a1540d604b934963ef75392d799be65df7eb3bd6a762e3a SHA512 7c1889b10fd6cba32b52114ebaf5a7c862b382a189b5601526d203781017559b37cf985f86fcd896c491f9afed8067e9f91fcb131a4eb8f977e952751d293151 WHIRLPOOL 1d44687f08db352c598221285b86ec15c5586c58ba9b35aaf475550ecd4ffd7abe3d31e4880e3e4992c9f90e6bdd7cab9fdc5adfe48e5dee94b416cf45c44286
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTJp2hAAoJEF0huFKJUZL594gP/0eS5YIQUUH0dGy28Zjdej8x
-UIYazoGEHkuoVIAiGXm2xY0SykTsprC1fFhv9MuV05JvkYOtDTWNheI+qhTjkW53
-Gu6VIoF6ClXZTvRwpFhbTaixZ20sp+5cv6ovOeOhNfBoEy9cVkwqZ5JaXVLw9A4+
-7pu4V83AGOIxbKyh2v3++kDRcc88XfH+qQFDImdBeJdMNIXb1WhLnRSyX+RkLD+d
-kcpQfsK1IUo8wD5Y8lRgEZUPyLickGkfzJPk/bc9d+st5yFC5cQqb/FYojX08Wnw
-6buB0Xj2LvZfh9heEpE7oXR7d2wxZO1nmNcKn0DJfs/Tz9rMXoKomGnGD8DUlp6r
-71z2r0IbbizjLxXF74RQvJwkGCjG/IraKGB15PiW1pHn58xioCH5bAtzjV4OugB+
-1sNp3y0mahnkW4WLXS/iyeitKv/Su4mLH1lhgWkdvGnJtM2ddmd1Cea4ClvU8NVD
-LKAJ0cg/yX3lgXr9x2UYeLDn1FbyCw1/A4earinPMHmJZFlyPUrH9Ud1SwrsqNGb
-/7NYicLuEa/WN/khksQzoNER7kWn6+bEj922Sl9dtNh6qDji28tA8k56TnofvYhw
-8AhFDcHkphHvnBTEQZgK9NmRyE2h7r3LsyxqX2k5gBWNiO90z+JdWVuSVXi3yGcO
-pP4AiAKqCyccZnWgIp1X
-=mOWa
+iQIcBAEBCAAGBQJTQ7eUAAoJEOf+E+/4L5Lm7HkQAIo8zFCov8rgcmwKawsSq/EB
+heg9m6eBnoJyiQBrhHY5BuxrVZusRAAyDe+QHhQiDRsNHMda5EWXf6zd9lxFWocz
+uL1wsTIi6QxyVZxRSG6bEXAe38MeVpcdXFsYGXH0cmQzlts1hbkgD087Agkv5OLo
+DMmRj7KtKpS1wkvV8tKefgYN4t3u/BODxnKRAf8I6qKE57Nb4CdM/W4OkHX+Z7C/
+zETGqxh5MmmJOg4vEUD39yMaOGwgilxmD0N+qOYKtvmcWQNiCyDDR93v/N9RMJE4
+x+HQ91AIUmGY2PiWKsRLnPn6ftoqW1M48sIVSylW8BCKPb5cyuwI1qdeY7ZhFCyj
+OTTL/gr8rEWBtlYvxx4toyBGFdCATq/VILItJVVU6vjaGdLkxDkmSpIKouYfAh2V
+EAwkxQNufZaSs9VcRz0P06FLp5KFZsl7p/QPLWWG2NXBrrVm57PtVTCU5JWhDII5
+c0Zc/jZkPlWOQefcOhnK7HUNVppiOKgV/Iq1XgDfJPR6ZsOn//ECegtz61JvcHs0
+NvFqQKOq+n0txbEgF+ibicXGng+a0wkYl/zm2BK5i28gecnTzlFkVzZMaHdwOdL0
+U+QsmKeBKv1cTFLQbbq4RYouF4tcDZBjWRMxIx96QmQIjOAujNXw0BzKm7oFrAUg
+/B6jRtRrayarvrkuXlVu
+=kY+M
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwloc/hwloc-1.4.2.ebuild b/sys-apps/hwloc/hwloc-1.4.2.ebuild
deleted file mode 100644
index 7acc7b2a1574..000000000000
--- a/sys-apps/hwloc/hwloc-1.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.4.2.ebuild,v 1.4 2013/02/18 06:48:29 xarthisius Exp $
-
-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 svg static-libs xml X"
-
-RDEPEND="sys-libs/ncurses
-	cairo? ( x11-libs/cairo[X?,svg?] )
-	pci? ( sys-apps/pciutils )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	numa? ( sys-process/numactl )"
-
-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 numa libnuma) \
-		$(use_enable static-libs static) \
-		$(use_enable xml libxml2) \
-		$(use_with X x) \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-	use static-libs || rm "${D}"/usr/$(get_libdir)/lib${PN}.la
-}
diff --git a/sys-apps/hwloc/hwloc-1.5.ebuild b/sys-apps/hwloc/hwloc-1.5.ebuild
deleted file mode 100644
index 01a16f41260e..000000000000
--- a/sys-apps/hwloc/hwloc-1.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.5.ebuild,v 1.1 2012/10/07 17:25:17 alexxy Exp $
-
-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 svg static-libs xml X"
-
-RDEPEND="sys-libs/ncurses
-	cairo? ( x11-libs/cairo[X?,svg?] )
-	pci? ( sys-apps/pciutils )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	numa? ( sys-process/numactl )"
-
-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 numa libnuma) \
-		$(use_enable static-libs static) \
-		$(use_enable xml libxml2) \
-		$(use_with X x) \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-	use static-libs || rm "${D}"/usr/$(get_libdir)/lib${PN}.la
-}
diff --git a/sys-apps/hwloc/hwloc-1.9.ebuild b/sys-apps/hwloc/hwloc-1.9.ebuild
new file mode 100644
index 000000000000..3de0a4f36255
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.9.ebuild
@@ -0,0 +1,73 @@
+# 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.9.ebuild,v 1.1 2014/04/08 08:47:02 alexxy 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? ( 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
+}