Version bump, drop old

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

6 files changed, 38 insertions, 101 deletions

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index fe7c36370357..a432071dba47 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hwloc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.15 2011/09/01 16:20:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.16 2011/11/20 14:13:21 xarthisius Exp $
+
+*hwloc-1.3 (20 Nov 2011)
+
+  20 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> +hwloc-1.3.ebuild,
+  -hwloc-1.1.1-r1.ebuild, -hwloc-1.2-r1.ebuild, -hwloc-1.2.ebuild, metadata.xml:
+  Version bump, drop old
 
   01 Sep 2011; Jeroen Roovers <jer@gentoo.org> hwloc-1.2-r1.ebuild,
   hwloc-1.2.1.ebuild:
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 3f6b8618873f..6be893536f1b 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,19 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST hwloc-1.1.1.tar.bz2 2360861 RMD160 ab3ef7482da5debdfe0b22278897ae50449fb56a SHA1 ca99f6e7c9cb41ca0ce89171c817c1de1d9bbde1 SHA256 24fd493494ecbf06cf5d4252e417c857f5274ab3429a7657afc61d3878efe0d4
 DIST hwloc-1.2.1.tar.bz2 2351494 RMD160 bf023e1d059914bdcae1d080d142224934f422d9 SHA1 fe52a6c68fea5af762e6d6767c6952736a9db858 SHA256 893f4662ab670baf73d514d387770231d4c2fcba7b8ed34d36a5675c1ffe3a2b
-DIST hwloc-1.2.tar.bz2 2357374 RMD160 54d1cf84d684691450d0334a71993c81f6ec9666 SHA1 43886dfdddda5bfbaa841976275e7bf643453d7b SHA256 bc019be720665c68f3bd3f9f60d22ce034dada288b3a0ad7afd1a47259a5b912
-EBUILD hwloc-1.1.1-r1.ebuild 1130 RMD160 4c5258429e200ac047f15cf5e368d07705608d54 SHA1 1dfc68fec556d64e8fc1bc5c8ebf7f7700a3da03 SHA256 313460fcdcb56603c21713f1528e317af70247abfdc2adeb37473e9d916deb22
-EBUILD hwloc-1.2-r1.ebuild 1154 RMD160 c8642098099ff4e3d4dece30bb0803c06d287e56 SHA1 d5187d04ee07f230a4c16a0849f629eaec8395b9 SHA256 3f3a81727288fb7bdb4163912a3763ddbece843eefc64f46420862aea49b0c1f
+DIST hwloc-1.3.tar.bz2 2591703 RMD160 9a6f87c3de4a6470a0d42bd16f7e3f770b8324b3 SHA1 4d4de0f48f8b9a1eaf75d55bc93e0e624f6194eb SHA256 be23f811db317f3dcb2449c20e976c45bdf546a74e22db43974c9f6721f8f483
 EBUILD hwloc-1.2.1.ebuild 1153 RMD160 5e9f26e6304f0ae08d5845a16bb54b88f86aac97 SHA1 beb2269734533147826067fe82b635b3ccdca2d2 SHA256 21eeb6a8d1b50b5c21f625597fcbc914d6493fa8cef150a18a087a885872434f
