Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 20 insertions, 103 deletions

diff --git a/sci-libs/flann/ChangeLog b/sci-libs/flann/ChangeLog
index 1f303e47f9cd..433f288127e7 100644
--- a/sci-libs/flann/ChangeLog
+++ b/sci-libs/flann/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/flann
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.25 2015/04/19 10:05:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.26 2015/04/19 15:56:25 kensington Exp $
+
+  19 Apr 2015; Michael Palimaka <kensington@gentoo.org> -flann-1.7.1.ebuild:
+  Remove old.
 
   19 Apr 2015; Agostino Sarubbo <ago@gentoo.org> flann-1.8.4-r1.ebuild:
   Stable for x86, wrt bug #545528
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index b82ea1d2f886..ef1a2c1d0963 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -7,29 +7,27 @@ AUX flann-1.8.4-docdir.patch 571 SHA256 9feb1fe865a8364babd3dc64f5f22b9de7e4a1aa
 AUX flann-1.8.4-examples.patch 1020 SHA256 5c664f93bad2b77ec2159dc856aeb1be8b8b1b18887434b69f5a760d0b1a0f87 SHA512 5baeb594d2b4a1a8456135c9f0bec72a3182dcacbdebd398b079f13982e5e7a1722500313699ea25b7085f1dca3cab4ea355992d9014135e011452168e65fc83 WHIRLPOOL e2c2136e47be52f4ec3b9b138c95afe896928a033b16ecc1c197d7efb73489acd08570eb3952dda083f49652c70399b7ec8121351143ee7ba2ad8a74beffb153
 AUX flann-1.8.4-multilib.patch 570 SHA256 320df5839e9904a25db9f94e6283576fcef426ee4167a45cc5b729656c8df505 SHA512 1f5a72920af200f23a318b3205cce498a6f193eb8f89b85fcc9b8ef45c49b4b98143cc9cc6996821e63cdb709eeac0f13b46c129471aa82a06ec22be1f4ec8f6 WHIRLPOOL 153dc2c739d7427fa4a114390b49727adb129a9604fa045a7e2c4581f7f994fca31be031dc346b0144e828388bf02a4c8b7c843a7eab5c71fd914d7307ed81a5
 AUX flann-1.8.4-options.patch 1485 SHA256 3d547a6e4c1658a37011aefc60d4215c5dd04bc5caf6f965a6717df4bad4f4af SHA512 2335ddf683d883f0b5247b4d7e688644231c2d6a914c0d271965b0024270e77a36ccded142ab666651833712cb64a427eb753f76757cf5eb765f130b170f4251 WHIRLPOOL b7285c92c904e07fe729fe46e0689067039914eb719a0997c71e994fe523f30f0a4aab3b0d7dfab638e82cd95871ee55693f89a7dff4786a5b6e158f9e52cc27
-DIST flann-1.6.10-testdata.tar.xz 26425552 SHA256 5cfd556cae36b5901b929d82492523754dc98c7535338b7c87d55e0a63e14364 SHA512 819428c9088b8cd661f21d063594c2f79a378ec3d49fb9713fc24146f4c7f8fd3d1dcb5c5ea77064f17895959289af64de750d9559f7958b1ca0f32b73132a44 WHIRLPOOL 7b9194068a8331887946338bbd7af5fea923565c44c790f47624dc7275cca98d6bfd1e482a59acd46b3cf05c50552bdaad6eebed34a78ac89cbb8bc31a4867f0
-DIST flann-1.7.1-src.zip 582517 SHA256 eafb8c07cf59ff050be149b15d620ca3dd162e3fce9cb6748cde5d92e0dac775 SHA512 a94f6acb6a23603c8f7e5347b317d15d50de134707389f27f22896ec99f4a0ae576fbeb56203cd1bff57707d4353f7fb98c85f1a2e976810734506049068efb0 WHIRLPOOL 16c3f931e738e31bbf75aa8d6f1365e0a0b790c037624b3af1a2df306549dd95e2ab60da9f5ca4e09587341d9afe72ef7b999109f630f8757daddb1af64dcb85
 DIST flann-1.8.4-src.zip 561057 SHA256 dfbb9321b0d687626a644c70872a2c540b16200e7f4c7bd72f91ae032f445c08 SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a WHIRLPOOL f7722d8c0a8482809920927353421ebb578464fe6746a4dba20a6c7b6f941715529d5be33aebd1726db36eae3b5d4080c6ae86b0f807e6e384af32b87735b83b
 DIST flann-1.8.4-testdata.tar.xz 26744244 SHA256 4eaecf3a221ea6611e841fa2f459a17b6a5fdd633338bb5bc46c434e37667141 SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb WHIRLPOOL e49e5a594464955241ebc9bdfa908bac8b93b2fb465fc08ab73ec4d57194a8b71361ecb67985cdc641013fb8c3fb51ea2033769f41e558ab86e8f71e477b97da
