Version bump, drop old

(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

5 files changed, 19 insertions, 89 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/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>