gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 53 deletions

diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index c7b6ffc11618..6298318e9004 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -5,6 +5,5 @@ AUX liblas-1.8.1-fix-debug.patch 600 BLAKE2B 6e8f94881f49058bb835e9978640721db4e
 AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
 AUX liblas-1.8.1-gdal-2.5.0.patch 1052 BLAKE2B 8686e4c02fccd1d638f7fc006a42ff7a84964bc236d8283bba24355352e2ef62a43eb8f3a44105cce516886c81cff43fb5be1162d3009b6d00a5f47425f01099 SHA512 3c784cedd45bf7fcd96438e22c5b8d672f91bcf08ce891d14aa2d6f9324f6106f8948b3002e8ceddbe03a949569b7e0a97087883eef4e79724fd33fd33d2558f
 DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
-EBUILD liblas-1.8.1-r2.ebuild 1105 BLAKE2B aff71a1dd3b4775796cce7ab64422313b2c98e78077c8c69ce3eb0dfe1d49fe4f7ecaed3af5972d285c40f05b8957b996295dcaa34e0dc2ac26270666e4246de SHA512 c0c539ca00cebe2aaa63ac2711d876479738de072b407d3bf749fb31e86480106bcaba1e39903fd4783bd5e14ed3acb20306624a5dcd876c16a1813189bbfbe6
-EBUILD liblas-1.8.1-r3.ebuild 1333 BLAKE2B 3923e2d4636137859678df1098150925311ed192a6ec32c7ddd79ef8b44cbd6513f46929d8a33a3961977f18f809628b5b0d1ca755aa45c75da485a64828c683 SHA512 4bcf473335cae6fde45c2733a5014400983213a25dd3063cb39aba3d2590b2ae5f23f7e63ab3e4299701b28270943ee9ee3ee0da3ee18b82d2c48f6b7a52dfe9
+EBUILD liblas-1.8.1-r3.ebuild 1331 BLAKE2B 195719248c3083ebbf3b4bcc054afbf904216b4980ab7db205739fc737032ac5bc86cb31eec11a43f52abd5392be4f640c4ea2246f3104fd56408567e9833d7f SHA512 6af1d59520f69d8d4c4649617bb00bd05cbb409b9d0b4e8b8af1b89fd9460038ca1838e4f545c130cde69b01899bf073f7621d260ce3f4190383ec822f020f80
 MISC metadata.xml 497 BLAKE2B cdae8ef4bfaffefd73a5751950379c704581e09a9f435fc52bac7520f3632fc37007d21750616a05060e2f9213a8ee05278c565be9b80ee8529ff9e5a6c07b6c SHA512 21d5b18461e131a543ba5a5ac1b2f06652d5d49ebd0e590f0bd0971deb337efeb813698613e4bbf200a934a3afa9b20dbb80d6659778c22c8a97d9471007d3d7
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
deleted file mode 100644
index 949af96ab07b..000000000000
--- a/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
-HOMEPAGE="https://github.com/libLAS/libLAS/"
-SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE="gdal"
-
-DEPEND="
-	dev-libs/boost:=
-	sci-geosciences/laszip
-	sci-libs/libgeotiff:=
-	gdal? ( sci-libs/gdal:= )
-"
-RDEPEND="${DEPEND}"
-
-# tests known to fail due to LD_LIBRARY_PATH issue
-RESTRICT="test"
-
-S="${WORKDIR}/libLAS-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
-	"${FILESDIR}"/${P}-fix-overload-call.patch # bug 661654
-	"${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# add missing linkage
-	sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \
-		-i "${S}/apps/CMakeLists.txt" || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBLAS_LIB_SUBDIR=$(get_libdir)
-		-DWITH_GDAL=$(usex gdal)
-	)
-	cmake_src_configure
-}
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
index c8f1fb5c1aa8..46930174cabd 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
 IUSE="gdal"
 
 DEPEND="