gentoo resync : 02.06.2019

13 files changed, 568 insertions, 17 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 3f2afe9c5b09..85850ba67556 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest
index 08d055e21bc9..7be7714e1dea 100644
--- a/sci-geosciences/laszip/Manifest
+++ b/sci-geosciences/laszip/Manifest
@@ -1,4 +1,6 @@
 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
-EBUILD laszip-2.2.0.ebuild 624 BLAKE2B da738b4eff2834646ab21e600b5f3d4345e24a1fd5e7d675e63a9f2b026a816e87cd8e354ca7015ec5f39910ca57b9b833bc851b4923c908f1afab8df4bd6469 SHA512 01e366b05687ab5a3b8f7ae28580ba2dc7aa3b7fdf5914b0603dd38e92b56eacc1b98d56f6e240247b4e8a8c64cda74608e66ef34cf49c19732fc98022e8013b
+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
 MISC metadata.xml 486 BLAKE2B a8de1ac6ab5f2981a1e9c514e233d1b84b48bc953aa6056b47ab0f9b5fa234db0380e35a24fb3d3effeafe8fb63b411aa815a99152789a44a732176c291c2541 SHA512 29ba500c7d71620ad3fe1673395ba4073910ba2c898efabe3d6305cd2085bbd00b1c03e21ddbefa17a505973b6083d0fc3faeedd2b1561486e8fe90647b27039
diff --git a/sci-geosciences/laszip/laszip-2.2.0.ebuild b/sci-geosciences/laszip/laszip-2.2.0.ebuild
index e0397f0829eb..02addaad7d04 100644
--- a/sci-geosciences/laszip/laszip-2.2.0.ebuild
+++ b/sci-geosciences/laszip/laszip-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ AUTOTOOLS_AUTORECONF=1
 inherit autotools-utils flag-o-matic
 
 DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format"
-HOMEPAGE="http://www.laszip.org/"
+HOMEPAGE="https://laszip.org/"
 SRC_URI="https://github.com/LASzip/LASzip/releases/download/v${PV}/${PN}-src-${PV}.tar.gz"
 
 SLOT="0"
diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild
new file mode 100644
index 000000000000..27cff79b9aa1
--- /dev/null
+++ b/sci-geosciences/laszip/laszip-3.4.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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/${PV}/${PN}-src-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/${PN}-src-${PV}"
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index f9e4f2155795..b91799176fdf 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -1,7 +1,8 @@
 AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064cef2c50d6c662ef1ca15c6beb6548d9dda056e19d2bc30fa87f067e566abf22d1c1b72496539f073d749878933c00bf7d099d8d SHA512 90defe2149a8cf8766022af6cf1248985c350e56bb9fcae99daf9551acf9272b93ea9b9c25ecef86803e75deb0ab50c2a0f919c35705d54ca38c7cafe5940f03
+AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae499f902ce7c34d0dac20ac3fae58983048503fca393dabcae8206a5e3ef17680bfd627d2005928ce161c37073ecf4d90fb47d SHA512 549c4b29620519521bfbf3bbaa8c01c90e7bf7f7aca411822e2a846476e3cde14212049c95f51f1db981c2f4c65fd1ad1e9644691aebb9db2c4142a883a3c316
 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-r2.ebuild 1124 BLAKE2B 4019f34d95ec9758cd1fc03a50518736c9701cbbfaaf5eaac815b6972a6496cdd380822aabc8cc49b6fe5223034d34f59280c15bf640b3a6a34404bff86b8556 SHA512 91eca43db17d7a8b28e1c036fe6956bf42063836cec160b978fd182e9e4625c705cd3bc9d4b9b4348498acb2776dcaa24077c32228718cebf66498c195f88bd3
 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-CVE-2018-20540.patch b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch
