Version bump wrt #469708 by Mario Kicherer <dev@kicherer.org>

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

4 files changed, 93 insertions, 18 deletions

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index 77ac1e00105a..0ec774602adb 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hwloc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.35 2013/03/21 04:33:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.36 2013/08/09 09:03:34 xarthisius Exp $
+
+*hwloc-1.7.1 (09 Aug 2013)
+
+  09 Aug 2013; Kacper Kowalik <xarthisius@gentoo.org> +hwloc-1.7.1.ebuild,
+  metadata.xml:
+  Version bump wrt #469708 by Mario Kicherer <dev@kicherer.org>
 
 *hwloc-1.6.2 (21 Mar 2013)
 
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index a84856347b04..115b30d25874 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -5,26 +5,28 @@ DIST hwloc-1.4.2.tar.bz2 2703403 SHA256 bcb917dfa5b5ccc150f54afef74d77ee11cb4c6f
 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.1.tar.bz2 3214808 SHA256 96a3c34f7237205448a99d1a16daac6c052f81abc2e2ddfbacc154a31a8c0d01 SHA512 cb018610d0f76adf1a890b3db9eed12e00843da1a637ab2201b6845e9f8bf6a57ad42cd00d5267748800232f0afdb9b677a6171c0f1f89cd78ad3a13241af4cc WHIRLPOOL bcb9577b8b17ae8c403dd268581b640c9745da1da260a6b03b9f2fafb4ec2370b3ed8d3394855dd0bb27f363d54f28677e544ac980aa52d216235909095d661c
 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
 EBUILD hwloc-1.6.1.ebuild 1456 SHA256 575cad0b03d5cff6cdba306f0584be2303253acb8f862b560bb19e601e26b613 SHA512 6a1bcc315a16f3e2eb90b2ba2650cf33e85cd1824be7d29e6fd6bd5d6c406dfd73abf1d597394deaacc5264b37dd1b93449df40de0afef53401fa95129a1c7a4 WHIRLPOOL 2079df12bd1b692aa2c58a9822a01b98b5dd1cbb8a92fef3ba6475c7c4f671c23181b49f475f766bc68b78a9c2aa8a03335e9382e9f219dea9df7547fc6dfa7c
 EBUILD hwloc-1.6.2.ebuild 1523 SHA256 f91e750cea7804116a6d6775e525adcefc7caa1aba864589d2be24896571b0b0 SHA512 6bd67511256fadbd19198652e1bf3384531c2f7d744a767785ac757fc984a169ff93371ef979aa5dcf9fc9d8b4008aede9409db00c65ea96d259e6925560ba1d WHIRLPOOL 8acc45dcd43d73eb0c1c647d32fe4678423cb37afb2b5fff304de53f4ffacfc6e08e65bec645a8f16ec4f142d677bedde0338677d700c21ac349b91124c09fdd
