gentoo resync : 04.08.2018

3 files changed, 67 insertions, 0 deletions

diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index 6ce8b6b1de4d..f9e4f2155795 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -1,4 +1,7 @@
 AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064cef2c50d6c662ef1ca15c6beb6548d9dda056e19d2bc30fa87f067e566abf22d1c1b72496539f073d749878933c00bf7d099d8d SHA512 90defe2149a8cf8766022af6cf1248985c350e56bb9fcae99daf9551acf9272b93ea9b9c25ecef86803e75deb0ab50c2a0f919c35705d54ca38c7cafe5940f03
+AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
 DIST libLAS-1.8.1.tar.bz2 3920203 BLAKE2B 2ef8e822c5d1c07d929e788c59e6e5b942aba637fb764d37e1505d136c75cd4a28efc4702b022bcfee8063b684956b4466c9ec00e737d7024ca2719d7b11f341 SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf
+DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
+EBUILD liblas-1.8.1-r1.ebuild 1074 BLAKE2B 9d98bcc272519372f35e5cbe1207a2f112a39acf23e6aeb9f89018b34ef8f3a53df8184218a1db6dc4c25452c644c388f0683a023a409308d7b0efbed14cb07c SHA512 59bbe726ee289aef3d13fcda97aa17404071f909bb463d0290e116d7ddb8b215973d5c4e387b8a848e5b0788d82c8b2b1946f58c57d0d3ff98e1adebd29e5818
 EBUILD liblas-1.8.1.ebuild 986 BLAKE2B c9af42b8c995edc65e44129edb303a61df2a154ece99e1772520a5debd96803e5be5a1d6d72a0297371b6d236910aef3aa3c68f2853ccd5dbad366becfe2d84a SHA512 2f5ccdcc9ad4a14f868f6d3996079fd0030e369e3cfb02fa0bda923cd8122fa78e2c4472ede1c6258955d35cbc7b34092d7ebf66e20f4aadd3249dd9553cfece
 MISC metadata.xml 497 BLAKE2B cdae8ef4bfaffefd73a5751950379c704581e09a9f435fc52bac7520f3632fc37007d21750616a05060e2f9213a8ee05278c565be9b80ee8529ff9e5a6c07b6c SHA512 21d5b18461e131a543ba5a5ac1b2f06652d5d49ebd0e590f0bd0971deb337efeb813698613e4bbf200a934a3afa9b20dbb80d6659778c22c8a97d9471007d3d7
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-fix-overload-call.patch b/sci-geosciences/liblas/files/liblas-1.8.1-fix-overload-call.patch
new file mode 100644
index 000000000000..0b77da12148a
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-fix-overload-call.patch
@@ -0,0 +1,15 @@
+--- a/src/gt_citation.cpp	2018-08-03 12:16:16.007831564 +0100
++++ b/src/gt_citation.cpp	2018-08-03 12:16:45.224830335 +0100
+@@ -387,10 +387,10 @@
+         osCitation += primemName;
+         bRewriteGeogCitation = TRUE;
+ 
+-        double primemValue = poSRS->GetPrimeMeridian(NULL);
++        double primemValue = poSRS->GetPrimeMeridian();
+         if(angUnitName && !EQUAL(angUnitName, "Degree"))
+         {
+-            double aUnit = poSRS->GetAngularUnits(NULL);
++            double aUnit = poSRS->GetAngularUnits();
+             primemValue *= aUnit;
+         }
+         GTIFKeySet( psGTIF, GeogPrimeMeridianLongGeoKey, TYPE_DOUBLE, 1, 
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..8e0dbdea8572
--- /dev/null
+++ b/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+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"
+
+# tests known to fail due to LD_LIBRARY_PATH issue
+RESTRICT="test"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="gdal"
+
+RDEPEND="
+	dev-libs/boost:=
+	sci-geosciences/laszip
+	sci-libs/libgeotiff
+	gdal? ( sci-libs/gdal )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/libLAS-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
+	"${FILESDIR}"/${P}-fix-overload-call.patch #bug 661654
+)
+
+src_prepare() {
+	cmake-utils_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=(
+		"-DWITH_GDAL=$(usex gdal)"
+		-DLIBLAS_LIB_SUBDIR=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}