new file mode 100644
index 000000000000..ab2174f04ff0
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch
@@ -0,0 +1,55 @@
+From 09d45518776489508f34098f1c159f58b856f459 Mon Sep 17 00:00:00 2001
+From: Mateusz Loskot <mateusz@loskot.net>
+Date: Sun, 20 Jan 2019 02:28:29 +0100
+Subject: [PATCH] Ensure stream is deallocated in case of exception (#162)
+
+Fixes #158
+---
+ include/liblas/liblas.hpp | 32 ++++++++++++++++++++++++--------
+ 1 file changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/include/liblas/liblas.hpp b/include/liblas/liblas.hpp
+index f5ad44e1..325de3ff 100644
+--- a/include/liblas/liblas.hpp
++++ b/include/liblas/liblas.hpp
+@@ -119,16 +119,32 @@ inline std::istream* Open(std::string const& filename, std::ios::openmode mode)
+ {
+ #ifdef USE_BOOST_IO
+     namespace io = boost::iostreams;
+-    io::stream<io::file_source>* ifs = new io::stream<io::file_source>();
+-    ifs->open(filename.c_str(), mode);
+-    if (ifs->is_open() == false) return NULL;
+-    return ifs;
++    io::stream<io::file_source>* ifs = NULL;
++    try
++    {
++        ifs = new io::stream<io::file_source>();
++        ifs->open(filename.c_str(), mode);
++        if (ifs->is_open() == false) return NULL;
++        return ifs;
++    }
++    catch (...)
++    {
++        delete ifs;
++    }
+ #else
+-    std::ifstream* ifs = new std::ifstream();
+-    ifs->open(filename.c_str(), mode);
+-    if (ifs->is_open() == false) return NULL;
+-    return ifs;
++    std::ifstream* ifs = NULL;
++    try
++    {
++        ifs = new std::ifstream();
++        ifs->open(filename.c_str(), mode);
++        if (ifs->is_open() == false) return NULL;
++    }
++    catch (...)
++    {
++        delete ifs;
++    }
+ #endif
++    return NULL;
+ }
+ 
+ /// Create file and open to write in binary mode.
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
index 8e0dbdea8572..0380dffd2f3a 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -9,27 +9,28 @@ 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"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~x86"
 IUSE="gdal"
 
-RDEPEND="
+DEPEND="
 	dev-libs/boost:=
 	sci-geosciences/laszip
-	sci-libs/libgeotiff
-	gdal? ( sci-libs/gdal )
+	sci-libs/libgeotiff:=
+	gdal? ( sci-libs/gdal:= )
 "
-DEPEND="${RDEPEND}"
+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}-fix-overload-call.patch # bug 661654
+	"${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482
 )
 
 src_prepare() {
@@ -42,8 +43,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DWITH_GDAL=$(usex gdal)"
 		-DLIBLAS_LIB_SUBDIR=$(get_libdir)
+		-DWITH_GDAL=$(usex gdal)
 	)
 	cmake-utils_src_configure
 }
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 7d3278abbe66..3fed11748db4 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,6 +1,12 @@
+AUX mapserver-7.0.0-missing-nzz18.patch 563 BLAKE2B fcfe0f19bca658586dda345a14c3ad6c1ddc8a13abde8c3929d4585003fa4cd12c770d651fb1e1032ef1123f77dec38e4db16bc46fc857db6897fca61cc1dadb SHA512 5122b2bda7052663a01d8bff51582a7c09fe9e69bc9ed3c9d23b2036144f559cc9890d43e96e01c09298fc48fee0570c9c37da6a340262e1a38f4c29f042ef9c
 AUX mapserver-7.0.0-no-applicable-code.patch 812 BLAKE2B b3946628fc518dd37111e6f2293391fb6ddca7ba7ceb019a764c528d3c6e450e3ef5941fa2201995b40efe39e63c78c14a4e321f49f96c811541a99e90e83a71 SHA512 dab7c98095791b369c52d10e6737ac65f60ff7e02b8fcb5bceb2440025fa0552a936a16593aaa66b35434db0659184b667cc54962274510b062690029778a44c
 AUX mapserver-7.0.0-sec-format.patch 470 BLAKE2B 2156f485b0b1917fb6c6f4d34938cb083533b8658c4d29d5299475dfdfc14113ef87ca46a126e94fe69fc89463c493761e0d3cc1f981c154e96dfde1224972eb SHA512 7cddc978bce3691bfa19ea7f7782ce1e0a59c12b2142ebdb2c2dcdcb1076a79992e1a477f7b99e638d457136d167066b867de85b07574c766babd16c1f238a8f
 AUX mapserver-7.0.5-missing-macro.patch 439 BLAKE2B 4ef13371034994ed7a6e61a61463831dfb8a8d7a49812fe85d20cdd548159646d3c518f239d66112bfdfe019d74793a5f3a1ca6133a63adfbac3c8d5047757e7 SHA512 351f19b670b4352934150e8ab49af9bc5c47cad3b9bc5c5a25d92ddef19f66f91ab923590f764f5bb2cc9f12a313ab0f85d6c9eaa1c55f8b630362ce597552a2