-MISC ChangeLog 5125 SHA256 39ec940fe8484ac2a3d51feb8c43615bb804c2bcd8cac2b6e8e5be8b0b34e019 SHA512 977f085e8ecf4c223eebab340aa2769f7821d746145bd62f34aa560489afec07dac3e101543726ad25414a83c56517b41ba0c66f7e8e2b0c346d8e58f9c3c638 WHIRLPOOL a4c92a1a9de4b8c4e2ce73a3a30caf9fb4ffd60b9255378984f78c5f19a4594ff74064888fd7459850216406d12015c023b1393bfa37cc34527ae5918aff74fd
-MISC metadata.xml 1143 SHA256 4477adb172c7cb63950de4d26e86c73e302e7f183396275c79442ba3a72775f0 SHA512 9332fa72f65fa739d6c732675b196885924f9eb1676aa923716eb093060a1c80d6fc01f6d1b1dbbd86e38841378aedf8f27d0531dd74dd2f5ddd16fe2558c683 WHIRLPOOL d32ee6eb520cf0f5f95636b287a81d8bd6ca29365d4a0a4d2695bb34370379760b589bdb2fb36bcf7999ffdf14ab2e4f00b4c2ef1364835f1cf326f174016b9b
+EBUILD hwloc-1.7.1.ebuild 1774 SHA256 81891d4c8ab70f347adad41a46197672e888537863c91052f8a52daf0698b3e4 SHA512 695ab8709507a6f86457c5f1d77eac8db2c3653c16a6313b0e55e9bf9a5f84168b476c8b45ea8ce71bbedee8943b245adc6b467eb69f70b77e05b39a0421f257 WHIRLPOOL d3b8182cbb2ef661cb1c6e4b19ccfd8cf5ec971e1ecf3706d337c4c3d54feb5cd2b42c0a979cee3e4a48839d5c29f4270221e1f1b8b97f9a9882526512439b73
+MISC ChangeLog 5313 SHA256 0384a8d56732fdea4cba09a52fa7e42b36c41353797d7423958c1ab971c57fc4 SHA512 d1da2a26e126314225b3dee71d9f88fd90c544daab13702805c21d51035359e4c801ec77a1e5053d92c32680fa91d137e56f78dffcc5a4734a712f96f29ff4fd WHIRLPOOL e0a078eb6c9e14341104047985c2ad40ff126b553b085e409b4352a18452da56fa6bc81ede3f0fa17877f1f0f213fbbd935489620df19a836dddb0df135b7eb6
+MISC metadata.xml 1355 SHA256 29651ccb9d65079aeb0a545ce4c7051e55e17c146e2037f74dacf2d7211a8501 SHA512 b128d3a5601cd67f99f504b953b3a3c67c458bd52724b6a91ede7da6a96a6c0a084a7c68a388b19f2a83504f9d738d0c76a15022825c1e63c48d8b36224b5895 WHIRLPOOL 3841af2ce5c75cb353f967705a2e758c10cb4d15d2da96eb8f08369d6927e8fd0cb5ac6f996c0f5066c77abf41697964cd6cae1eed923023bc76e2407f066f46
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRSo2NAAoJEOf+E+/4L5LmGhAP/A/ZxHpZUjKNFknBTHsogEOe
-vvcrrh36CmaazaSKeM0YVjFh/A5Osxd5pMbjaaOvYDH1fRfaJ8DOG++cYx1VGYwT
-Z0wsybCP/1DBr77UYbengPuPgObtji5yDxy5Srwc46FGu8R3hmnNqqvRhuToph8z
-1uhAk3Bt7xqeKm3Isqj1ftPLfx8FanArq63j/Gl3eARcQc+FV4eCW0UOD2nUM1Ik
-WZK7oj/ZqPHgJ1idjRAJyAwrM/sA5dSzBR4npp3JyqZv8k44g3NmubbvVOVJsIn9
-7JdjgZO/oLksnVCfXs6zloTPTY7zIaLKmRnPV48+hjXd0qvxkv2Lp5rCSrgpzx+9
-Iwb1YnCBnLT3JAz2N8t68PACNUVQ+ncweUBRnSGkrbmF9CtZUw7eEE5oDFyaWG4W
-iF+aQhiH4NY5guUNYM/CFkHNKOzJSOcIoIXdYNua1Gk6XfoyjdlbTSUf65CfyGTm
-DnZGeK7rDEufcD68QN0+VjkVh2RmtJ6VWayMk1BIY1ut7m2lniKZJFHURt/L1YLG
-593sfp1iWh+ziGYI9E8A122Dh6skAQ42EXAE6lSbmP13rc/JKpLWTNjPPB1Y03Tm
-dCkJvm9cTqcoNapDdCsbp4JK3jZbzXVHVRrj+XBuZ3l6fVirS/iosdXZMYnFr7tv
-op79D0TKbR3iPcR+5HxN
-=Z1bJ
+iQIcBAEBCAAGBQJSBLBvAAoJEF0huFKJUZL5Oe0P/jfVzsz+0YIZiJ5oUr5m8PVM
+jKDcRolmRh85jmnPKeyerDRkIUNLMCN3ghwJkaioOZm5hQynqO8Blj1QU+1tCMI1
+rnFnEoq4V7MU6Wlnw801V54HY5uDjWUMzwScMZ6siSxjVS/L/opE3TFemwyEwVAi
+uNSU4uEPMmJPnu9o9btLtXgEEYegGqYUqgzxI1G35XBq0SBviO1NvRxnfoojDgGE
+vPG/XWuvEgB2LoTo9x2BVjl9HiohLA21LrUwnh536etXfaekHKccsbU3MMAbDwnE
+Cw/hU0h7gdDiLQznoUaLwU7A6to8bAtiGBUdR8VKnpMWaSI+WNy1b4aCg0rnelfe
+6tufnw/EStL+E62cd2XUDh4d6/Tu9/MPjEqLfE23FP1pak2mC/WbLSAa4MfvCwVA
+6fLuMIcXPS8Fi3bHxOpFMA4Vkwjl1mKS/S7P/CRiN1iuHFtuNOitlDQGvuKxbqbK
+SBqOvEG+dGQO+VM569SnD6vmpO7YTqD1GCiN//nW+uabMI0VJkwCwBDHUed6YS8t
+Bjkck6nmsi3M4XzUyRFUInojBGI9MzrxrCaT6AIn5GeLliktF2bOOqrlE11kOydz
+ChoqkfA8Rnxpph6kryofI3bKlpXmt3QA22lgR13DLub4eUepEolHQ5a9QTTLsW3d
+kR164fkJx6y46zFJhq8Z
+=m5K6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwloc/hwloc-1.7.1.ebuild b/sys-apps/hwloc/hwloc-1.7.1.ebuild
new file mode 100644
index 000000000000..3f164595c085
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.7.1.ebuild
@@ -0,0 +1,64 @@
+# 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.7.1.ebuild,v 1.1 2013/08/09 09:03:34 xarthisius Exp $
+
+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 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 )
+
+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/metadata.xml b/sys-apps/hwloc/metadata.xml
index 5ae4fec3e6f0..2c42c390e605 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -15,8 +15,11 @@
 	hardware so as to exploit it accordingly and efficiently.
     </longdescription>
 	<use>
+      <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>
+      <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>
 </pkgmetadata>