From 5ce65030474b3225f873193b405dfe9c4b27d918 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Sun, 7 Aug 2011 00:57:51 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.1.10.10/cvs/Linux x86_64 --- sci-libs/flann/ChangeLog | 7 +- sci-libs/flann/Manifest | 24 ++---- sci-libs/flann/flann-1.6.11.ebuild | 83 +++++++++++++++++++ sci-libs/klu/ChangeLog | 8 +- sci-libs/klu/klu-1.0.1.ebuild | 40 --------- .../{klu-1.1.0.ebuild => klu-1.1.2.ebuild} | 18 ++-- 6 files changed, 112 insertions(+), 68 deletions(-) create mode 100644 sci-libs/flann/flann-1.6.11.ebuild delete mode 100644 sci-libs/klu/klu-1.0.1.ebuild rename sci-libs/klu/{klu-1.1.0.ebuild => klu-1.1.2.ebuild} (66%) diff --git a/sci-libs/flann/ChangeLog b/sci-libs/flann/ChangeLog index 8b4e61ca0d93..16f1b0a1d905 100644 --- a/sci-libs/flann/ChangeLog +++ b/sci-libs/flann/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/flann # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.8 2011/08/02 19:09:42 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.9 2011/08/07 00:57:51 bicatali Exp $ + +*flann-1.6.11 (07 Aug 2011) + + 07 Aug 2011; Sébastien Fabbro +flann-1.6.11.ebuild: + Version bump 02 Aug 2011; Andreas K. Huettel flann-1.6.10.ebuild: Fix tests by prepackaging the test data, bug 366477 diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index 7fa5b3e1f18c..85b2663381eb 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,27 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 DIST flann-1.6.10-src.zip 499308 RMD160 4d1bcf66e1aa782a96ff0230b270cf13c004860f SHA1 1a172bd57ac720b621d60a9b81fde62bf4e99708 SHA256 403ab6742177d3f0c7ad651045275e3697cd9ca17b7abc18f9f37d0f9a9a6bda DIST flann-1.6.10-testdata.tar.xz 26425552 RMD160 2a1b7a34f6d5361ba037b01c1afec79f911e0dcd SHA1 cf11d7fbcc82da8567d0fb73789375f00ac2bdd8 SHA256 5cfd556cae36b5901b929d82492523754dc98c7535338b7c87d55e0a63e14364 +DIST flann-1.6.11-src.zip 500128 RMD160 52263c560f71d0ce1fc4f6c63c19bfc2f789c7ea SHA1 cecb709299f1cf16c9f6202e648d6d7ee2b12f8a SHA256 9c4e8a4aa4c7f06ad0bfaf2a4fc5183b34bdc7a6bcf78c122b500b922927c776 DIST flann-1.6.8-src.zip 438645 RMD160 f253c0d65a583632ae2083ab642cb55f51ec90ba SHA1 35e8ca5dd76a1c36652e3c41fc3591a3d6f542c2 SHA256 a03860a31dc40c288e7777620023a3b3ab4227b652bb2cdf40097819049ae929 EBUILD flann-1.6.10.ebuild 2425 RMD160 e6ec2a6a322b088234d4f9ac842c363bef7f0efd SHA1 fa8eafa02e776c167d82ef6b74d383c1cdf7bbbc SHA256 d94743186f3d3151b3e3f7266d0d5d31fc25944c78fde8f8b4699c9f41cb8bea +EBUILD flann-1.6.11.ebuild 2432 RMD160 cb0e379634db480450cda3666ffafb6cdbcd0660 SHA1 a296d71527be128450b4d2be2ffe074b1ea18e24 SHA256 1d4daa0ac588318fdf35cd6a2492ec2856a5771e858a4b983fd9f178228e494f EBUILD flann-1.6.8.ebuild 1102 RMD160 92ef816a555dd9d4b719f01fc36b6086980b1e18 SHA1 152546cd201c20b4a49f409aab42f920b017e566 SHA256 3b443c8d75b10a50a2f2a133e5cd71beff8f5e3f8c46307f08ac9c49c4d650aa -MISC ChangeLog 1359 RMD160 668b34c1bb6986bfb45ece252ad733253a9471ef SHA1 29937d0d5fcf6d1f590a97e46039d0e0c98b0b53 SHA256 157aa635bd3ec01a8722b685247387ea4f053ce691229c5076ed2184616b1cb0 +MISC ChangeLog 1480 RMD160 cb114380ae7f1c1c6a04dc594c44d76b41089139 SHA1 20a574229f028565b401ac72d47f2e1fda83b565 SHA256 26496cd787503aae8dc457a02a7899974d60c16427c7cd5c3f94b5e32a2ce88d MISC metadata.xml 696 RMD160 af7004ccf5ad18f3e8343a0aa68d25d58296cb6c SHA1 5e9530cb2905e7b9b0e19c842f1d0cd9d1c47273 SHA256 324ee2c5f7d3398746efd0e5bfee61e364134800da252630d88e31eb69d4f34b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOOEuGAAoJENwGBM22xffePRIP/0UxxhN5DjwspKHpkwqCK/8d -zZVLg38ZTf5sgamiePCrw+CN0xWpHpfE0tyROSZFigPwci2+hfGiW++oqtYgdGa/ -/UZOV5oKe81hV7wVTrJvfOVgIjEcgAoOZBB6XPVP7sxkHucKjKgEN96HrIab3xQQ -Lsqhw8I7rFKYRV3rpaYqzsoJmpPNad5lHn9vt+DWPqhGViiBKmmr0Gd18KCn16bF -e7jmzoHi1Lu/iXDKazK0Hvzf0jYrQRbHJDiHQgeOUWc+f7F1Z9hydPfn8oXj/gGe -yXEJTod7PF1WUvbmWuZQEw2BjEN2XSebNQnnqyUUHHTqIpKrzQTCm4PHXxbwJ7Hf -sfYf88pcshJRWK8qE5J1sOoUMVIReDtqUi5nzvtuIia4/je/tmHf6BP1u88EiKzM -VVA1va/EIEo+EIjTlrHSqIiJMYx6G9jqCkpTYddQk0A9xXf1lGB8AGjjEcHdN9QA -eQoqDShvOkm5ReLIVGMi9E10PJo19vvNmjYsAaeo7exUvTkknJqnDPROq5Ydpvya -xBEXFKMKBNTwWzk7vCvqw0GOTRx2pwyvZ1HhXfdDQ+N7W0QtWEWxxSVBgqOQ9WMf -Pzegk8K97hFyPeO1pR3VKmZfiCqbOvtA+mOR5fUQWFpbjdLBkwqNBETdbKZwM4ZL -scSPBY2/7y/en2PB7cCa -=dACu +iEYEARECAAYFAk4946cACgkQ1ycZbhPLE2C9xQCeO8sbxBS87LC0MG4lnkfKBMxl +meAAn2b8pxe6kemwB2KA3HvGGpzwBAzx +=R/4C -----END PGP SIGNATURE----- diff --git a/sci-libs/flann/flann-1.6.11.ebuild b/sci-libs/flann/flann-1.6.11.ebuild new file mode 100644 index 000000000000..8541e71245e4 --- /dev/null +++ b/sci-libs/flann/flann-1.6.11.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.6.11.ebuild,v 1.1 2011/08/07 00:57:51 bicatali Exp $ + +EAPI=3 + +PYTHON_DEPEND="python? 2:2.5" + +inherit cmake-utils eutils python + +DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces" +HOMEPAGE="http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN/" +SRC_URI="http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip + test? ( http://dev.gentoo.org/~dilfridge/distfiles/${PN}-1.6.10-testdata.tar.xz )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc mpi octave python static-libs test" + +RDEPEND=" + sci-libs/hdf5[mpi?] + mpi? ( dev-libs/boost[mpi] ) + octave? ( sci-mathematics/octave ) + python? ( dev-python/numpy )" +DEPEND="${DEPEND} + app-arch/unzip + test? ( dev-util/gtest )" + +S="${WORKDIR}"/${P}-src + +src_prepare() { + # bug #302621 + has_version sci-libs/hdf5[mpi] && export CXX=mpicxx + # gentoo doc directory respected + sed -i \ + -e "s:share/doc/flann:share/doc/${PF}:" \ + doc/CMakeLists.txt || die + # python standard installation directory respected + sed -i \ + -e "/share/d" \ + -e "/COMMAND/s:install:install --root="${ED}" --no-compile:" \ + src/python/CMakeLists.txt || die + # produce pure octave files + # octave gentoo installation for .m files respected + sed -i \ + -e 's/--mex//' \ + -e 's/\.mex/\.oct/' \ + -e '/FILES/s/${MEX_FILE}//' \ + -e 's:share/flann/octave:share/octave/site/m:' \ + -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ + src/matlab/CMakeLists.txt || die + # do not compile examples by default + sed -i \ + -e '/add_subdirectory.*examples/d' \ + CMakeLists.txt || die + # compile tests only when requested + use test || sed -i -e '/add_subdirectory.*test/d' CMakeLists.txt + # avoid automatic installation of pdf + use doc || sed -i -e '/doc/d' CMakeLists.txt +} + +src_configure() { + local mycmakeargs=( + "-DBUILD_C_BINDINGS=ON" + $(cmake-utils_use_build octave MATLAB_BINDINGS) + $(cmake-utils_use_build python PYTHON_BINDINGS) + $(cmake-utils_use_use mpi) + ) + cmake-utils_src_configure +} + +src_test() { + cd "${CMAKE_BUILD_DIR}" + LD_LIBRARY_PATH="${PWD}/lib" PYTHONPATH="${S}/src/python" \ + emake test +} + +src_install() { + cmake-utils_src_install + dodoc README.md + use static-libs || find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' +} diff --git a/sci-libs/klu/ChangeLog b/sci-libs/klu/ChangeLog index 86c5cd21741d..78dc2aaa4437 100644 --- a/sci-libs/klu/ChangeLog +++ b/sci-libs/klu/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/klu # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/klu/ChangeLog,v 1.5 2011/06/26 15:18:10 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/klu/ChangeLog,v 1.6 2011/08/07 00:54:52 bicatali Exp $ + +*klu-1.1.2 (07 Aug 2011) + + 07 Aug 2011; Sébastien Fabbro -klu-1.0.1.ebuild, + -klu-1.1.0.ebuild, +klu-1.1.2.ebuild: + Version bump 26 Jun 2011; Justin Lecher klu-1.0.1.ebuild, klu-1.1.0.ebuild, klu-1.1.1.ebuild, metadata.xml: diff --git a/sci-libs/klu/klu-1.0.1.ebuild b/sci-libs/klu/klu-1.0.1.ebuild deleted file mode 100644 index 2a45ceba614d..000000000000 --- a/sci-libs/klu/klu-1.0.1.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/sci-libs/klu/klu-1.0.1.ebuild,v 1.2 2011/06/26 15:18:10 jlec Exp $ - -inherit autotools eutils - -MY_PN=KLU - -DESCRIPTION="Sparse LU factorization for circuit simulation" -HOMEPAGE="http://www.cise.ufl.edu/research/sparse/klu/" -SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND=" - sci-libs/amd - sci-libs/btf - sci-libs/colamd" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-autotools.patch - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README.txt Doc/ChangeLog || die "dodoc failed" - if use doc; then - insinto /usr/share/doc/${PF} - doins Doc/*.pdf || die - fi -} diff --git a/sci-libs/klu/klu-1.1.0.ebuild b/sci-libs/klu/klu-1.1.2.ebuild similarity index 66% rename from sci-libs/klu/klu-1.1.0.ebuild rename to sci-libs/klu/klu-1.1.2.ebuild index 840ebad1fc21..8a78fc69ceb1 100644 --- a/sci-libs/klu/klu-1.1.0.ebuild +++ b/sci-libs/klu/klu-1.1.2.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/sci-libs/klu/klu-1.1.0.ebuild,v 1.3 2011/06/26 15:18:10 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/klu/klu-1.1.2.ebuild,v 1.1 2011/08/07 00:54:52 bicatali Exp $ -EAPI=2 +EAPI=4 inherit autotools eutils @@ -17,16 +17,18 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc static-libs" -DEPEND=" - sci-libs/amd +DEPEND="sci-libs/amd sci-libs/btf sci-libs/colamd" RDEPEND="${DEPEND}" +DOCS="README.txt Doc/ChangeLog" + S="${WORKDIR}/${MY_PN}" src_prepare() { epatch "${FILESDIR}"/${PN}-1.0.1-autotools.patch + sed -i -e "s/1.0.1/${PV}/" configure.ac || die eautoreconf } @@ -35,10 +37,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README.txt Doc/ChangeLog || die "dodoc failed" - if use doc; then - insinto /usr/share/doc/${PF} - doins Doc/*.pdf || die - fi + default + use doc && dodoc Doc/*.pdf } -- 2.26.2