-EBUILD flann-1.7.1.ebuild 2492 SHA256 1dbdc8ce13378d3f25289f7820f807fe03fc50b29ab3fcab8e9b5cf89356039e SHA512 8a7aac8edd08ca89759135ddc34c186d77f86e77f90530f71e65ed19dbc003e475252e0f231778a7b0638ab28faef7ee365849bde00e081619776841ed533575 WHIRLPOOL 2510d237b0ad58b169535cd9efec040e3c811f51e00fe912767239d318d408b4131bafebd6406903d2584de908560def0d8dc2c0bb52502c1c9e88ef24e1479e
 EBUILD flann-1.8.4-r1.ebuild 2819 SHA256 0f148089d4f574e9e9a79097f9936cc527c747e4e35c0f077eec9d4bc18195f1 SHA512 986e53c24089261b4a278741dd13d12ed7fc092f771ebeb5a9844ea9167a78c6cbbc0564189560d6dc891500cac460fdcb219aaba6fae1a3a139f3dcecd73f3c WHIRLPOOL ed6d817270266fe492cc96a919ef0d02ba0e4f6ed332c9fdac28e744b2be9dc57b5602ed3a744a9edc6b64c9aa326fc2e1f14fb89afa7891c9fac2a2fd82ec59
 EBUILD flann-9999.ebuild 2802 SHA256 4867b048102675c2d828edf1ef3fdffabe629262c278ed399e61768634885060 SHA512 f2aef90bb7dbf3ca732da58b015b474c2b3470e9b268e17915a20080ef8a76d2170cd69f0df5ed2e1a9178c5ec053943b219102d2ceaee4f0870b3304957a38d WHIRLPOOL 52580a524e68007cd3c121749a5a311fd5a41b992d4f3031a238d49f38772b557ea07c8d76198f804d0f20afe605b16f2387bc1c16408d7f5ac86f1b779e8a95
-MISC ChangeLog 4023 SHA256 b54a238cdd06b90b457e918a11261fa2e7a67ee2975f627ded6b62083a5f2b01 SHA512 c793cecbb2d9d6e9ef0f2fec6c70ef03aac48fef03897826dc4df21c74f96079fdfbf85919a1b159c9d118f0c31ec0e3cf79c1461215531a16fbabbc942b9e1a WHIRLPOOL bb99e439135a80711198091d559b23b83653a63b18204a19df084dc78c8df04a987e4a84b8330a28b969f59f9f5ada0c2e67afcff2d19c95e42bdaf7a219e1b5
+MISC ChangeLog 4122 SHA256 714363aa56cb30e781f169fe83c239f0631c33e3b6b945b02bcddfa37c70838a SHA512 0e698aa9b8353e267eb669079e02d7afdd66faa8897d43502927b93af058f2b823e7b2b9d995c89915831a75f4052437a0f257fce1e9f122d1291f7e72858d74 WHIRLPOOL 2bba80bbb4a3179ac8b28d050e0c71fc412fb7976e057b1a81b26687006040fa0e5e13a16022d56c497add6a13d2af27c24aa47ab77588bc26e0f47f3f5c876d
 MISC metadata.xml 781 SHA256 12ae40e2fdb97ee12b0360dfef3bd7c1a73d0556f7f2d8e354112f895b5077df SHA512 b7279686066f4c4c37db5cce0865b5b6292fdc3d7f1cca7e8d8630f18bee433add75dcc235e8a1af5c57bcaee4067e01eb595c510dd8824387f39934bacd5628 WHIRLPOOL 0d48219b90f11ada95d6a4991cfa9a1749cfa64ec7282009e88ff67979c9cbe353f43436973b01b75f4d70cedec612910eee47f8f547e9c22f22462c1d21a5d2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVM33MAAoJELp701BxlEWfS/oQAKlHa8N3CvWvAoz+uErvEitQ
