Version bump, drop old

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

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index ae795b29aac1e7760fb3b94a20363ad07718668d..5eb1ef306b4933316cd6838107ce28c81749ce02 100644 (file)
--- 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.9 2011/07/10 16:23:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.10 2011/08/02 05:21:19 xarthisius Exp $
+
+*hwloc-1.2 (02 Aug 2011)
+
+  02 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> -hwloc-1.0.3.ebuild,
+  -hwloc-1.1.1.ebuild, +hwloc-1.2.ebuild:
+  Version bump, drop old
 
   10 Jul 2011; Alexis Ballier <aballier@gentoo.org> hwloc-1.1.1-r1.ebuild:
   keyword ~x86-fbsd, bug #372885

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 2eea6d0de90889c93a2b7e01269a62c17bfcdc7a..3eda6bc8ce3c77801e1c613cbf4ac69b806bc938 100644 (file)
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST hwloc-1.0.3.tar.bz2 2125603 RMD160 0ebad61c1c1d6497a51ffb5410df679321fb01ba SHA1 1ebd66e6e77f260445c1ffeef1ce150e1e163ebd SHA256 3dfbc4eaa12e31e2333a0c76b2fffcfb31c6006e1befc7706f720ccdf775c773
 DIST hwloc-1.1.1.tar.bz2 2360861 RMD160 ab3ef7482da5debdfe0b22278897ae50449fb56a SHA1 ca99f6e7c9cb41ca0ce89171c817c1de1d9bbde1 SHA256 24fd493494ecbf06cf5d4252e417c857f5274ab3429a7657afc61d3878efe0d4
-EBUILD hwloc-1.0.3.ebuild 927 RMD160 0634bfda2ffa03c2bf4e41d49b8152716282d19d SHA1 6027238c2879b5ad93d8c350da547071e82a36a5 SHA256 64eb7a022bbf39267ae46e297037e88f85d6efb5cfd9116c4050de9311ea5868
+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.1.1.ebuild 1091 RMD160 8b124d121430167bde1784f0c42fa336b2f882c9 SHA1 0a6c48c85df44d9dd154d51cb5ecb416203b32d9 SHA256 a253b6c2dd3c11cbb6eed3bc092981a67af9445e1ae2e68a5c9bd1204d38d546
-MISC ChangeLog 1414 RMD160 88bf2792fd1e1e5486149bb00c448c4f4b4c2a6b SHA1 c1590ce81074522084ce1bb7fb67d76d8de0cc96 SHA256 23e132ce4ee56cb63df24c9bd8815299f3ba8b4c5952cfbe87d93f0c385e5668
+EBUILD hwloc-1.2.ebuild 1115 RMD160 38feb479cdcbd1129a8d5548bc01492506c297e2 SHA1 4d935b1ebd6389f9dcda3dec3a239c2dad73f350 SHA256 5a04ab12884b41a256c7ef196b679520d0805017aba98e290aa46ad87986bfb9
+MISC ChangeLog 1586 RMD160 b338f4f3d52694733d9555a299c17b646c10b08e SHA1 28c3b7d5fbaca214c4dc6ff0951f0a6dcdeea0fb SHA256 c2cc4b4bb6ef7a82b3fd47b806574247184ccc5916a59642342a6034de394f70
 MISC metadata.xml 816 RMD160 a8a88f7c6cb691e081dc1e9e269f73686257af48 SHA1 566d8aee2c40e015e72b6c9e90e83dee7d11ec34 SHA256 ac473561d8272fca57a6e1d318752d8b3b8e55fe5589d809e181424d6019bfbc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4Z/EsACgkQvFcC4BYPU0pOogCfSx7MlpS5xltDLFfm/P/0d0tu
-nbgAnjA2ySsfH8a45OXhVz5JZWgue+qR
-=J69W
------END PGP SIGNATURE-----

diff --git a/sys-apps/hwloc/hwloc-1.0.3.ebuild b/sys-apps/hwloc/hwloc-1.0.3.ebuild
deleted file mode 100644 (file)
index eddc075..0000000
--- a/sys-apps/hwloc/hwloc-1.0.3.ebuild
+++ /dev/null
@@ -1,35 +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.0.3.ebuild,v 1.2 2011/01/24 16:14:03 xarthisius Exp $
-
-EAPI=2
-
-inherit autotools-utils
-
-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.0/downloads/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-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"
-
-DOCS=( AUTHORS NEWS README VERSION )
-
-src_configure() {
-       myeconfargs=(
-               $(use_enable cairo)
-               $(use_enable static-libs static)
-               $(use_enable xml)
-               $(use_with X x)
-               --disable-silent-rules
-       )
-       autotools-utils_src_configure
-}

diff --git a/sys-apps/hwloc/hwloc-1.1.1.ebuild b/sys-apps/hwloc/hwloc-1.2.ebuild
similarity index 53%
rename from sys-apps/hwloc/hwloc-1.1.1.ebuild
rename to sys-apps/hwloc/hwloc-1.2.ebuild
index 7582f2f4e2c115e5af46ed71744e85861c2e5fff..9a72345557ee6eb74d4777407bf2af5633455935 100644 (file)
--- a/sys-apps/hwloc/hwloc-1.1.1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.2.ebuild
@@ -1,14 +1,18 @@
 # 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.ebuild,v 1.1 2011/01/26 19:43:12 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.2.ebuild,v 1.1 2011/08/02 05:21:19 xarthisius Exp $
 
-EAPI=2
+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/hwloc/v1.1/downloads/${P}.tar.bz2"
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="cairo svg static-libs xml X"
 SLOT="0"
 LICENSE="BSD"
@@ -21,7 +25,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
        econf \
-               --docdir=/usr/share/doc/${P} \
+               --docdir="${EPREFIX}/usr/share/doc/${P}" \
                $(use_enable cairo) \
                $(use_enable static-libs static) \
                $(use_enable xml) \
@@ -30,12 +34,7 @@ src_configure() {
 }
 
 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
+       emake DESTDIR="${D}" install
+       dodoc AUTHORS NEWS README VERSION
+       use static-libs || rm /usr/$(get_libdir)/lib${PN}.la
 }