gentoo resync : 30.06.2019

4 files changed, 2 insertions, 81 deletions

diff --git a/sci-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest
index 7be7714e1dea..a02ff08762b0 100644
--- a/sci-geosciences/laszip/Manifest
+++ b/sci-geosciences/laszip/Manifest
@@ -1,6 +1,3 @@
-AUX laszip-2.2.0_fix-build-system.patch 1516 BLAKE2B e79bff26c87b51667394c361379bee1d6f048d928b051dd9c357834b50a9980da8ecd248aa63acb25ca76ae19130d99a7b2db183056869670731b818f56da84a SHA512 3b2a8523491ffeded85e7aad50b1792f1f26354838afb7ab2e36bb29e2178cd1fb75601c238d59eff7779bb87a7fd5d93696a2da01951df188e66833ce6ff301
-DIST laszip-src-2.2.0.tar.gz 407457 BLAKE2B d183ab6acf67708b3fc293ade228f516cc364d4cd494f5758cbba93969605f66e450aaa01a07660fd8976031b7747b40e0400573558d0f14b0e19874bf7d9fe3 SHA512 44dacb0d0ab79ac02c784549f42c4522451646b322835afc78fbf8bb82be40e023d374635c2a18989c73a5553e05b55d7c32f35d510f816704020b0e02365824
 DIST laszip-src-3.4.1.tar.gz 219421 BLAKE2B b1bb3f66d9209c6a137af84c8d220ee6a50309139721b8e0befb4f56991e8153fc6446666ca5c2cdcb57abf297694f1f679a3961dabdff6450bc6dcc965ef6cd SHA512 001602a602dda1e43a08ee306b9c7c23faaf5777d551c269aac4a21b1c99449d2f12f46a0f95ff237003a0ab691eaca15b43b2f4d354651abc5d54930a39a134
-EBUILD laszip-2.2.0.ebuild 618 BLAKE2B 2f9dc6350f6d45c5939c1ef36819ac26c973b94b1ade0a1cb4bfd1158de1014cf51357a37609f7f1c03b6affe409db2650f439304dfb8415df654068ea2fb1df SHA512 ccc87347bd374b875dc2c242cb25496fa77ee5355f737338ca676b878a55dc0d5bc28c228b103aac1845387b27beb4cb06308f2823a4a7c5b426ae9c8fccb14a
-EBUILD laszip-3.4.1.ebuild 438 BLAKE2B e84b85733b083c3839354f73320f0be0d37f27535bca9c03aadf6a081f97be9a72f20025cc8e398001323ba53c8438a321f07cefc018604b4302290d7a39a62a SHA512 1ef97c2167411a429cae672e57b60c485328494c7bc3986217f7ab5c9086ca8841a28a35d215b59843c51ee6e58ee05569480715c154584e0e1af40c2ae521ca
+EBUILD laszip-3.4.1.ebuild 434 BLAKE2B 9cedceabf3583fbee6a489614605b90b92f3a15757f6daa57a7f648ee73635f5e8ba7b8786912b2dd8b5618108003fefa1ed25163bad638b92b2bcd70a716240 SHA512 c5af2f586d2ffd68ddd8afe4a292685c0b1f6c621d5d537a65ef830aa2d82b94fdd4b3fbdd5ca65ec777a9cd68b20f56264b69c8699cca599058a044c5077703
 MISC metadata.xml 486 BLAKE2B a8de1ac6ab5f2981a1e9c514e233d1b84b48bc953aa6056b47ab0f9b5fa234db0380e35a24fb3d3effeafe8fb63b411aa815a99152789a44a732176c291c2541 SHA512 29ba500c7d71620ad3fe1673395ba4073910ba2c898efabe3d6305cd2085bbd00b1c03e21ddbefa17a505973b6083d0fc3faeedd2b1561486e8fe90647b27039
diff --git a/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch b/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch
deleted file mode 100644
index 4587331eba3f..000000000000
--- a/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- laszip-src-2.2.0/configure.ac
-+++ laszip-src-2.2.0/configure.ac
-@@ -21,9 +21,6 @@
- 
- m4_define([debug_default],[no])
- 
--CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS"
--CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++98 $CXXFLAGS"
--
- dnl #########################################################################
- dnl Checks for programs.
- dnl #########################################################################
-@@ -68,8 +65,8 @@
-     CXXFLAGS="$CXXFLAGS -g -DDEBUG"
-     AC_MSG_RESULT(yes)
- else
--    CFLAGS="$CFLAGS -O3 -DNDEBUG"
--    CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG"
-+    CFLAGS="$CFLAGS -DNDEBUG"
-+    CXXFLAGS="$CXXFLAGS -DNDEBUG"
-     AC_MSG_RESULT(no)
- fi
- 
---- laszip-src-2.2.0/src/Makefile.am
-+++ laszip-src-2.2.0/src/Makefile.am
-@@ -1,6 +1,6 @@
- SUBDIRS = . 
- 
--AM_CPPFLAGS = -I. -I../include -I../include/laszip
-+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/include/laszip
- noinst_LTLIBRARIES = liblibrary.la 
- 
- liblibrary_la_SOURCES =				arithmeticmodel.cpp \
---- laszip-src-2.2.0/tools/Makefile.am
-+++ laszip-src-2.2.0/tools/Makefile.am
-@@ -1,5 +1,5 @@
- 
--AM_CPPFLAGS = -I../include -I../include/laszip
-+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/laszip
- LDADD = ../liblaszip.la 
- 
- laszippertest_SOURCES = laszippertest.cpp
---- laszip-src-2.2.0/include/laszip/Makefile.am
-+++ laszip-src-2.2.0/include/laszip/Makefile.am
-@@ -1,4 +1,4 @@
--laszipdir = $(includedir)/
-+laszipdir = $(includedir)/laszip/
- 
- laszip_HEADERS =		lasunzipper.hpp \
- 						laszip.hpp \
diff --git a/sci-geosciences/laszip/laszip-2.2.0.ebuild b/sci-geosciences/laszip/laszip-2.2.0.ebuild
deleted file mode 100644
index 02addaad7d04..000000000000
--- a/sci-geosciences/laszip/laszip-2.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format"
-HOMEPAGE="https://laszip.org/"
-SRC_URI="https://github.com/LASzip/LASzip/releases/download/v${PV}/${PN}-src-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_fix-build-system.patch
-)
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	autotools-utils_src_configure
-}
diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild
index 27cff79b9aa1..921a15518827 100644
--- a/sci-geosciences/laszip/laszip-3.4.1.ebuild
+++ b/sci-geosciences/laszip/laszip-3.4.1.ebuild
@@ -11,6 +11,6 @@ SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV
 
 SLOT="0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
 
 S="${WORKDIR}/${PN}-src-${PV}"