-xbvYPn+i+ENKqH6XP6TnqSMYV1zY5T9YRl3LnvTuCBqlx1l/bm2jdUys+xhYVD+Y
-E6mDL281G+rzVjBJGQ8aG+fBVN2g0yJ1XaM0l/JtSOUJ6npYM+X8FFgSSEqnfUBw
-NzmM1MqZPZYQzLdj1vx5M89Ki3gMt54NMzzt1B4+Po4Qgxs73bXMGzVg9kmyyrLh
-0K9CNh4YRlLCLJagS33F9AswpqvxB2qs7fexcZNPZ0UEOL/iH2id1ypcJN5vHpgV
-RIWk3wv/8RN31EtkRrKWmS/EXBDKs6Qmv5U+yrnStwdK7sjuxhYw4SFFa3GcAkUr
-95F39hzhObrLr7eA6WmyLfTDx5w/jx2DntVFKzWxuOUVO+RiVj2zoHfbhHIpwbRY
-BYh5YrXTwguNyRTbfnTjhKFYO6CrLNjp1rJ+j16QCEP402lA4FsBh/KjCiNTl1/i
-Mfcqrqyd8IT5OrkfP9YRfmZ18BQOPi27HcHLoGVvxo+5Gl9717jtvlrX9irCeB8d
-HzPEtKXN3/jFVRwika0PGMMJWI/ao3HruQUqZXbedI0/ZTPG95XcL/7Vbjv+fBxs
-iq/mPntbFPixnzVWg0Uv/00J9HEAKEm2BC3CEZUzarDYpHfRMnfKAwY46gfUqEDY
-LOgvWhF8CuNmo5+FR8Oy
-=3C8p
+iQJiBAEBCABMBQJVM9AoRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7O0hD/9eNWIkKW7TYTkTa4ElObEgmyMyN6fmP+yTKAMEPom9JuJmhIre1dSG+Eme
+vUijnslNgSZhySaoKlp6uT/gbpsRLyC24HIo3uywQQdqVWsbeO1QnNyZ3W1+J5UR
+gttXSuk2B+266Q+lIGePdW8jdkUU+ez/8f5xASzC/PiQ1rJuKWcPfTTPkc/nP7n6
+a/J2vDnvQNN+BJS1crzhonFYSM/Rv69w85i8www+bjtYonFSBe5snu+2LgdqWFKy
+3IT/KZSC/SGhi5njVdGQ6qwLgCaLPQOOEA5HcDxWeejNv+2cIX6BC2NcKuNul7Zw
+HFNa3x1McqVvasupyQ8Vtkts/mWkowjpsSOwXZG/h+j/jx9OdVB9wGXO+pFH4Gnu
+cgNBZjhmiJ3wXET1oyQYmvje2pqgz0yiujfZrxHVv3pPWWLWpAs3oXe4f2cZTvqs
+pOwjSmjPtDaymDieNNl6+6kvjzsIIjs3W4zOyA6LHoNcG4t2MQfHwKMxEcDWsl0o
+rO9sxADYVf0c9hPBqp0fflxGmMV7FhllC3xBNimPAAaRMdfmFmgpNgdMieW4uYz0
+g2SbJsX3v8BgLvX8HxNI9Nlo0CH5C8JMFQiwKL5qN0Xflp3ozBYwOzeInRD+dI2s
+TSkMspofcOOYuO6XqOHDf1wGug+utO884C95eAfLE1t23rC4Ew==
+=7rCZ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/flann/flann-1.7.1.ebuild b/sci-libs/flann/flann-1.7.1.ebuild
deleted file mode 100644
index 1e3669b93853..000000000000
--- a/sci-libs/flann/flann-1.7.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.5 2013/12/07 19:10:22 jlec 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/research/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 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc mpi octave python static-libs test"
-# cuda needs to be implemented!
-
-RDEPEND="sci-libs/hdf5[mpi?]
-	mpi? ( dev-libs/boost[mpi] )
-	octave? ( sci-mathematics/octave )
-	python? ( dev-python/numpy )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-cpp/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="${D}" --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"
-		"-DBUILD_CUDA_LIB=OFF"
-		$(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 '{}' '+'
-}