12 files changed, 14 insertions, 43 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index bd688b2cd7f8..6e26d9581371 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/congen/Manifest b/sci-geosciences/congen/Manifest
index 322a6059f4d3..c6156252d2cc 100644
--- a/sci-geosciences/congen/Manifest
+++ b/sci-geosciences/congen/Manifest
@@ -1,4 +1,4 @@
 DIST congen-1.6.2.tar.bz2 293130 BLAKE2B 3879e5e04fe260fc65b1852a6ece347b7ea0dc7c846ca788f448c4b0af4ce7af1efe8e398727da243a76b1bd5a52632f308ec626ac708141a163159fb2065164 SHA512 21cabdf0fba8cfa8e72068db44e6db0288ce932f81f526f04421272550244de9c617dc12d2c162186cbb9f70d9a44aca48b6f132317fc2fa3c47860d2f58bad6
-EBUILD congen-1.6.2-r1.ebuild 648 BLAKE2B d78d30b26b8563184ac908e20040a6ac52e5c5602ab1804c11e5075338578e38d2528896b7d4d531b4315458566cbea2142056d09fa7dfd58a953e7cc44b8006 SHA512 b85577888115fc3b2efa1dc91daa9dd7f64d34c99a3489cf9e596625dac36fc27cebe66cd186a4d29fea72a71102978a472b6576f86227462f033b73b99d2633
+EBUILD congen-1.6.2-r1.ebuild 644 BLAKE2B d1fa1a77f0c8a23ea76a4444987ffb59cf3a1026c12ed3b91603ba93f0ee967940e5698818acc787e8802ec9dde70b8192987fb5b1d92f7107f000df383ddc9c SHA512 85839525cc1339f34ed018770e57303d471258b93bca99b88cd86de4f90c64b4e1fc38462b3624d65ce60056f79705eb8585dd44d3bb6efc00cb146e14aa6d24
 EBUILD congen-1.6.2.ebuild 646 BLAKE2B ad5196e4b8f96fb813b45629efd7f5bead976fb66be975787cec2b5f15cdab178eed38c455ae5305c811027989fcbe31565b0d7500837ed4fcab156f7b3b8829 SHA512 7c17606190ec8fcd4a83a39b51688be79a5fabbd503c6ed53e621554613a5e7363a2c534680df2343c7d4386a9484d570b67165f6a2f23bb169bca7343d249d0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/congen/congen-1.6.2-r1.ebuild b/sci-geosciences/congen/congen-1.6.2-r1.ebuild
index 23c270b570a5..4e2774d80d71 100644
--- a/sci-geosciences/congen/congen-1.6.2-r1.ebuild
+++ b/sci-geosciences/congen/congen-1.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="static-libs"
 
 DEPEND=">=sci-geosciences/libtcd-2.2.3"
diff --git a/sci-geosciences/harmonics-dwf-free/Manifest b/sci-geosciences/harmonics-dwf-free/Manifest
index 64d40d5b961e..38a5a6651b21 100644
--- a/sci-geosciences/harmonics-dwf-free/Manifest
+++ b/sci-geosciences/harmonics-dwf-free/Manifest
@@ -1,5 +1,5 @@
 DIST harmonics-dwf-20121224-free.tar.bz2 508967 BLAKE2B 113c925dfb9381c4926701d0061204f9060da0bf272e1c6ba1612d2b8f56c0b96e6437d482b938d4dbddcb3a295324795e4d2ac207858b98041ff69c6b763f54 SHA512 25791923dad463a25210b4688c2868a502e690431fa22815d3daa693e42be3e2563367474c4771f88cd3e7eae3b3f290f312f05f5f554895de983eabc24e5657
 DIST harmonics-dwf-20131228-free.tar.bz2 511292 BLAKE2B fe1e36da2155bc3b94bf0df2e6f17eb718dd4cd94d6b2aa719564c672fb1b7f25b6c1eca1900f4e28c37e7764098be806f33b3d72f9a07e615523d21ddca85c7 SHA512 b36ca3f432a455fee051418b7eb427bfafc7cdad929765ed6d44f6f2583e6b8c1d4992b21225d07636c418cc4dea2e353f3276511ba7b331bb8709bf543fceed
 EBUILD harmonics-dwf-free-20121224.ebuild 449 BLAKE2B 19ae7f373f74257bf8f65144743015719149ea9647aabcc59513863c32a8cb2e01197a932e27a436980fe9a60f2951516de4582c26dcc2718fe9312cbd4875f9 SHA512 846248877ad8000b7fef8f5de2504358f4b81d7d3c37749b47b8362303b4b312976e052ac420add963978d6ae0d7172fff7518bf3875bcd569f04e49651987a4
