gentoo resync : 23.03.2018

9 files changed, 8 insertions, 120 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index ea934a125fef..8deb5d643697 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 11a9caa6a769..c1a278462bb1 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -4,5 +4,5 @@ AUX mapserver-7.0.5-missing-macro.patch 439 BLAKE2B 4ef13371034994ed7a6e61a61463
 DIST mapserver-7.0.3.tar.gz 2621285 BLAKE2B b2fd9a4050ffee3bf4175971e0588ddc022f473e35c3953a098865898275ae66c2f889aef7df21231a9d9fdbecfda75490c21c67771745f0b6f18dbf11febb8e SHA512 7630461948e7b371c6d4d6d49cc596ad8fc6b076a8bbfdc88358fc076fa0d4ebaaab10663ec9c3c64e246b5735a07cef5cc28eba88b00dd09259048a49d2b81b
 DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
 EBUILD mapserver-7.0.3.ebuild 4606 BLAKE2B 5db66fd9b135e33e04c2f39e09a0638cade589b5dbcd99f0b6c91b4658a558c39620c6b36893e1f7ea06196a439b55322fa34de7c4cb4f0f93babd914f74ce51 SHA512 593f16f85412b967d8b8acf758d61535814e2fb4d4706a327c4a25947a4320f2e658a396a6786cc63babbfc47fd9a482e90d05f573ed58ab369f177241052a21
-EBUILD mapserver-7.0.5.ebuild 4645 BLAKE2B 144abb2fcda32e19bd9aa203580f93631fabac46d603bb244e47f9e13c5833e49e0364f37049ab24646526f612b20fe9b68f33cb640ba13c52bbad2f250cd4bd SHA512 fad6c4641f93f33d9abc03e70883c0ddb3b92a012f5bdc24939f95edb989559a1f0c49a6fdb7e3b118e79e8be7c0ada460db98b8fcb62cc3628a6a1fef2a7f38
+EBUILD mapserver-7.0.5.ebuild 4510 BLAKE2B 6ebcc5ecc23196c283845943ab6eba9033acd1e8113709a1efb96c5d5c4985a289835961bb208f17d4c83d5edb3ff834a4882ded8859633cc771a33f5d330491 SHA512 63f7156c6127b5bf3124a56698c30e2f4e14de229df39fa201d196d3f3f8d89e82a2b32b6c1f0b6b48e51fbd0ab40f9ab5069011a3fa98ce8d1c4d41a134374c
 MISC metadata.xml 682 BLAKE2B 28881d5c3c341fc24d970d19e69602942623fe9f180cd3dad30ff37b5c3550c158ec11964a76540bbcdc2e62f8ca1c47be1e58ea8a6cd035ff6d450ce25b77ec SHA512 09ba242fe23bdf10d76b882ac32d9952e88e5bc630eb8569e74cfdacae587ec534e8014d6b015387fa2c63047e130dd1f918340cb382413bcbf14f321a296436
diff --git a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
index 69fae655f2c7..a412b4ed85eb 100644
--- a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
@@ -83,12 +83,10 @@ pkg_setup() {
 }
 
 src_unpack() {
-	# unpack A and then copy the php thingies into workdir/php-slot
-	php-ext-source-r3_src_unpack
-	# HACK: and then remove it and replace by symlink
+	default
+	# HACK: Make symlinks for php targets
 	local slot
 	for slot in $(php_get_slots); do
-		rm -rf "${WORKDIR}/${slot}" || die
 		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
 	done
 }
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index c910471aeb14..73b4c5c3b53e 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,14 +1,7 @@
 DIST qmapshack-1.10.0.tar.gz 7841397 BLAKE2B 7a2c92cdb8a3284ed9b9002d0b07b81fd282f48e7eaf3624a1658c988c12951667292a4aebc56bb064abdf49fbbb681013a7610bf73641221b95d642a5a869f2 SHA512 252ca368fa4fbb803a5f6a82acc29da98c55eab5cde3ff9783c5afe3100783f4f5352e463511f4196d94c70d4cf4b7718334b886c76e30172df325d89a69afe9
