Retire sci-libs/flann; update source URI in sci-libs/pcl.

5 files changed, 3 insertions, 100 deletions

diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
deleted file mode 100644
index 0fcb3b3..0000000
--- a/sci-libs/flann/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST flann-1.6.10-testdata.tar.xz 26425552 RMD160 2a1b7a34f6d5361ba037b01c1afec79f911e0dcd SHA1 cf11d7fbcc82da8567d0fb73789375f00ac2bdd8 SHA256 5cfd556cae36b5901b929d82492523754dc98c7535338b7c87d55e0a63e14364
-DIST flann-1.7.1-src.zip 582517 RMD160 cec1ce99d2c91ddf8f20d5aa8009a08c5347b904 SHA1 61b9858620528919ea60a2a4b085ccc2b3c2d138 SHA256 eafb8c07cf59ff050be149b15d620ca3dd162e3fce9cb6748cde5d92e0dac775
-EBUILD flann-1.7.1.ebuild 2328 RMD160 a9bf6d2ed94759c4ac5d0883c7b2ab87405bb7f9 SHA1 61b2b056cc1effec0aa5cdfd1bf43e8475f7fc95 SHA256 2c1964418f83e0b0fc9b367658ebb74ebb77a2589567c6cfea7de61f9331d17e
-MISC metadata.xml 311 RMD160 25f901b335509d96f037fce7b63b42c2d31fbad5 SHA1 9a6bee9c256504a0d03d3e9e473fecb9befc5d62 SHA256 822853690015184aafa24ba2c77dde8fd0ca95ca081f40dd2c5e567f114f7382
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 30cb3cf..0000000
--- a/sci-libs/flann/flann-1.7.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-
-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="${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="${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/flann/metadata.xml b/sci-libs/flann/metadata.xml
deleted file mode 100644
index 66a9c10..0000000
--- a/sci-libs/flann/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-	<email>mavrinac@gmail.com</email>
-	<name>Aaron Mavrinac</name>
-</maintainer>
-<use>
-	<flag name="octave">Add bindings for sci-mathematics/octave</flag>
-</use>
-</pkgmetadata>
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 103a6fd..0e3928a 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,5 +1,5 @@
 AUX pcl-1.4.0-vtk.patch 2443 RMD160 26823e6d3b00ea32470d00a33fdea2353662f64b SHA1 b4b76b6953d4e8c93ff3f7574eda9f20c5cdbf7b SHA256 b388627bf89c16b6d5e682314311c4b9ddc4c49b7eb0c4f17d99fbc0b767280d
 AUX pcl-1.4.0-with.patch 817 RMD160 b896b3965c3c46f824accbdb7656f3736f49bfc8 SHA1 b9528fc4a637020302957abd7a8bd2502fea01ce SHA256 60dee8979a413143f0fc6705279495abb068b2f65bc6b6392e97a57de4966a5b
 DIST PCL-1.4.0-Source.tar.bz2 10626702 RMD160 440de4c12c4aba81d2b6197180df85e008eef4d9 SHA1 dc2f89cfafb098c27291549115d39cc6b425d31f SHA256 20d49246773bb54d4b9e133ef3b8b5081c94d1677d823cc0c2d03bcd5bf30a2b
-EBUILD pcl-1.4.0.ebuild 1556 RMD160 0212fc385ca0bf1d1dd7ef011326c22f9560795b SHA1 743011bc17cb0f7074a2d166eb38ecee9112bd31 SHA256 4e341c4d2ab084e890e12c8133517bb0503591a37a1b1ab9ebf3d13a773946e6
+EBUILD pcl-1.4.0.ebuild 1539 RMD160 edeaba72356004b26eca4f66c26ebde33923476a SHA1 f1dcac1e81baf0728543283e328748ff80db6fb7 SHA256 1dc9ce088fd0e2e96078302dbd430c30f65dbc4632d9b61e53a1ea576c364739
 MISC metadata.xml 429 RMD160 8dcebf6342fdc1a0ce8b6167b2727af4a59cbb11 SHA1 468eabfbcaa14808c6848682c955b0a5ecf7fb8f SHA256 4b98ec64528cc840cdd7202a1e537d383bb629e3e8419e3616bd71fad545b2be
diff --git a/sci-libs/pcl/pcl-1.4.0.ebuild b/sci-libs/pcl/pcl-1.4.0.ebuild
index 5ba72d3..5ef3fea 100644
--- a/sci-libs/pcl/pcl-1.4.0.ebuild
+++ b/sci-libs/pcl/pcl-1.4.0.ebuild
@@ -9,8 +9,8 @@ inherit base toolchain-funcs cmake-utils
 MY_P=PCL-${PV}
 
 DESCRIPTION="The Point Cloud Library (or PCL) is a large scale, open project for 3D point cloud processing."
-HOMEPAGE="http://pointclouds.org"
-SRC_URI="http://dev.pointclouds.org/attachments/download/610/${MY_P}-Source.tar.bz2"
+HOMEPAGE="http://www.pointclouds.org"
+SRC_URI="${HOMEPAGE}/assets/files/${PV}/${MY_P}-Source.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"