-EBUILD harmonics-dwf-free-20131228.ebuild 468 BLAKE2B 204cbebe08d2452f16ac889519ec8dbb7e1449076f488ff8271eea0d3d72e2491122de7f6fec6f83d6991e87258a062631723079b6f09f085e248d623beb450e SHA512 cd960ea227e20f2a9f259c2060be224e3d57a405d0bc2975fb2da1cf46dcaf7bb9f182c4e8105818c23b7e4b1b1d34ecf2a13b2994ba2a5d14c526b463074b21
+EBUILD harmonics-dwf-free-20131228.ebuild 464 BLAKE2B 245f9a835ce3a784cf9ab2f2896ba383733cecc4c6d722f785391213c81216e86ac7ca1eff2642bc9ad0c4d3070fc486bd1d94a520fde9e3ddc34488b92def0b SHA512 0a836229bb694ef1ba7bc37b08ee137e39aab3c8210221c253a204b00a697b17df09360958ef5f7e4037ad8da67cc7fb8655ec27200c3035908c4f7ee8087481
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
index f8bbbe1bcdc9..a52953d29d25 100644
--- a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
+++ b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-free.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ed7de2d3956d..1b2d973d3f14 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,8 +1,7 @@
 AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7
-AUX qgis-3.0.0-featuresummary.patch 841 BLAKE2B d2571091339308aee60b506a79639eaaf1a450d6634b63a8e51da8a7104687d04c8389c0c4c3cd8e3c6a23174d9608d49216a1bcb3d95b527c2b6a2c14f85393 SHA512 22e705c48671eb30bf3e662c61fcf1b2939c11aaf4d1bb9be2a86aff42d8951402088a38c5ca6dbfdcbbfa828100faaf4f151212877057ed33b7dd49a9f5f5af
 AUX qgis-3.2.1-qtwebkit-optional.patch 978 BLAKE2B 31ed74dfc390bd132547a3934d5bfb906134efc5b1d56c885a1446a4bf828474a8262414c3cdd446286a7e266d09a0f775ba2087c1741053154ca55b7773274f SHA512 dc71b850f73a11781d89bc1f08c830fd13d2d5d912d746133d7748724933143dbaf7957fbcdd8f8009ad8648d4f528661cf62ebf2aff5d04cd5856ba1429e3d8
 DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.2.3.ebuild 6195 BLAKE2B 92beb6aef1915030ae047a9216d2593f2c9a5f0cace785b4ac95aaa38472b1cef8012474eac3f5a59cf2dadb1f93383e6fe0d9016af447404573ad285e40ee1a SHA512 a322aa327c5c2e6512e74597216edb6fef931cb5c2e0a85f28614bda0c5a96b4ba561e1ba2613dc875921a291f4d4dee33cb35ae51ee618b91b7969b777a0a9b