-EBUILD hwloc-1.2.ebuild 1121 RMD160 a97421e4a1d229ace74dc60fc520538a783c43ae SHA1 5cd6a31b33c2dcc5ee9ea47484ffcdad9ae6173f SHA256 79d6ca2e8b932326925041462cb93e50cbe601b42a7dc86ad3d1a4e1707c0e1b
-MISC ChangeLog 2205 RMD160 7bf62eee814a3ea27e9cc657063d42ed526aa923 SHA1 9a547f5751a58375c6641db96a6a37f29fb4f291 SHA256 b0f3155857319203c1ae3a466341235ea286f7cb6c217141f2008b9074652afe
-MISC metadata.xml 900 RMD160 e755d8f9454496dffcc07e708be4f3a7299b48e3 SHA1 436ecb06b0abadbe90dd306e8bcaa0bbd3f88686 SHA256 1eda1c307a60cd92e84edc5b8202a6e1637f1ad17cc07b74a3ae29dada5282d3
+EBUILD hwloc-1.3.ebuild 1232 RMD160 48581edadaab98e0d9fde3769c5e49e3e131fa30 SHA1 640d7a0f30fafb774b2db1772768a4304e7c9bfb SHA256 a8afd327f843059c48a9745774c913f0906ff14057b5254cc65e2014d2ec4ca5
+MISC ChangeLog 2418 RMD160 0bf0882907ad5527d7016778468b073770156aba SHA1 68a792c538c53ca40f690da9e63b571d58b39b94 SHA256 a3c43d6c16f35693d40bbbd1eff7ed92b8e0a1d2c4bf975d11ebb34e28314f7b
+MISC metadata.xml 967 RMD160 24dc640c66a73de1f81c2114a7e53a96adf7d491 SHA1 9fe284174ae1f6b66ebe5a3a20788ff1928185a7 SHA256 af5f3e83297199a3b9439c9ee12d82ebfe791725bbd49c8011100a468f1ebcb9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5fsOwACgkQVWmRsqeSphMrqgCdF1VoQgUlrAobcncCNSviDPuA
-B10An0wXFCUAhKsNi1yyuHkAwjZUxePL
-=uIiU
+iQIcBAEBCAAGBQJOyQsPAAoJEF0huFKJUZL54ksP/iAaPeWwTJRIw7U8C1S4bjXT
+SSCYGFfUesQgNkUpeE9tMeb1goknkKrJsW4zbxi8AmBqVYKWp2aEOjDxM8NQbH3d
+9Hj6uz7/p2XK/VJami0zkeLl1cpwz8J1trlMWRXZPVvF2EiCdGr5XylkOCwqAwQl
+zOignAvc4pks3hi4WIgmqrSYzuS7jatP1jo3D4YFv4QwsD+pIc4eXPnemDqC9cc3
+5R/f4kM/OSv3isqR8bfLPLbaULvsTvBiRLqhdB6R95dNNNNDIvDE7LIv/gwOJDhl
+J6RZlPnxuJ9k/KttioITY7vsvKes8SX59KsScmZ3kbfenujG54a/HAXG2Yc3iiob
+qBM9YwQhYC0a5oFKD0OWufMCIpkPzeLBQR9JdmJdgryQMLDfRaLNZi80THYc0xYC
+Vdqc/Zxw7OAYRPi+//hLIINEXsF42Htkvq8ECRu2Oum4nYc07iUImMl9iyv5+twL
+jVsXvawaKane08p3Tg1kdFPOmgVnXZZ32NCRYNrg4E3aVauVlmX15rJGmNNJSKwH
+gucI/JQgiUN37Tk3U+VeCOaZfAk352ThGyPA6BHEmH5W8pDmU7fghsmbK+nsgntq
+iEBC7NBxwM4V2qfX/dYHjI2P4Wv7r7Wbq2KrzTBQGJWuTqQHYcVK1imiiaHGy/7t
+wfWYY7mxNWUoVN/DChVH
+=BVJv
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwloc/hwloc-1.1.1-r1.ebuild b/sys-apps/hwloc/hwloc-1.1.1-r1.ebuild
deleted file mode 100644
index 8dfaf6dcb88c..000000000000
--- a/sys-apps/hwloc/hwloc-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.1.1-r1.ebuild,v 1.2 2011/07/10 16:23:49 aballier Exp $
-
-EAPI="4"
-
-DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
-SRC_URI="http://www.open-mpi.org/software/hwloc/v1.1/downloads/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="cairo svg static-libs xml X"
-SLOT="0"
-LICENSE="BSD"
-
-RDEPEND="sys-libs/ncurses
-	cairo? ( x11-libs/cairo[X?,svg?] )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
-		$(use_enable cairo) \
-		$(use_enable static-libs static) \
-		$(use_enable xml) \
-		$(use_with X x) \
-		--disable-silent-rules
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README VERSION || die
-}
-
-src_test() {
-	# autotools-utils broke tests, the first of which being
-	# PASS: 256ppc-8n8s4t-nosys.output
-	emake check || die
-}
diff --git a/sys-apps/hwloc/hwloc-1.2.ebuild b/sys-apps/hwloc/hwloc-1.2.ebuild
deleted file mode 100644
index f5ba0ed89dcc..000000000000
--- a/sys-apps/hwloc/hwloc-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.2.ebuild,v 1.2 2011/08/02 11:37:34 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"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="cairo svg static-libs xml X"
-SLOT="0"
-LICENSE="BSD"
-
-RDEPEND="sys-libs/ncurses
-	cairo? ( x11-libs/cairo[X?,svg?] )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
-		$(use_enable cairo) \
-		$(use_enable static-libs static) \
-		$(use_enable xml) \
-		$(use_with X x) \
-		--disable-silent-rules
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README VERSION
-	use static-libs || rm "${D}"/usr/$(get_libdir)/lib${PN}.la
-}
diff --git a/sys-apps/hwloc/hwloc-1.2-r1.ebuild b/sys-apps/hwloc/hwloc-1.3.ebuild
index cb46cf4e18c4..740f9ec67400 100644
--- a/sys-apps/hwloc/hwloc-1.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.2-r1.ebuild,v 1.3 2011/09/01 16:20:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.3.ebuild,v 1.1 2011/11/20 14:13:21 xarthisius Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit multilib versionator
 
@@ -13,29 +13,33 @@ HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
 SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="cairo +numa svg static-libs xml X"
+IUSE="cairo debug +numa +pci svg static-libs xml X"
 SLOT="0"
 LICENSE="BSD"
 
 RDEPEND="sys-libs/ncurses
 	cairo? ( x11-libs/cairo[X?,svg?] )
+	pci? ( sys-apps/pciutils )
 	xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	numa? ( sys-process/numactl )"
 
+DOCS=( AUTHORS NEWS README VERSION )
+
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable pci) \
 		$(use_enable static-libs static) \
-		$(use_enable xml) \
+		$(use_enable xml libxml2) \
 		$(use_with X x) \
 		--disable-silent-rules
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README VERSION
+	default
 	use static-libs || rm "${D}"/usr/$(get_libdir)/lib${PN}.la
 }
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index b8a6bd10f64b..a569040eb527 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -16,5 +16,6 @@
     </longdescription>
 	<use>
 		<flag name='numa'>Add support for numa memory allocation</flag>
+		<flag name='pci'>Enable PCI device discovery using libpci</flag>
 	</use>
 </pkgmetadata>