+AUX mapserver-7.0.7-missing-macro.patch 353 BLAKE2B 0443e605f7b2f59bfce38a2007044c1db66b8e77d024d14c5b4423e101c98eade36edd2f1aae5f742ee8a5ed27131ce676333e2408ebf3316865c8512861eeaa SHA512 f8b704940c3e8593ba64bf48f1bff26b029fb2cd06bba73ef091062f5168fb132139c51cc304570fcd4ed73a7aea3c80dc0912ceca51f6d767cf91ba3e09029a
 DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
+DIST mapserver-7.0.7.tar.gz 2634698 BLAKE2B fadde68803d7f74b116aa23c05c25f9c52c67e0a8ea69eace2c865843d7f223c24d8c42cbed54578f2eb631cb58bae3652075872f76e9b88238d76e044d4314b SHA512 94225dbe64edf6623bb5e92649d505809f70f86c24ca06675f6277ac4a161c40c369fd1973db649e6c864fa5e2e4a8a93cbd36d1524297a0e47b96ab59c0941c
+DIST mapserver-7.2.2.tar.gz 2677800 BLAKE2B 3f26517f634098fd7f005aa5a1f71fc8ba9b831b9bd0385a64272db6705ad3bd7563848bea1532c08f28177c51b104b1185fe6aa319de8c4ed95ec649a1bf7f4 SHA512 8c66a52ec04741495e0cf2bf5ec28f8e3cafac9834ab314ef998d6cf8d50b893dcc66a05d4b30f29694c357cd175a1cb28712c94bf15da4c8bcb9bfd98f0d2af
 EBUILD mapserver-7.0.5.ebuild 4509 BLAKE2B a595b08ad87b62ee2239ac4b911a8c762adc22190c9f29679ae37eeff0e0f694943c824ece901c7e46098f32abb7134c4c8083a08da97ff2c3c086005a48eaca SHA512 7b6f3701f6cb18a1423fa73d41b797672c15a81f899897340c26efa91331551d0c5261f517ce67f5813c66c786e75835816eeef8312b7f73197f2956003ac888