-EBUILD qgis-9999.ebuild 6299 BLAKE2B f0e1b484879bfb2d2545694183f81afd9994eac66575d108c072d74f2ac3f5006c8c1cbb08d46fa4961123089bcb9edb5685255d04c2cd6598ac4282a2810af7 SHA512 ec18b18d2b791372df0a5e3d0d37d76d368a193f465aca05cf2636883f91e1050e7d99dad71d2755ef2f3c1b9fdd99badab9e3c8765c9a54e1492164a831e0aa
+EBUILD qgis-9999.ebuild 6231 BLAKE2B aa18381dd71172108b6d5ffbcbe15019431e4f8ddd1527626390d02c2f14673a34d074ea79361897bd03d56e6d26c7c20a1b31ed2f1d383d47cbd7f41e38971a SHA512 cce02404b78ea718bad247db2cc4e3417c8af449bbdb9161eaacdebcbeb1f85c0d6e879799c8e5c38a0e8f95f330e7c5b83f2dabdf73ba0a5a4bfdec37c9909c
 MISC metadata.xml 1211 BLAKE2B 761852f48581c7cca9f9474d1e2e99c751ca2597726cbbb973c82c6292806e4908fcaa091ad4ad5b60f73cea831db2f94be9c7ae3627ad9bfbe0a7572638c929 SHA512 22aa2127957668f8017e20d08297ef222bb1f9fd0a420398ee191426de0b681fb90138bfa8117f67612001d64020455871db4b8a772653d9ee02d7777555e48b