+DIST qmapshack-1.11.0.tar.gz 8531519 BLAKE2B f79e8a98afa8dd3450214cdd4156ce8de862ab2b1a988855c5e3892e9952a4e0ed06f894f56f47412a9015d704cb447303bb5969edfa95884580899c4c42963f SHA512 1907ffe9619e6c8d0997a65eb9f59896fa1fa15123c5b166f4ee8e4ea72223772d3292808c1e730c88a21189edb5c546da2de72bfa1730a4ae5f28b69bf3555a
 DIST qmapshack-1.6.3.tar.gz 5181205 BLAKE2B 89e7a638f35e0e555b237a000992f48b1a126ed9de5c2892ee8e147060866656b87abbc46937cc5187e473681b71a2dfb250160d4847824df4989c352afd676b SHA512 6e9efdd35ebf3980011aea0cefdbcc433e4f0d333cbeff72e70880a41bff972cc27f4517e243f4990b5e04112a50af2651d99cb5c1c6e542341db30e5e000133
-DIST qmapshack-1.7.1.tar.gz 5201773 BLAKE2B 32ba3c16f6a83c6ead93ae7b91719a6a4f3b88d7a1c8e98fc7baf97b7b5d59eb86358dcc39a8ac18da3410d20500fdb608a814eff05bf6aff276b0309e600375 SHA512 406346df4777e06d14f175fc6cd01b653102d5754c3354721d5f86c2fbe3139f384f57241d2990721ceac12d4d546924c36c4e408770ad5c523a73f980bd3c02
-DIST qmapshack-1.8.0.tar.gz 7512082 BLAKE2B ef30474f6497fbc7edcefbd6350b6c84003ecdd7e2cdc8630cd513f563742e99aea7b8f00b8c04aa5f02adff9949ceab5008439bc53dae7f71f72f017b1b04b3 SHA512 9ee2e764368994c71813d48afb55368a2a26f8f4517b2671af2eb457e152b33f2eb756e347625940383b0e8c89814259d9e78133a1bc4544f183c4a424d31a4d
-DIST qmapshack-1.9.0.tar.gz 7647076 BLAKE2B 83397ff1b1fc0d15b2bc6f590a97cbe68c5006a4abd29f20ab209f481548a43f1f2fec1c1a7b829e50f7dd87f7f8a1bdeac7cf5521026e0ee26b63db00166928 SHA512 8a74434886605eed44d0264d26cae022381a0141d8ebaa6ac8ef9cf8b808e0f9550ff888b0e2f607eb9cc8cde24ac358d459d9e43c6b74f0f8c74d5e7b429c1d
-DIST qmapshack-1.9.1.tar.gz 7692254 BLAKE2B 11a32fdc4b6f319e1a09143688283a304530db7fc72b1fe27a89ecff064317270338a4ece6e056115c5ce8e4539ba34c221f461b5195beb7801a42b9a9e5dcc1 SHA512 3a4903c5c98862c139a1e2ac021fb7b0c1acd62c41a2dfdc507f3dfa5618ad89224195df3baf3b233880645103e2ff865d5ad42adad998e0d201b27877c2da75
 EBUILD qmapshack-1.10.0-r1.ebuild 880 BLAKE2B 5fddf7073345131522c5ed0037842a2274d4295bec029bd4f9b2e2386de65a3403e739a9c66e0dd1473d22eb472142f627c11a2ae663c23427f7c1752878b575 SHA512 cce23eb74299d0a21437eb3ac7bc0dedd5280e98a73c5b30beb9976d2d8fa411618c8c0c8ce62066eb3d6d64bc2c1652ba9e0506f6deb740420ea3a00e090c17
-EBUILD qmapshack-1.10.0.ebuild 863 BLAKE2B a5b5d3fde2fc71a59d4d9b2387108d90727693b3ded3ecf7852a9a2790f0a5759d8d34babebce2729b3ae41e3c04ce5d0e62ff3531fc24bf2e8adbf6ba0b59b3 SHA512 c7c7e3253886ddc16d4274556c0de917e78a3d8dc00cb0121231cedb4dc21ffa8ebdac1687891695f408899e772a14318a9657cc5e1d5cf1993fb32185265196
+EBUILD qmapshack-1.11.0.ebuild 880 BLAKE2B 5fddf7073345131522c5ed0037842a2274d4295bec029bd4f9b2e2386de65a3403e739a9c66e0dd1473d22eb472142f627c11a2ae663c23427f7c1752878b575 SHA512 cce23eb74299d0a21437eb3ac7bc0dedd5280e98a73c5b30beb9976d2d8fa411618c8c0c8ce62066eb3d6d64bc2c1652ba9e0506f6deb740420ea3a00e090c17
 EBUILD qmapshack-1.6.3.ebuild 594 BLAKE2B 47fca8a961fe1e76d41cfee2ae99c4716bb3897a596e4ed29cc872e0296eee06fbc47188f84e423b28cf0c2d725f8e0fd5dc8e903761a1fafc4f2eedc481a4c3 SHA512 d6ba2f2fb68520668a89240021ab195477c94648b8fcf50040e671922a19f35d9107a8f0b56d33077bbb4b85f36787e995b26f54462ce8b62247d2fc4d118092