-MISC metadata.xml 682 BLAKE2B 28881d5c3c341fc24d970d19e69602942623fe9f180cd3dad30ff37b5c3550c158ec11964a76540bbcdc2e62f8ca1c47be1e58ea8a6cd035ff6d450ce25b77ec SHA512 09ba242fe23bdf10d76b882ac32d9952e88e5bc630eb8569e74cfdacae587ec534e8014d6b015387fa2c63047e130dd1f918340cb382413bcbf14f321a296436
+EBUILD mapserver-7.0.7.ebuild 4946 BLAKE2B 2f3b53e1189ac689f7f8c6d13f82c7476f0291a4506c14ed71f18b6558cc47a884cd35666d0ec48d5f7c7b0e42bfe953a81fde843772933b627205cc3f98a1db SHA512 c352de91cc36f3143636d707a7531d65fcb21a87d561369d0965aee104621c417ad9325f7eefcd0dbd428e9df0ca0618da5e979784893ad5e4e60ef2a88c7ffe
+EBUILD mapserver-7.2.2.ebuild 4937 BLAKE2B 757901fefce7a1d297a18f409b17c3764a959eca9158860c37a9bad9ce37123fb2d243e5118e45199b9fecf1b5ca199638361d9021170915bd90ceff783a7fd2 SHA512 cd299942207e6f2c66af7a2376f140896f801e1b1a23f4c54ce4fe862159dbde814fb36db5514a1da1759be85994788f8baa3e3cb55a9f48dc286c0e5706f932
+MISC metadata.xml 748 BLAKE2B d0cdfaae91bf8b692dd90eb8842c5c5bc78c421e729b713d1091de482e23475aedd1c987de14da5e438228bcbbf15bb488515d7253d635aac6148599fae58c3c SHA512 c0ed4810c5d7eff6fc409ae17f25ece71a89d99ba33fe2c27c04d37859798997a8e29964514fd95d1639688e29044309666e0684befcc598c4ea9ce9c82fd2b6
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
new file mode 100644
index 000000000000..a22fcf4de6aa
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
+index 18055f7..2568b5e 100644
+--- a/cmake/FindOracle.cmake
++++ b/cmake/FindOracle.cmake
+@@ -37,7 +37,7 @@ if(DEFINED ENV{ORACLE_HOME})
+     ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows
+ 
+   set(ORACLE_OCI_NAMES clntsh libclntsh oci)
+-  set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 ociw32)
++  set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32)
+   set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12)
+ 
+   set(ORACLE_LIB_DIR 
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch
new file mode 100644
index 000000000000..daf5ab1ebc7c
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch
@@ -0,0 +1,19 @@
+diff --git a/mapserver.h b/mapserver.h
+index df7eeb9..9516a6c 100644
+--- a/mapserver.h
++++ b/mapserver.h
+@@ -55,6 +55,14 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifndef TRUE
++#define TRUE 1
++#endif
++
++#ifndef FALSE
++#define FALSE 0
++#endif
++
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ #  define MS_DLL_EXPORT     __declspec(dllexport)
+ #define USE_MSFREE
diff --git a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
new file mode 100644
index 000000000000..3d9b414957ef
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-6"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="apache bidi cairo gdal geos mysql opengl oracle perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="
+	php? ( php_targets_php5-6 )
+	xslt? ( xml )"
+
+RDEPEND="
+	dev-libs/expat
+	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+	media-libs/giflib
+	net-misc/curl
+	virtual/jpeg:=
+	virtual/libiconv
+	x11-libs/agg
+	apache? (
+		dev-libs/fcgi
+		app-admin/webapp-config
+	)
+	bidi? ( dev-libs/fribidi
+		media-libs/harfbuzz )
+	cairo? ( x11-libs/cairo )
+	gdal? ( sci-libs/gdal:=[oracle?] )
+	geos? ( sci-libs/geos )
+	mysql? ( virtual/mysql )
+	opengl? (
+		media-libs/ftgl
+		media-libs/mesa
+	)
+	oracle? (
+		dev-db/oracle-instantclient:=
+	)
+	perl? ( dev-lang/perl:= )
+	postgis? ( dev-db/postgis )
+	proj? ( sci-libs/proj net-misc/curl )
+	tiff? (
+		media-libs/tiff:=
+		sci-libs/libgeotiff
+	)
+	xml? ( dev-libs/libxml2:2 )
+	xslt? ( dev-libs/libxslt[crypt] )
+"
+DEPEND="${RDEPEND}
+	perl? ( >=dev-lang/swig-2.0 )
+	python? ( >=dev-lang/swig-2.0 )"
+
+want_apache2 apache
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.0-sec-format.patch"  # see https://github.com/mapserver/mapserver/pull/5248
+	"${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
+	"${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch"
+	"${FILESDIR}/${P}-missing-macro.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use apache ; then
+		webapp_pkg_setup
+	fi
+	use perl && perl_set_version
+	#use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+	# HACK: Make symlinks for php targets
+	local slot
+	for slot in $(php_get_slots); do
+		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+	done
+}
+
+src_prepare() {
+	local glibdir="${EPREFIX}/usr/include/glib-2.0"
+	local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+
+	sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
+		-i "${S}/CMakeLists.txt" || die
+	sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
+		-i "${S}/CMakeLists.txt" || die
+
+	# For enable compilation with proj-6
+	if use proj ; then
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DWITH_SDE=OFF"
+		"-DWITH_ICONV=ON"
+		"-DWITH_GD=ON"
+		"-DWITH_GIF=ON"
+		"-DWITH_CURL=ON"
+		"-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
+		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
+		"-DWITH_PROJ=$(usex proj ON OFF)"
+		"-DWITH_WMS=$(usex proj ON OFF)"
+		"-DWITH_KML=$(usex xml ON OFF)"
+		"-DWITH_FCGI=$(usex apache ON OFF)"
+		"-DWITH_GEOS=$(usex geos ON OFF)"
+		"-DWITH_GDAL=$(usex gdal ON OFF)"
+		"-DWITH_OGR=$(usex gdal ON OFF)"
+		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
+		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
+		"-DWITH_MYSQL=$(usex mysql ON OFF)"
+		"-DWITH_LIBXML2=$(usex xml ON OFF)"
+		"-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
+		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+		"-DWITH_CAIRO=$(usex cairo ON OFF)"
+		"-DWITH_PHP=$(usex php ON OFF)"
+		"-DWITH_PYTHON=$(usex python ON OFF)"
+		"-DWITH_PERL=$(usex perl ON OFF)"
+	)
+
+	if use gdal && use proj ; then
+		mycmakeargs+=( "-DWITH_WFS=ON"
+				"-DWITH_WCS=ON"
+				"-DWITH_CLIENT_WMS=ON"
+				"-DWITH_CLIENT_WFS=ON"
+				"-DWITH_SOS=$(usex xml ON OFF)"
+			)
+	else
+		mycmakeargs+=( "-DWITH_WFS=OFF"
+			"-DWITH_WCS=OFF"
+			"-DWITH_CLIENT_WMS=OFF"
+			"-DWITH_CLIENT_WFS=OFF"
+			"-DWITH_SOS=OFF"
+		)
+	fi
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
+			[[ -x ${php_config} ]] \
+				|| die "php-config '${php_config}' not valid or not executable"
+
+			local php_include_dir=$(${php_config} --include-dir)
+			[[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
+
+			mycmakeargs+=(
+				-DPHP5_CONFIG_EXECUTABLE="${php_config}"
+				-DPHP5_INCLUDES="${php_include_dir}"
+			)
+		done
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use apache ; then
+		webapp_src_preinst
+	fi
+
+	cmake-utils_src_install
+
+	if use php ; then
+		php-ext-source-r3_createinifiles
+	fi
+
+	if use apache ; then
+		webapp_src_install
+	fi
+}
+
+pkg_postinst() {
+	if use apache ; then
+		webapp_pkg_postinst
+	fi
+}
+
+pkg_prerm() {
+	if use apache ; then
+		webapp_pkg_prerm
+	fi
+}
diff --git a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
new file mode 100644
index 000000000000..643020ee7545
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-6"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+# force default gdal and proj if not cause compilation problem
+IUSE="apache bidi cairo +gdal geos mysql opengl oracle perl php postgis +proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="
+	php? ( php_targets_php5-6 )
+	xslt? ( xml )"
+
+RDEPEND="
+	dev-libs/expat
+	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+	media-libs/giflib
+	net-misc/curl
+	virtual/jpeg:=
+	virtual/libiconv
+	x11-libs/agg
+	apache? (
+		dev-libs/fcgi
+		app-admin/webapp-config
+	)
+	bidi? ( dev-libs/fribidi
+		media-libs/harfbuzz )
+	cairo? ( x11-libs/cairo )
+	gdal? (
+		sci-libs/gdal:=[oracle?]
+		dev-libs/protobuf-c
+	)
+	geos? ( sci-libs/geos )
+	mysql? ( virtual/mysql )
+	opengl? (
+		media-libs/ftgl
+		media-libs/mesa
+	)
+	oracle? (
+		dev-db/oracle-instantclient:=
+	)
+	perl? ( dev-lang/perl:= )
+	postgis? ( dev-db/postgis )
+	proj? ( sci-libs/proj net-misc/curl )
+	tiff? (
+		media-libs/tiff:=
+		sci-libs/libgeotiff
+	)
+	xml? ( dev-libs/libxml2:2 )
+	xslt? ( dev-libs/libxslt[crypt] )
+"
+DEPEND="${RDEPEND}
+	perl? ( >=dev-lang/swig-2.0 )
+	python? ( >=dev-lang/swig-2.0 )"
+
+want_apache2 apache
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
+	"${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use apache ; then
+		webapp_pkg_setup
+	fi
+	use perl && perl_set_version
+	#use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+	# HACK: Make symlinks for php targets
+	local slot
+	for slot in $(php_get_slots); do
+		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+	done
+}
+
+src_prepare() {
+	local glibdir="${EPREFIX}/usr/include/glib-2.0"
+	local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+
+	sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
+		-i "${S}/CMakeLists.txt" || die
+	sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
+		-i "${S}/CMakeLists.txt" || die
+
+	# For enable compilation with proj-6
+	if use proj ; then
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DWITH_SDE=OFF"
+		"-DWITH_ICONV=ON"
+		"-DWITH_GD=ON"
+		"-DWITH_GIF=ON"
+		"-DWITH_CURL=ON"
+		"-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
+		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
+		"-DWITH_PROJ=$(usex proj ON OFF)"
+		"-DWITH_WMS=$(usex proj ON OFF)"
+		"-DWITH_KML=$(usex xml ON OFF)"
+		"-DWITH_FCGI=$(usex apache ON OFF)"
+		"-DWITH_GEOS=$(usex geos ON OFF)"
+		"-DWITH_GDAL=$(usex gdal ON OFF)"
+		"-DWITH_OGR=$(usex gdal ON OFF)"
+		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
+		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
+		"-DWITH_MYSQL=$(usex mysql ON OFF)"
+		"-DWITH_LIBXML2=$(usex xml ON OFF)"
+		"-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
+		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+		"-DWITH_CAIRO=$(usex cairo ON OFF)"
+		"-DWITH_PHP=$(usex php ON OFF)"
+		"-DWITH_PYTHON=$(usex python ON OFF)"
+		"-DWITH_PERL=$(usex perl ON OFF)"
+		"-DWITH_PROTOBUFC=$(usex gdal ON OFF)"
+	)
+
+	if use gdal && use proj ; then
+		mycmakeargs+=( "-DWITH_WFS=ON"
+				"-DWITH_WCS=ON"
+				"-DWITH_CLIENT_WMS=ON"
+				"-DWITH_CLIENT_WFS=ON"
+				"-DWITH_SOS=$(usex xml ON OFF)"
+			)
+	else
+		mycmakeargs+=( "-DWITH_WFS=OFF"
+			"-DWITH_WCS=OFF"
+			"-DWITH_CLIENT_WMS=OFF"
+			"-DWITH_CLIENT_WFS=OFF"
+			"-DWITH_SOS=OFF"
+		)
+	fi
+
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
+			[[ -x ${php_config} ]] \
+				|| die "php-config '${php_config}' not valid or not executable"
+
+			local php_include_dir=$(${php_config} --include-dir)
+			[[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
+
+			mycmakeargs+=(
+				-DPHP5_CONFIG_EXECUTABLE="${php_config}"
+				-DPHP5_INCLUDES="${php_include_dir}"
+			)
+		done
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use apache ; then
+		webapp_src_preinst
+	fi
+
+	cmake-utils_src_install
+
+	if use php ; then
+		php-ext-source-r3_createinifiles
+	fi
+
+	if use apache ; then
+		webapp_src_install
+	fi
+}
+
+pkg_postinst() {
+	if use apache ; then
+		webapp_pkg_postinst
+	fi
+}
+
+pkg_prerm() {
+	if use apache ; then
+		webapp_pkg_prerm
+	fi
+}
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index c7d7490388ea..bc9652c1add9 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Geosciences Project</name>
 	</maintainer>
 	<use>
+		<flag name="apache">Enable mapserver to run under apache</flag>
 		<flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
 		<flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
 		<flag name="postgis">Enable <pkg>dev-db/postgis</pkg> support</flag>