diff --git a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch
deleted file mode 100644
index 8b841a39b50f..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 9 Apr 2017 20:21:28 +0200
-Subject: [PATCH 1/2] Use FeatureSummary
-
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/CMakeLists.txt	2018-10-27 17:19:26.188192919 +0200
-+++ b/CMakeLists.txt	2018-10-27 17:19:13.915507445 +0200
-@@ -68,6 +68,8 @@
-   endif(USE_CCACHE)
- endif(NOT MSVC)
- 
-+include(FeatureSummary)
-+
- # in generated makefiles use relative paths so the project dir is moveable
- # Note commented out since it cause problems but it would be nice to resolve these and enable
- #
-@@ -935,3 +937,5 @@
- IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-   ADD_SUBDIRECTORY(linux)
- ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index afbd37bc704c..9e1e9a34acbe 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.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=6
@@ -101,8 +101,6 @@ RESTRICT="test"
 PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
 )
 
 pkg_setup() {
diff --git a/sci-geosciences/tcd-utils/Manifest b/sci-geosciences/tcd-utils/Manifest
index dfb498b4a73d..da28d7bc63fd 100644
--- a/sci-geosciences/tcd-utils/Manifest
+++ b/sci-geosciences/tcd-utils/Manifest
@@ -1,4 +1,4 @@
 DIST tcd-utils-20120115.tar.bz2 118652 BLAKE2B 123e58ed9fea569ac49e21661b61c017d67d05b13694351aea74eb6ce945ac861235e569955bf27a2dd883598870b59923a8ef63320376fbf481762ef0340d9a SHA512 be4f4b17e24d378cee45c6de20aa4727648f9b0c755118094a06fd830fb4ca78bf467cb4c5b0f430917ae124b2040fef83dcae60186893baf785342585b5d8aa
-EBUILD tcd-utils-20120115-r1.ebuild 405 BLAKE2B e387c57ae8ec4c102e9913a5e81fde73f5b17b4c0ce6257b8e4044e9d5acae5d5518bfbefec70d0d3fc6fe44e7a86292270ad056400c56078827d463083b66b9 SHA512 28e3d258cd28a4a7c2e9159b032077b748c2ede36f30cb03720ca0fbd4f1352dec702bfdf80dfa39c0b265038d6c2cd400e29830a8492be3ab48e66b0d027815
+EBUILD tcd-utils-20120115-r1.ebuild 401 BLAKE2B 0502b6d042ce3a9f52d1bb4d0f8a03dffd9592c62045c0ee8fcc2cad0c6e745418a42bf9d7a6844782554c95436b9b2a155cfc62e60aa5c998b891d9ce84d740 SHA512 25b8f89d28d6e2d5f298239e9bd5e3c53c492b9b1df6cd90f732f82d3e47f761e879f158e9feb7a39bf5adc593082661d9f5a5fbb1a4fe3dbcd8f00e33d9a605
 EBUILD tcd-utils-20120115.ebuild 403 BLAKE2B 32a187f238704c1bfeaf0cd5570ac85d69d26b0cc84bbe4dd4858d99c188103812e1a3f384b4a4bb9947cb477d0e25517418fdd70a5d6deb635982a2eea3ddb1 SHA512 5d0f1905850d3201ebd3b08815c2678fdcb0e41b793e68fdb12b7c9f8e79512cd53d72423512d8871279df4fdf27ca70d7f3be7bb0b5efbd15ab2dc60f470418
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/tcd-utils/tcd-utils-20120115-r1.ebuild b/sci-geosciences/tcd-utils/tcd-utils-20120115-r1.ebuild
index 1128deea6116..3e52706a16be 100644
--- a/sci-geosciences/tcd-utils/tcd-utils-20120115-r1.ebuild
+++ b/sci-geosciences/tcd-utils/tcd-utils-20120115-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=sci-geosciences/libtcd-2.2.4"
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index 75c5872c2e07..e5a192054637 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -4,5 +4,5 @@ AUX xtide-2.13.2-clang.patch 913 BLAKE2B 0bf2e94888907030f2d5752886d1c39cd89b182
 DIST xtide-2.13.2.tar.bz2 481183 BLAKE2B b9d294ef1e212ecf2a9850082f0861efd85a8e151da265e3faf06e51a77c2769f68135cad4751edb3517a9dacfc75d45b43f2dc1810351e6d7788228c46ccbfc SHA512 31b35190932413bf5021c82c640ec3f03424807ffd5295abd8ab9554febbe495896bc0d08f901e70e11b04d92c0d1991b8214dcdd5e95e04173f3e7bbf5faec0
 DIST xtide-2.15.1.tar.bz2 710182 BLAKE2B 31c336c16d855615bb3b33571f71cf47ff4ae524c1ca987e4b29a1c0a88844d9de7fa9f0340a07360c6e0299826e47d0c448dec074a3755a929300cc72cb6462 SHA512 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448
 EBUILD xtide-2.13.2.ebuild 1190 BLAKE2B a6302e79d6e6122b53e46e725b755d55d7e051f2610085a790eed8968f1d2984b38a24b4b56a760bf78987e4273e26344e76cce0983e63caafeb363c9083bf3c SHA512 32e5948a9e7d20633209c3079d13a0fa5bb979f92580b888dc3a5da4cd7104e5d60442b05162273ca4487c910d7f4a84ea422913b80c4385e65f2a077b5eb610
-EBUILD xtide-2.15.1.ebuild 993 BLAKE2B 24cd2e5298197fceec878a491bbc86ccf502b9440302fae6a49f2ba016c805925b1fffdeefaf3b8534ca28d1f1c911b351bddd4b17a77b70888dbb7408e5a755 SHA512 ac6aaa94e37d2673db0eb33747eea2c2a66a60f15b7beee7de9d624d6cbbf79d5ee12953d8f9cf7df1b7165ae376f0a1fa71b85d38da1fb116862ed81a58a8f1
+EBUILD xtide-2.15.1.ebuild 992 BLAKE2B 812c7c83cbc50458e41e7313a3fba910b401578278bb42b99eebbb8f8a085763023d2333c3ea9abaae488c9b5e19e72e0057ec7d87f78d6b96d7ff96ba0cb8e8 SHA512 7e923462dc739d7072f7b94e2fe26a9e25a54b7361bfbf4760ae45fcb874d36462a47a71dd1741e9a9e52fc0a5a713f7ceb04818fd9631c11212e121d778812e
 MISC metadata.xml 244 BLAKE2B 934bb17faea52392265caa18c77fd32ecb9b80303c9f67145928471c0ad0c4e18f0500b35db4de459ad3575c3a111e2e5afa88fd7c3ab40c15d9d1e9446603c4 SHA512 2cf646d59cd730a1d957a67d2a5735dc205f9270342b86b4a201213e3c9455d8a73a640cac5248a4655f93ac2258f8092a3907553818783da3d864e8fe74323a
diff --git a/sci-geosciences/xtide/xtide-2.15.1.ebuild b/sci-geosciences/xtide/xtide-2.15.1.ebuild
index 351bc65c9bc5..a17f085d8d57 100644
--- a/sci-geosciences/xtide/xtide-2.15.1.ebuild
+++ b/sci-geosciences/xtide/xtide-2.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="