-EBUILD qmapshack-1.7.1.ebuild 596 BLAKE2B 23e353d8f7158b13e590bb093438526829b2fe6584bb189e611868a3bf23892ad124fea1742f3440aadbe87a4e942977783957ac42f492fbbc681ec981b5473e SHA512 1e4535a8cb426ce73e1b059c3dd5b595af86c4f7b9225557b413c79eef426977195c62c8d1323136af6ac731d3ee96f1ba7de339262e31e2a5e50a5dd19b9475
-EBUILD qmapshack-1.8.0-r1.ebuild 613 BLAKE2B 8e1f4155fc140c3740345be83cf05013cebf0c91c51e3fc735ec6169565981561409e7f8ed0fab08a2d03f0580424cdcb6374f47acf8bac636fc7f85669652ab SHA512 320af0e01d57a30d293d40ef9807fee19064010538ea100e7d2b92472cabd29d6825a79cf8e8042a2dca9f46fa112df1c4ea68e50f53412125997f0ec32a6170
-EBUILD qmapshack-1.9.0.ebuild 613 BLAKE2B 8e1f4155fc140c3740345be83cf05013cebf0c91c51e3fc735ec6169565981561409e7f8ed0fab08a2d03f0580424cdcb6374f47acf8bac636fc7f85669652ab SHA512 320af0e01d57a30d293d40ef9807fee19064010538ea100e7d2b92472cabd29d6825a79cf8e8042a2dca9f46fa112df1c4ea68e50f53412125997f0ec32a6170
-EBUILD qmapshack-1.9.1.ebuild 632 BLAKE2B 81aa00bc23ceea3dc48c95ba9450e5d61f714b3df8a04ba0f081801276f1d9633595d6b3874ab50bfe9ce6ebae8000d0846d97c87d74f56d144ae228234f6a21 SHA512 566e4cb0aedeff743e9fd3ee8be076c69088a6d8429f7dfbcd5ae8bbdd77a89a729332ac9f6407f2112a25dcad576a8409eb49c27a34522848e92c52c4185dfd
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.10.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.11.0.ebuild
index 7a68dc849f43..2765fdf91e9c 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.10.0.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,8 @@ RDEPEND="dev-qt/qtwebkit:5
 	dev-libs/quazip
 	>=sci-geosciences/routino-3.1.1
 	sci-libs/gdal
-	sci-libs/proj"
+	sci-libs/proj
+	sci-libs/alglib"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 
diff --git a/sci-geosciences/qmapshack/qmapshack-1.7.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.7.1.ebuild
deleted file mode 100644
index 87fac728e18f..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebkit:5
-	dev-qt/qtscript:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
-	dev-qt/qtnetwork:5[ssl]
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/gdal
-	sci-libs/proj"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
diff --git a/sci-geosciences/qmapshack/qmapshack-1.8.0-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.8.0-r1.ebuild
deleted file mode 100644
index 5ad43397383e..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebkit:5
-	dev-qt/qtscript:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-libs/quazip
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/gdal
-	sci-libs/proj"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
diff --git a/sci-geosciences/qmapshack/qmapshack-1.9.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.9.0.ebuild
deleted file mode 100644
index 5ad43397383e..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebkit:5
-	dev-qt/qtscript:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-libs/quazip
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/gdal
-	sci-libs/proj"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
diff --git a/sci-geosciences/qmapshack/qmapshack-1.9.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.9.1.ebuild
deleted file mode 100644
index a33497fdb340..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.9.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebkit:5
-	dev-qt/qtscript:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
-	dev-qt/designer:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-libs/quazip
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/gdal
-	sci-libs/proj"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"