gentoo resync : 17.02.2020

38 files changed, 325 insertions, 870 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index c6a616187358..de761942ab59 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/congen/Manifest b/sci-geosciences/congen/Manifest
index a3ce225a847e..15d2c75ca35f 100644
--- a/sci-geosciences/congen/Manifest
+++ b/sci-geosciences/congen/Manifest
@@ -1,3 +1,3 @@
 DIST congen-1.6.2.tar.bz2 293130 BLAKE2B 3879e5e04fe260fc65b1852a6ece347b7ea0dc7c846ca788f448c4b0af4ce7af1efe8e398727da243a76b1bd5a52632f308ec626ac708141a163159fb2065164 SHA512 21cabdf0fba8cfa8e72068db44e6db0288ce932f81f526f04421272550244de9c617dc12d2c162186cbb9f70d9a44aca48b6f132317fc2fa3c47860d2f58bad6
-EBUILD congen-1.6.2-r1.ebuild 643 BLAKE2B f6df1548142b540c00318d6e53a959270536cc5594da7c0fbaa1fc3f5e30dc4edfd81277ef7db3063519902d35cc15bb0051bee5a78b2a140f5c6616d4d73896 SHA512 7b074183490cd2dc5a94a048278cc7ce371d744d70918fe277f4f4c664478ffd56fecffec7a2c90b7da6215747321a2315f08d4dd98d2fab8401541453a301f3
+EBUILD congen-1.6.2-r1.ebuild 651 BLAKE2B 5b84a13e541f8abe0b13c97d391ed590e80118470318c8297d94dbdff57ba96ce59897ce6a5ea7738a0dc83f872f87d1b423ed78971e2a50844018d81288dd3e SHA512 e1a7f276e0ae2faf6fa86f1b6071d310024e06e8d82fd84cb059daa294a00551b9005be9bb50d95948ae866b3d08d8c3cb9b097c9f35902baafd818d307f05ee
 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 c01e3e7d2a47..836376243323 100644
--- a/sci-geosciences/congen/congen-1.6.2-r1.ebuild
+++ b/sci-geosciences/congen/congen-1.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit eutils ltprune
 
 MY_P=${P/_p/-r}
 DESCRIPTION="Calculate speeds, equilibrium arguments, node factors of tidal constituents"
diff --git a/sci-geosciences/dcw-gmt/Manifest b/sci-geosciences/dcw-gmt/Manifest
new file mode 100644
index 000000000000..21b53b84bbdd
--- /dev/null
+++ b/sci-geosciences/dcw-gmt/Manifest
@@ -0,0 +1,3 @@
+DIST dcw-gmt-1.1.4.tar.gz 21117179 BLAKE2B d5aebb5251ddcb82a6df28a9ac0a8e37ad45a8ef48bdf5e777c85f7194af7710e83e7ff3a204a9325d7b9c62ad3e3d41008f106c127a8d710f29a4b9bcb10c13 SHA512 3ea64ce9cc162030b40da859e8617e6c724c3529a57d2e6ae8dc311b4397532d8946aac7f66f49707dc85d046e892faa77bf1293a66c949fdf0473028dc4beeb
+EBUILD dcw-gmt-1.1.4.ebuild 453 BLAKE2B c65415c1cbe6ad511dea13007408b72b98a3026cf363729cbcad84ee83b06559acbd2f169e17e9dc08b01961c4e5c1cc6cbf873c4545159277c3a5108e308c47 SHA512 2d3806348301209b6723277b0b9933d004b7576ef5e6c1f5efe502df0288abb800ad956f4c061b8f63c21f766de9b0dc82a6b6fa4224bad8c8f0ca3987aaa3ec
+MISC metadata.xml 834 BLAKE2B 910f79b5689fa225893efbfbb480174ccf45af11386a2a895674ff7f82b67c89b27b6c6167211c81ab15dc73da99cbe08c044f10d7a505cd66852655fff174f5 SHA512 c76481284ec83209a6768cc867d2199678780dda888b699d56e5ebba68c90d0a0d246fff8cbbe1dc03199df23fe5aa68210320c46ebda90de0b6389a8eafe2cf
diff --git a/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild b/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
new file mode 100644
index 000000000000..c012e922f1bb
--- /dev/null
+++ b/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Digital Chart of the World for GMT 5 or later"
+HOMEPAGE="https://www.soest.hawaii.edu/wessel/dcw/"
+SRC_URI="https://www.soest.hawaii.edu/pwessel/dcw/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_install() {
+	dodoc README.TXT ChangeLog
+	insinto /usr/share/dcw-gmt
+	doins *.nc dcw-{countries,states}.txt
+}
diff --git a/sci-geosciences/dcw-gmt/metadata.xml b/sci-geosciences/dcw-gmt/metadata.xml
new file mode 100644
index 000000000000..ee1e16a0a999
--- /dev/null
+++ b/sci-geosciences/dcw-gmt/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The Digital Chart of the World (DCW) is a comprehensive 1:1,000,000
+		scale vector basemap of the world. The charts were designed to meet
+		the needs of pilots and air crews in medium-and low-altitude
+		en route navigation and to support military operational planning,
+		intelligence briefings, and other needs. DCW-GMT is an enhancement
+		to DCW in a few ways: (1) it contains more state boundaries,
+		and (2) the data have been reformatted to save space and are
+		distributed as a single deflated netCDF-4 file.
+	</longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 30abe842436f..33e01f8b4906 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,7 +1,5 @@
 AUX gmt-4.5.0-no-strip.patch 1963 BLAKE2B b261058d5e6eefa2b6b4286158d971991f351c0a66da36b45a53b9f4c6298cb3d378cd79155c8791aea848ddb455cf2c539358cab02df821b0e8c962c508d2a4 SHA512 8ef2ca6acf17b092989ce7b8c91a3f42b82b074d606d2635c7b5a03355fcd3f83b3d08ef83747e51f5eb6e6ed9cb9a683208797d49da7b8f0714ed0c8f2e6155
 AUX gmt-4.5.6-respect-ldflags.patch 2396 BLAKE2B 66d15afd6a6cbc7f4fbd16d34bfc8b3e02df56c1c3a72b55732bf2694b9699cb6059522d3648f8651af331a92a87d158ecdb43ff758cf3208d04531b0dd0e89d SHA512 c2cc4986a1211a75856391cd0c731f37d9cf8e2ad28fdf29f532ed03308f2ef7f309a0bc525bb08c976c4535e8cbe77789546eb8585ddcedf016af32769e5420
-AUX gmt-4.5.8-bfr-overflow.patch 1576 BLAKE2B 01ec91d3bf94dbc1497f4f233bc1df86ce7dc9f0de9c7bf8e4fd433699db154c6b74854129c67cc89f8bb9a850417bcdaf55dbfce6a404d10290c43dc80c76f1 SHA512 fd2c137047333ef4494bba28339c1f8a34e83acc2646db514e0d2289e60acca5f6ac360d1dab27d84a088ce4a1c8c3af5f5cd4ae57485bb14eb08a668ea8ecc9
-AUX gmt-4.5.8-impl-dec.patch 291 BLAKE2B c6d393a8985a66dd5398fc30fd268ee4291298181eefb01c04a0e29a7e3807f4add43dd0889828cbe2cfa3010806e28d72eeef8447607dc26142305108dc2ee2 SHA512 ed977bd1a19024a60682d6e422c202cb3c29ed5da1450d85558544d6aa300ac967595811c90143a4858213a6b60b8fffee453de8351666c55676371e00b144ad
 AUX gmt-4.5.9-no-strip.patch 1246 BLAKE2B f834f1b514a2ce59a56f52290b54ef80ec1580d88facfb77f2af6aa4472609638d627ff5a10a2b692a8b3357adb12cfde0f9587f0529e5c257c9c56037be946d SHA512 271be4c32607bd4776cace933ed0a81a76fb5ea8ccc0c92f0f11cdf17f6b4f8740e2345323236af94dd4eb52323625cc82e5c661e22a008dcdc85f4d1d452b23
 AUX gmt-4.5.9-unistd.h.patch 358 BLAKE2B 48a577c87e521fe89ff815a88e0f40a6031ce4dfb388116081125f2847115786f8ae20f6797aa477edb36a602907b20fe9ca1725f89aae0b9b9e9ea00bd0a449 SHA512 877e73b161d9fbb1fe17d5f575852be67cfd9eec31ff8b74ffeb7b00569e3061d5a85c55e6633c06f12147bf7e3ab2838ab2738c5fe4adf93065ce55e7884df6
 DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279310e90b3f7a01a5b9e68186fc3d1711af4f5730fa20a8a04bdc57a8e06f9a656c8db71c5bc2b8d42292cb7434ad07880732 SHA512 57281e78cd40b168cfd49818a25523c1d1b44a8c4cab59aa5683052f14df25016b70485f79327bac37f5dd8b7c77d01a2264fe08045b7c13c3e1bd216323e50e
@@ -11,17 +9,11 @@ DIST gmt-4.5.6-share.tar.bz2 43704 BLAKE2B 56c4c2e29a97824245c8b8cc9afbf5e865886
 DIST gmt-4.5.6-src.tar.bz2 1134118 BLAKE2B 6519002bfcafd91c420d56fb356d70cb6a814a62c8b7d9d30d77015f8401ea71ffb87b9ea4ea5b2af7917b0bce3794d66566150ce2ae82c7a5d9bb52bf5414ef SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e
 DIST gmt-4.5.6-suppl.tar.bz2 4137369 BLAKE2B 9150e54385c4ee3df6dee6f8598cb2e91b4b23a3e4531fad7fee7e4eef80cbe6f06efd4a5a06882aff90782a5f07824cb6ed744da5c10e73402bdb1930984b9d SHA512 7e1cd35da0a7f75800074cac4dd7f82ce17721953251c951c4f585f0cf159af6c2450fba20d9c02fad69ec7a689483de55cc652fcc600535255cf17ab528a027
 DIST gmt-4.5.6-triangle.tar.bz2 103426 BLAKE2B cb6372a0980a660a7e70725d43681c0a251698ff89329f92c37965c70d180cfb63ee2741702c8f9cbfef0f41c95cf6676dabcef3aefb18801367efc32e833f44 SHA512 3daabba610a50e72c2e9e5dd7fb22ff02547c598ff22f40f145f3f794447cde995ddbdcd2560954478806fc5edc2af4fb59615e405622daa4292e6dc2f0e4f5e
-DIST gmt-4.5.8-non-gpl.tar.bz2 109125 BLAKE2B 7b6eef77a7c15f6d5acfc9ca4cc4d2a8db8ef00362b2f1fc7c50edd76ffb14810da0eb1837a31f8a4b31391308f45f4c7289303d3bc4885f5c152d62b49151b5 SHA512 04b3eefd1490b194d7797af86fc726dd84960d65dd955e5ddefaf6ea4ec5a98f6f00085acc0cc846aa70e986facf65221256dd6a625f918c6abe6ba0b6b06f64
-DIST gmt-4.5.8.tar.bz2 39350328 BLAKE2B 8d1e0c588ef4ecef1d64a4071101d9a0c14ba9780a213ce1b121840c0acd676f43931f4a4f03a539b40bfba57935f8a9e9bae3cb3630410f15cccb3bd57eb87b SHA512 5bc3be1f7963df6a3035195e2123645d8a8b7a8a9aa17c89a6dd50560485706c628e0e0aca779930c4a28f2305fcc184981db728085d3373b2cad89e59d5c6fd
-DIST gmt-4.5.9-non-gpl.tar.bz2 103494 BLAKE2B a056845917a7eb2c6e66a8797a2d47a2fe4c9a659b98242ff6953f9194d86d56a85c3e1e973f562d060a3d3396845847de683e06b6b929effb84ca0c625afe8e SHA512 a41cd94acbd014bed780797be1ac1b492388c7c8e0fcfc5e773e894e803a024bdc60b897589ad4db9af973f20606a87ac9cff606f0391641236bca95c0b7a4c5
-DIST gmt-4.5.9.tar.bz2 39325492 BLAKE2B 012afa7555d7262a4b8ae9af90309653f6f374fdb34bffbc1f0052e2cbee93b17d1f6e70934e3de555f83774a34c278bc81f5a6cc7521840a35bc70001d9ee6f SHA512 1edda71787fa2e1434a6891618d4523c39d04c2db285dadc66c1d52b425cfff6866c492926cae41d78d2a4e5118e8d003ef3d71d164e0c0695d71aaddb598242
-DIST gshhg-gmt-2.3.7.tar.gz 57052180 BLAKE2B 5b618c874cca97da819263c3c436db1235d3293712a72c21ac4ca3ae78e95b5d36915312de3df361f978b14c697884ca278bebc41ac4c1d054adda6c417eb5b9 SHA512 27e97efe9d146a58d1c6674c5b6cde6b7545be60c1f7d3d93faca1034986d1648e73b589de571897fc53cd0d050a5875dcc9923e3f861f8473ca568a8142d727
+DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
 DIST gshhs-2.1.1-coast.tar.bz2 4322743 BLAKE2B e171b6a41ceee6c15a9a7679c6a9145c1ffcede7be61bc26b351371a7bde7f4ddd68bbd5104638da56a66af3e930fc11d9dc6c215d3c3b528f0d56b855e3b496 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332
 DIST gshhs-2.1.1-full.tar.bz2 29916230 BLAKE2B 80ae867a46fc5f9cab60c3e4cedb0db7d683cb58294865a228b8853b458647179382d8fc7fefcbfff7f33ee0e12b527e402376b78f1be0ff8388a81ba682d52d SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375
 DIST gshhs-2.1.1-high.tar.bz2 9712697 BLAKE2B fa81ee855916566e135eb0522b414da9cf28f1cc29847fbccf80a485f337e6b8a1e051df95d38454679e0405cfa6777cc7f0139772425c082d46b6bd65c17c98 SHA512 a9c22d7ce285320d4ae22a1a446e7d7d446d1b0641abeb39d50e358d65011fd3e39761a61a41820a373df4d4ef950160f5aab71d2df899a8425caf7d162e6e0e
-DIST gshhs-2.2.0.tar.bz2 47021761 BLAKE2B 89ffbca48d782a64ec1ecf7945915a64ab70385c1db3fef65bf1d41db46f3c047554d51c13de20706fe84d1568593679fb822b23d8ab580c100159475edd9cf1 SHA512 a9c1550f24feeefbc7ae633cce41e737f8153bb7df974e942fb5b9f0c931a49707c737f34bf6316ac89aa9bf487a091ada08ca8d798e2a5385e75f3dc05fdf83
-EBUILD gmt-4.5.18.ebuild 1880 BLAKE2B 64ea1e4b79139bfbbd24e500edea6dd6d38edf211863b7cd70aa44527a4dff4349ce163c8a4666a6cedc54b146909c46c47079336c4fe97dcce9dc4db4f93eb8 SHA512 c6504708e8549b010bb0190458b12d42e5bbc796c8498caf1f22d1568ee88579f4e8d64a0442c8e8e01f76f1c680f2b2cb612445976917e8b29a42edaf264019
+EBUILD gmt-4.5.18-r1.ebuild 1969 BLAKE2B add5f0c069904260201ba9fd77efef09b42f27c81843401410931284516a39dc7356c516e8086d5e44d31fbfdc7aad815d41deaf911886138afaa2da9c452f6e SHA512 d6cb51bf827a5fa4f4655928fdf4f4c43120542ed134f789fb0e01b62666dbbeea750aaed1c0ba84382e7e1c043ddaeda9d546f5e7e68a89191ed61fc745264c
 EBUILD gmt-4.5.6.ebuild 2311 BLAKE2B 019492348e921aec08fd1d25d84b653c43e4c69837c1114cecc739137ad1ecfa1f157a3e5937816caa32da6a2c4656c159f010c91e850e35b9660aaed0673f07 SHA512 c3ce34dbd2e000416eae85e98b582e4729de4ee4b1e09107e8930c9802970207b35a56c76e918bf89bbff4f582f8310b6dc8bc3d89a346b25cd4ac20e021cf8c
-EBUILD gmt-4.5.8.ebuild 1972 BLAKE2B 9cbeaecc962ef48d36c1f356f62d72ff95a1c3a44f79daa46e934b0296625bd85c7a0cdfe12fbb3f13a2b789f886a717a53c4d10ec9dd56985a6aceaba7122e7 SHA512 c8f810de340e6205c5b97a6e9c2accccda2f589941c435b2f09670761960858c43ab6fb42b20fdf62895052c96f6e59969036c71df3ee2f551e51f7dd110bee1
-EBUILD gmt-4.5.9.ebuild 1954 BLAKE2B 52acf9053715f5582e7fcf89e855551574e4841de2320db4b7000aea8cedd83d42089cfd0b52adbab51e686681520709299e44bc68906cc8258e6352113acd1d SHA512 31974c6a7e26f02cf457aa4b178e32a5c556b1fce8226162b7178211e73569a2eb9df0f0e14d45c878a7c561a26e04a8e8d7e917aab9f7379c9dfba7dc1ab996
-MISC metadata.xml 810 BLAKE2B 1f18691a86313c7132834b43a5c03091d2d3e7df9369defa7ded979f6b900374762c3bef7bc79046a9a68a940b155135adc3a2b9a935f2df19a0f1eaf3f0446a SHA512 647d1a082313d0894a6203cde5afbe729d084e3ed923a9f22850022acb632b0af1fe2dd14aaba6801b5656d1277be39559fa5f76a03e621a88eb6634fa2ec645
+EBUILD gmt-5.4.4.ebuild 2942 BLAKE2B b36f87c108b351561f768d0ba927c3e9966f7c4f19002f0ccbc84ba822d037211e8ed543ecbd723582975720b957ecc51e91c82c0f74b11cbb789a9e10db0acc SHA512 eae39ad69124ce00d7400b24555e249fc5397e1bf3c4f849c4bd7e92c9e9f2cf9499fdbcf1507e202410653c713cafbff76240d1fba41f4d77da61d1ed77ad79
+MISC metadata.xml 1058 BLAKE2B 2ec919d568907a8abd029b0a5f05a1ab39b0b50bfa288a29029294052f0005bb224f086274e5230970549727995bbf10c8e98c7e5855e694201b736578eef7f0 SHA512 bfdbbd4ec022edb67091957d8215d88ab25b5cf545b3912eec118aae0fd3783f4a352b3195c5a7dc916827593702d677fae9e1a2a80dd8d678f4c5556442d55e
diff --git a/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch b/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch
deleted file mode 100644
index 216149d93f78..000000000000
--- a/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/mgd77/mgd77.c b/src/mgd77/mgd77.c
-index b27b1d9..6a25576 100644
---- a/src/mgd77/mgd77.c
-+++ b/src/mgd77/mgd77.c
-@@ -854,7 +854,7 @@ int MGD77_Decode_Header_m77t (struct MGD77_HEADER_PARAMS *P, char *record)
- 			case  3:	strcpy (P->Parameters_Surveyed_Code, word);			break;
- 			case  4:	strncpy (P->File_Creation_Year, word, 4);
- 					strncpy (P->File_Creation_Month, &word[4], 2);
--					strncpy (P->File_Creation_Day, &word[6], 4);			break;
-+					strncpy (P->File_Creation_Day, &word[6], 2);			break;
- 			case  5:	strcpy (P->Source_Institution, word);				break;
- 			case  6:	strcpy (P->Country, word);					break;
- 			case  7:	strcpy (P->Platform_Name, word);				break;
-@@ -865,11 +865,11 @@ int MGD77_Decode_Header_m77t (struct MGD77_HEADER_PARAMS *P, char *record)
- 			case 12:	strcpy (P->Funding, word);					break;
- 			case 13:	strncpy (P->Survey_Departure_Year, word, 4);
- 					strncpy (P->Survey_Departure_Month, &word[4], 2);
--					strncpy (P->Survey_Departure_Day, &word[6], 4);			break;
-+					strncpy (P->Survey_Departure_Day, &word[6], 2);			break;
- 			case 14:	strcpy (P->Port_of_Departure, word);				break;
- 			case 15:	strncpy (P->Survey_Arrival_Year, word, 4);
- 					strncpy (P->Survey_Arrival_Month, &word[4], 2);
--					strncpy (P->Survey_Arrival_Day, &word[6], 4);			break;
-+					strncpy (P->Survey_Arrival_Day, &word[6], 2);			break;
- 			case 16:	strcpy (P->Port_of_Arrival, word);				break;
- 			case 17:	strcpy (P->Navigation_Instrumentation, word);			break;
- 			case 18:	strcpy (P->Geodetic_Datum_Position_Determination_Method, word);	break;
diff --git a/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch b/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch
deleted file mode 100644
index 5c63bb209578..000000000000
--- a/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/gmt.h b/src/gmt.h
-index d4c9c20..ea6ddc5 100644
---- a/src/gmt.h
-+++ b/src/gmt.h
-@@ -34,9 +34,11 @@ extern "C" {
- 
- /*  GMT is POSIX.1 COMPLIANT  */
- 
-+/*
- #ifndef _POSIX_SOURCE
- #define _POSIX_SOURCE 1
- #endif
-+*/
- 
- /* Declaration modifiers for DLL support (MSC et al) */
- 
\ No newline at end of file
diff --git a/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
new file mode 100644
index 000000000000..ac668505bc6b
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Powerful map generator"
+HOMEPAGE="https://gmt.soest.hawaii.edu/"
+SRC_URI="mirror://gmt/${P}-src.tar.bz2
+	gmttria? ( mirror://gmt/${P}-non-gpl-src.tar.bz2 )"
+
+LICENSE="GPL-2+ gmttria? ( Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples debug +gdal gmttria +gshhg htmldoc +metric mex +netcdf octave postscript tutorial"
+
+# mex can use matlab too which i can't test
+REQUIRED_USE="mex? ( octave )"
+
+DEPEND="
+	gdal? ( sci-libs/gdal:= )
+	gshhg? ( sci-geosciences/gshhg-gmt )
+	netcdf? ( sci-libs/netcdf:= )
+	octave? ( sci-mathematics/octave:= )
+"
+RDEPEND="${DEPEND}
+	!sci-biology/probcons
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.9-no-strip.patch
+	"${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--datadir=/usr/share/${P}
+		--includedir=/usr/include/${P}
+		--disable-update
+		--disable-matlab
+		--disable-xgrid
+		--disable-debug
+		$(use_enable gdal)
+		$(use_enable netcdf)
+		$(use_enable octave)
+		$(use_enable debug devdebug)
+		$(use_enable !metric US)
+		$(use_enable postscript eps)
+		$(use_enable mex)
+		$(use_enable gmttria triangle)
+		$(use_with gshhg gshhg-dir /usr/share/gshhg)
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install-all
+	einstalldocs
+
+	# Remove various documentation
+	if ! use doc; then
+		rm -rf "${ED}/usr/share/doc/${PF}/pdf" || die
+	fi
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r "${ED}/usr/share/doc/${PF}/examples" || die
+	fi
+
+	if ! use htmldoc; then
+		rm -r "${ED}/usr/share/doc/${PF}/html" || die
+	fi
+
+	if use tutorial; then
+		docompress -x /usr/share/doc/${PF}/tutorial
+	else
+		rm -r "${ED}/usr/share/doc/${PF}/tutorial" || die
+	fi
+
+	# remove static libs
+	find "${ED}/usr/$(get_libdir)" -name '*.a' -delete || die
+}
diff --git a/sci-geosciences/gmt/gmt-4.5.18.ebuild b/sci-geosciences/gmt/gmt-4.5.18.ebuild
deleted file mode 100644
index 9730b119d3cb..000000000000
--- a/sci-geosciences/gmt/gmt-4.5.18.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-GSHHG="gshhg-gmt-2.3.7"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="https://gmt.soest.hawaii.edu/"
-SRC_URI="
-	mirror://gmt/${P}-src.tar.bz2
-	mirror://gmt/${GSHHG}.tar.gz
-	gmttria? ( mirror://gmt/${P}-non-gpl-src.tar.bz2 )"
-
-LICENSE="GPL-2 gmttria? ( Artistic )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript"
-
-RDEPEND="
-	!sci-biology/probcons
-	gdal? ( sci-libs/gdal )
-	netcdf? ( >=sci-libs/netcdf-4.1 )
-	octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}"
-
-# mex can use matlab too which i can't test
-REQUIRED_USE="
-	mex? ( octave )
-"
-
-# hand written make files that are not parallel safe
-MAKEOPTS+=" -j1"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.5.9-no-strip.patch
-	"${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
-	)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	default
-
-	mkdir "${S}/share/coast" || die
-	mv -f "${WORKDIR}/${GSHHG}/"*.nc "${S}/share/coast/" || die
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/${P} \
-		--includedir=/usr/include/${P} \
-		--datadir=/usr/share/${P} \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-update \
-		--disable-matlab \
-		--disable-xgrid \
-		--disable-debug \
-		$(use_enable gdal) \
-		$(use_enable netcdf) \
-		$(use_enable octave) \
-		$(use_enable debug devdebug) \
-		$(use_enable !metric US) \
-		$(use_enable postscript eps) \
-		$(use_enable mex) \
-		$(use_enable gmttria triangle)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-all
-	einstalldocs
-
-	docompress -x /usr/share/doc/${PF}/{examples,tutorial}
-
-	# remove static libs
-	find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} + || die
-
-	cat <<- _EOF_ > "${T}/99gmt"
-	GMTHOME="${EPREFIX}/usr/share/${P}"
-	GMT_SHAREDIR="${EPREFIX}/usr/share/${P}"
-	_EOF_
-	doenvd "${T}/99gmt"
-}
diff --git a/sci-geosciences/gmt/gmt-4.5.8.ebuild b/sci-geosciences/gmt/gmt-4.5.8.ebuild
deleted file mode 100644
index 69ac9baca347..000000000000
--- a/sci-geosciences/gmt/gmt-4.5.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib
-
-GSHHS="gshhs-2.2.0"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="
-	mirror://gmt/legacy/${P}.tar.bz2
-	mirror://gmt/legacy/${GSHHS}.tar.bz2
-	gmttria? ( mirror://gmt/legacy/${P}-non-gpl.tar.bz2 )"
-
-LICENSE="GPL-2 gmttria? ( Artistic )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript"
-
-RDEPEND="
-	!sci-biology/probcons
-	gdal? ( sci-libs/gdal )
-	netcdf? ( >=sci-libs/netcdf-4.1 )
-	octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/GMT${PV}"
-
-# mex can use matlab too which i can't test
-REQUIRED_USE="
-	mex? ( octave )
-"
-
-# hand written make files that are not parallel safe
-MAKEOPTS+=" -j1"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.5.0-no-strip.patch
-	"${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
-	"${FILESDIR}"/${P}-bfr-overflow.patch
-	"${FILESDIR}"/${P}-impl-dec.patch
-	)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	mv -f "${WORKDIR}/share/"* "${S}/share/" || die
-
-	tc-export AR RANLIB
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--libdir=/usr/$(get_libdir)/${P}
-		--includedir=/usr/include/${P}
-		--datadir=/usr/share/${P}
-		--docdir=/usr/share/doc/${PF}
-		--disable-update
-		--disable-matlab
-		--disable-xgrid
-		--disable-debug
-		$(use_enable gdal)
-		$(use_enable netcdf)
-		$(use_enable octave)
-		$(use_enable debug devdebug)
-		$(use_enable !metric US)
-		$(use_enable postscript eps)
-		$(use_enable mex)
-		$(use_enable gmttria triangle)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install install-all
-
-	# remove static libs
-	find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
-
-	cat <<- _EOF_ > "${T}/99gmt"
-	GMTHOME="${EPREFIX}/usr/share/${P}"
-	GMT_SHAREDIR="${EPREFIX}/usr/share/${P}"
-	_EOF_
-	doenvd "${T}/99gmt"
-}
diff --git a/sci-geosciences/gmt/gmt-4.5.9.ebuild b/sci-geosciences/gmt/gmt-4.5.9.ebuild
deleted file mode 100644
index 7aefd90eb08c..000000000000
--- a/sci-geosciences/gmt/gmt-4.5.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib
-
-GSHHS="gshhs-2.2.0"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="
-	mirror://gmt/legacy/${P}.tar.bz2
-	mirror://gmt/legacy/${GSHHS}.tar.bz2
-	gmttria? ( mirror://gmt/legacy/${P}-non-gpl.tar.bz2 )"
-
-LICENSE="GPL-2 gmttria? ( Artistic )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript"
-
-RDEPEND="
-	!sci-biology/probcons
-	gdal? ( sci-libs/gdal )
-	netcdf? ( >=sci-libs/netcdf-4.1 )
-	octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/GMT${PV}"
-
-# mex can use matlab too which i can't test
-REQUIRED_USE="
-	mex? ( octave )
-"
-
-# hand written make files that are not parallel safe
-MAKEOPTS+=" -j1"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.5.9-no-strip.patch
-	"${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
-	"${FILESDIR}"/${PN}-4.5.9-unistd.h.patch
-	)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	mv -f "${WORKDIR}/share/"* "${S}/share/" || die
-
-	tc-export AR RANLIB
-
-	autotools-utils_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--libdir=/usr/$(get_libdir)/${P}
-		--includedir=/usr/include/${P}
-		--datadir=/usr/share/${P}
-		--docdir=/usr/share/doc/${PF}
-		--disable-update
-		--disable-matlab
-		--disable-xgrid
-		--disable-debug
-		$(use_enable gdal)
-		$(use_enable netcdf)
-		$(use_enable octave)
-		$(use_enable debug devdebug)
-		$(use_enable !metric US)
-		$(use_enable postscript eps)
-		$(use_enable mex)
-		$(use_enable gmttria triangle)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install install-all
-
-	# remove static libs
-	find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
-
-	cat <<- _EOF_ > "${T}/99gmt"
-	GMTHOME="${EPREFIX}/usr/share/${P}"
-	GMT_SHAREDIR="${EPREFIX}/usr/share/${P}"
-	_EOF_
-	doenvd "${T}/99gmt"
-}
diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild
new file mode 100644
index 000000000000..c2e3c983f507
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-5.4.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+DESCRIPTION="Powerful map generator"
+HOMEPAGE="https://gmt.soest.hawaii.edu/"
+SRC_URI="mirror://gmt/${P}-src.tar.xz"
+
+LICENSE="GPL-3+ gmttria? ( Artistic )"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +fftw +gdal gmttria htmldoc lapack openmp pcre pcre2 threads tutorial"
+
+REQUIRED_USE="?? ( pcre pcre2 )"
+
+DEPEND="
+	app-text/ghostscript-gpl
+	net-misc/curl
+	>=sci-libs/netcdf-4.1:=[hdf5]
+	sys-libs/zlib
+	fftw? ( sci-libs/fftw:3.0= )
+	gdal? ( sci-libs/gdal:= )
+	lapack? ( virtual/lapack )
+	pcre? ( dev-libs/libpcre )
+	pcre2? ( dev-libs/libpcre2 )
+"
+RDEPEND="${DEPEND}
+	!sci-biology/probcons
+	sci-geosciences/dcw-gmt
+	sci-geosciences/gshhg-gmt
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# Rename man pages to avoid a name conflict with gmt4
+	pushd man_release || die
+	local m c suffix newc
+		for m in *.gz; do
+			c=${m%%.*}
+			suffix=${m#*.}
+			newc=gmt_${c}
+			# This man pages does'nt conflict
+			case ${c} in
+				gmt|gmt.conf|postscriptlight)
+					continue ;;
+				gmt_shell_functions)
+					newc=gmt5_shell_functions ;;
+				gmtcolors)
+					newc=gmt5colors ;;
+			esac
+			mv "${c}.${suffix}" "${newc}.${suffix}" || die
+		done
+	popd || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGMT_DATADIR="share/${P}"
+		-DGMT_DOCDIR="share/doc/${PF}"
+		-DGMT_MANDIR="share/man"
+		-DLICENSE_RESTRICTED=$(usex gmttria no yes)
+		-DGMT_OPENMP=$(usex openmp)
+		-DGMT_USE_THREADS=$(usex threads)
+		-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=OFF # Install bash completions properly
+		-DGMT_INSTALL_MODULE_LINKS=OFF # Don't install symlinks on gmt binary, they are conflicted with gmt4
+		-DBASH_COMPLETION_DIR="$(get_bashcompdir)"
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package lapack LAPACK)
+		$(cmake_use_find_package pcre PCRE)
+	)
+	use pcre || mycmakeargs+=( $(cmake_use_find_package pcre2 PCRE2) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# Remove various documentation
+	if ! use doc; then
+		rm -rf "${ED}/usr/share/doc/${PF}/pdf" || die
+	fi
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED}/usr/share/doc/${PF}/examples" || die
+	fi
+
+	if ! use htmldoc; then
+		rm -rf "${ED}/usr/share/doc/${PF}/html" || die
+	fi
+
+	if use tutorial; then
+		docompress -x /usr/share/doc/${PF}/tutorial
+	else
+		rm -rf "${ED}/usr/share/doc/${PF}/tutorial" || die
+	fi
+
+	# Decompress manuals
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} + || die
+	# Rename some files to avoid a name conflict with gmt4
+	mv "${ED}/usr/bin/gmt_shell_functions.sh" "${ED}/usr/bin/gmt5_shell_functions.sh" || die
+	mv "${ED}/usr/bin/isogmt" "${ED}/usr/bin/isogmt5" || die
+	rm "${ED}/usr/bin/gmtswitch" || die
+	# Rename bash completion file
+	mv "${D}$(get_bashcompdir)/gmt_completion.bash" "${D}$(get_bashcompdir)/gmt" || die
+}
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index c31969b5f364..d0db455197ca 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -10,8 +10,12 @@
     <flag name="gmtfull">Full resolution bathymetry database</flag>
     <flag name="gmthigh">Add high resolution bathymetry database</flag>
     <flag name="gmttria">Non GNU triangulation method, more efficient</flag>
+    <flag name="gshhg">Install coastline database</flag>
+    <flag name="htmldoc">Install html documentation</flag>
     <flag name="metric">Use SI (cm) units instead of US (inches) ones</flag>
     <flag name="mex">Enable compilation of mex supplement which requires Octave/Matlab</flag>
     <flag name="octave">Enable octave support</flag>
+    <flag name="pcre2">Use libpcre2 for regular expressions</flag>
+    <flag name="tutorial">Install data files for tutorial</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-geosciences/gpxpy/Manifest b/sci-geosciences/gpxpy/Manifest
index d2da64cc962b..fbf8fcc6e021 100644
--- a/sci-geosciences/gpxpy/Manifest
+++ b/sci-geosciences/gpxpy/Manifest
@@ -1,3 +1,3 @@
 DIST gpxpy-0.8.6.tar.gz 65569 BLAKE2B d0a2673fc4a9adc7b15f45239091f823d6aa5191f7a07bf70d78cc38ca2cbef603e599b08fdcf221805bb81e61ac27d8e41402df77c998d826cdd4d74e376b4b SHA512 3c180436210689724f88fdac43576a9a11b3f8717fb6f8acd7c8ce0afc1219714b4c83f1ba4f64487d35d0189d65a311d77f7778e7d84f315b251d1098f8989c
-EBUILD gpxpy-0.8.6.ebuild 497 BLAKE2B c369344ef5512612324c09f45458cdcc1179185199ab5e10f9368b70db76f6a5f3b89ca5feee761a169809fefab4ab2239ae09684eb9308852915885f2184b8c SHA512 38e2fd40d8c48f3f2464e7787d02480cbb7f856c209d4a7c45b61b00df35f654d8660a2609b97d725ee5e715687f2f95b369535d15a4306695c9c889bff20d75
+EBUILD gpxpy-0.8.6.ebuild 487 BLAKE2B e44391aea9479ad35b7bb4421fb59d71cef209d32dc3b3108d40f3e258a341a18b48a84791e383c6d35cf07fdf5edd4b40ac90f4929477d44e669b86e47da80c SHA512 9b85c7f2bc3d9cbdbf4619a9de8f03cf040cababc7cc05379fbe9b3c1fc4c57853a8fa01bd134c72d9c493ed61735e86fe3a0de43693b7ba1b6943b6b61075af
 MISC metadata.xml 246 BLAKE2B 3931fc331f01f00c4d66107ba492d7b9c6d348905e23a7586992af4b81fba8d064de0047f93b9737136df9754e9303dcbde53ac277aa513a12379eaf01412c42 SHA512 a848581d49b21ba7364811ff7b47a8965fc46ec68077b2e88eea13b9b115bbbb7592d4e5a2e9e40ce603b506823260d27a75b32de36f0176b0b641fe1986094e
diff --git a/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild b/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild
index 9ae9c7eaf5de..88de25432a1b 100644
--- a/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild
+++ b/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 0b6d52c3fc46..593904799767 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +1,5 @@
 AUX grass-7.0.1-declare-inespg.patch 647 BLAKE2B ec303cc88965ff24d9521a3d2fdec3cd62f14bb9830a37942aa3373acc5351b07022f782c8f22f560bbf1f794fd46fa524b7ddab07a360c3e6f34cf3c1258972 SHA512 9206619090c0f138c734f7fe48467cd343cd01120ac4d7eaec3d822b7cac1cbc6e4630bfedd68e7bdd6966716116a1d6714faf373a1eceb08726acd16ca34bb4
 DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83
-EBUILD grass-7.4.4-r3.ebuild 7400 BLAKE2B 8dde00d639e28c3d53b9ca02ff7b4b1bcc2424b121dbad8b24645c5f26ef252dc62c695a7a1c87d58b8992ca859c2425b85fdcaa1204a04d5f7f4bdd3b61d256 SHA512 69a41763c2d3a60cdab2756fe5e4643e47b67f681fa548a6d055bb630c09e001d066196964a26d53407e580e57438e94b0052063ee1fe16c3796081ab45a74ab
-EBUILD grass-7.4.4.ebuild 7411 BLAKE2B c4b0539103c65e5c5f3275a51a60ef48000f898e72395f779c0178de598eaee745aada62cb5f3c2c682cdef1b2d962b0490f82ada644a137c69b81b2fecac1fa SHA512 71dd5f7e0e3972d89e3e29fa6dfe593697606188dd6318b7267f6793a87499d253952faa3f951659d22d9c4ccb9438e8b752f0c1b18f57408edc71380b8bd8d0
+EBUILD grass-7.4.4-r3.ebuild 7416 BLAKE2B 0de9b85e9faf9ee9c207ea7bdd748191d889d59e432271982caf742eacfe9bc1d1c3e79c218c7f05a2252d41544aeae249bd2e654ba8a7fe61b47bcb4ae5b4d1 SHA512 b6b472d0b5e8d8e702382ffda40376d146ba2fd84091330938b7a2adea17e53f13203081c6f60ae8aaeed878f2068a7d5996222b0e23b28a8868e9d67e42cddc
+EBUILD grass-7.4.4.ebuild 7427 BLAKE2B 901d179a5744f1e62ae83768d5792b041431e8a9891240954f3b3b9811391c01aec4fa99a4a919006699fc905b9d5a78a405e7e2a241be88d4ac93404bd159c6 SHA512 9c1e65cf52d8b0ea7ad82d0c323364ddf907ea26c6854114a86cc5382340ddd152548895c8865631d070d10a36f404df04ae0009f33e62c7b8fd01fa19933ada
 MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635
diff --git a/sci-geosciences/grass/grass-7.4.4-r3.ebuild b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
index 595f714b7b87..8abc0e1da2b7 100644
--- a/sci-geosciences/grass/grass-7.4.4-r3.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite"  # bug 572440
 WANT_AUTOCONF="2.1"
 WX_GTK_VER=3.0
 
-inherit autotools desktop eapi7-ver python-single-r1 wxwidgets xdg
+inherit autotools desktop eapi7-ver python-single-r1 toolchain-funcs wxwidgets xdg
 
 MY_PM=${PN}$(ver_cut 1-2 ${PV})
 MY_PM=${MY_PM/.}
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
index af8e8a283be9..fc33e46cfef1 100644
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite"  # bug 572440
 WANT_AUTOCONF="2.1"
 WX_GTK_VER=3.0
 
-inherit autotools desktop eapi7-ver python-single-r1 wxwidgets xdg
+inherit autotools desktop eapi7-ver python-single-r1 toolchain-funcs wxwidgets xdg
 
 MY_PM=${PN}$(ver_cut 1-2 ${PV})
 MY_PM=${MY_PM/.}
diff --git a/sci-geosciences/gshhg-gmt/Manifest b/sci-geosciences/gshhg-gmt/Manifest
new file mode 100644
index 000000000000..cbf515f96748
--- /dev/null
+++ b/sci-geosciences/gshhg-gmt/Manifest
@@ -0,0 +1,3 @@
+DIST gshhg-gmt-2.3.7.tar.gz 57052180 BLAKE2B 5b618c874cca97da819263c3c436db1235d3293712a72c21ac4ca3ae78e95b5d36915312de3df361f978b14c697884ca278bebc41ac4c1d054adda6c417eb5b9 SHA512 27e97efe9d146a58d1c6674c5b6cde6b7545be60c1f7d3d93faca1034986d1648e73b589de571897fc53cd0d050a5875dcc9923e3f861f8473ca568a8142d727
+EBUILD gshhg-gmt-2.3.7.ebuild 446 BLAKE2B 7f3b4d3e96e4335f1f1f2f9b095289cb4fbaac60659c3fdb689a32c29715e4e975628278300d8d0040b2ccd61dede0ccbeba1af4c6a22d1059c939a6491ce7f9 SHA512 f53796f28088be4c4db5eec3e59f70033cfb7e4c2e239a25fa0e7433e85e8d839111819515c55d9b4e8a4f29862f0af110630ce2e10cbe8c3ae4389ed54574a4
+MISC metadata.xml 792 BLAKE2B 386af871abe7a142f708d291cce70826f1347bf84c3dcdcbcfd5e6778f13e63929ac64d54c9725c5ebf3d9c32d71240a850a50e4df3b010d2bd7f7f600db6a7a SHA512 d1fc22ba6fddd7ec3e586b6334ec106f64fac8c05901052a41b2474f1bcdae31f629533e2e9f5577b3f4084f1abf92be39c1fd8385b10ef93e5cd483ddcdb4c3
diff --git a/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild b/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
new file mode 100644
index 000000000000..ebc770e53ffb
--- /dev/null
+++ b/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Geography Database"
+HOMEPAGE="https://www.soest.hawaii.edu/pwessel/gshhg/"
+SRC_URI="https://www.soest.hawaii.edu/pwessel/gshhg/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_install() {
+	dodoc README.TXT
+	insinto /usr/share/gshhg
+	doins *.nc
+}
diff --git a/sci-geosciences/gshhg-gmt/metadata.xml b/sci-geosciences/gshhg-gmt/metadata.xml
new file mode 100644
index 000000000000..71e2884352e9
--- /dev/null
+++ b/sci-geosciences/gshhg-gmt/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		GSHHS is a high-resolution shoreline data set amalgamated from two
+		databases in the public domain. The data have undergone extensive
+		processing and are free of internal inconsistencies such as erratic
+		points and crossing segments. The shorelines are constructed
+		entirely from hierarchically arranged closed polygons. The data can
+		be used to simplify data searches and data selections, or to study
+		the statistical characteristics of shorelines and land-masses.
+	</longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/libtcd/Manifest b/sci-geosciences/libtcd/Manifest
index af227216622f..ce82d5b95562 100644
--- a/sci-geosciences/libtcd/Manifest
+++ b/sci-geosciences/libtcd/Manifest
@@ -1,5 +1,5 @@
 DIST libtcd-2.2.5-r2.tar.bz2 294449 BLAKE2B 82c91beab6f4fe5d6c4ddfdca043a83db01508fca9475576c2f4174d14928acd7c5c56afd2dce2fc741bb2bf61244ed65f63e9298ab5e6d2b3520622b283aa68 SHA512 125b8f4258c576d82f86f75c9dec4e6e0dba8d46e897835ff8ee57cb58495c3f2ae42040719aa8a6f0fa70be40dbc3eb082250cfa197f15f0b23d2ee37a47fbd
 DIST libtcd-2.2.7.tar.bz2 306184 BLAKE2B 77d942adb822d96c86dbda2141acf1e2e30551b70e24bc325f412691149d2dd28a862592d8c0f57a0d528bcfee991613ff81f654a3541be341145a02e5af0164 SHA512 3347539a186c13fd9713752e4c9bb75c50eeee74f85a9126d7ed376f927675af6943fc486ff9396b5504b9d1aa8e33ebdd41663fc1ec5ed8babf4c207be3ce3f
-EBUILD libtcd-2.2.5_p2.ebuild 689 BLAKE2B 383c4c6c1b0872e109818135f702df76d45625437a3ee0fcb5a2d02bebccebf65817d2b84d179be1ed88a92dab9e2edac974cdbdb9d527dc6831bbc0a2daa43e SHA512 bd438dec387875b6f3839d3edad09e9881c40885454cafcc92dfc35c0c2af17d6b33b3f12bdf7a7425350dc3f20d9231137e8996b51d85474cffef9415c1ebac
-EBUILD libtcd-2.2.7.ebuild 693 BLAKE2B 06deba6073910d5e7fb9475f16bc36c97f0ce908d035ba70e681c16a27aedab9c18beb339ba9cd2164306cfea6160cf972e9f4f10277adcfe61d02767082c7c3 SHA512 06d15d9289312e2f7b3d36b1bbd8dca2daa9ae82c516c9f2aba2b96ef32ca4e63bdb1a177570dc393c3f51632dc5ecc54a6a75e3e175025b582453ae06008732
+EBUILD libtcd-2.2.5_p2.ebuild 694 BLAKE2B e0dd4d4644a6b16ee1bcbb38673052c2d88a531c294d52e0e0ccf7abcaaddc48d0d1aefe0be0f7355b7397bfdcfdb2413e0ee5afa651b74506c11affdb4efd2a SHA512 671152db1f356139ecba4fa6e7443372326ed30f405e2bef2b6c8ea29dae2b22b92c49a48f3583b5dd502a6280669378872d5a8c212e414e622bb84e015b65fa
+EBUILD libtcd-2.2.7.ebuild 698 BLAKE2B 9a766231c6f8d8b56c1df9ad3c30faa3363ef5c4b24e3e01c4497ee801f818b8f9dd98c20fdf8631eddf3b7899bbecebcf9237c29f23c2cd5ecacbf41e8b8d53 SHA512 972121b55f67a38180e0b9ebc7e1a19e99f756c1e8c17ab8a7e5eedcdf0b0a774a9beadaf524b5230a841971d866553950ae697d8e8cfbf003f026e61e0b37a5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild b/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
index 582689ba71a2..721ba65e76d7 100644
--- a/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
+++ b/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit eutils ltprune
 
 MY_P=${PN}-${PV/_p/-r}
 DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files"
diff --git a/sci-geosciences/libtcd/libtcd-2.2.7.ebuild b/sci-geosciences/libtcd/libtcd-2.2.7.ebuild
index 20fa5a171536..8cd78ebae5bf 100644
--- a/sci-geosciences/libtcd/libtcd-2.2.7.ebuild
+++ b/sci-geosciences/libtcd/libtcd-2.2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit eutils ltprune
 
 MY_P=${PN}-${PV/_p/-r}
 DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files"
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 6b90c211fcb3..2551d4f9f64d 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,12 +1,5 @@
 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 4515 BLAKE2B fd190f6f28e7474992e713feb9e31acce66e6c7e52c5e13a7d47fb1c5b0c16d3109cac025d4900738c5c0c716829a8e090d19a9ae675c91aacce7c502e77b684 SHA512 0b0a8fe0f507cedad19354beab48f8209119e1cc6c27d1a29372a4e2131694ae7174d416c099835ccb403f87b5d6c5e1033e1d82efd6ab7ae1a49651dfd1f360
-EBUILD mapserver-7.0.7.ebuild 4952 BLAKE2B 434e0d38aed21a5751a7fe9cf0535da6aba6b108afac4aa9e83afaecfefc550192213899be612f96579cff6d7073de8025082e8761cd201cc7168374be95d183 SHA512 ca8d7ceb46f139e7177fa4b4ffed026d566439c9931155d6cfdfb6906bf3e5c8467dde3d36df9c3d5d7ba90ee30587925276a3073e3432f98a5d1f1fd4149f0f
 EBUILD mapserver-7.2.2.ebuild 4943 BLAKE2B 3e39d474fceeff3ba1486070c6ebf735fcbab8c66b3a6e5dc1e42dc720fa9ebba13300eb3428c7a83d87c8131f5b328cfb7b6a8c609e6ce59564d001a4618508 SHA512 908d6b5f8a544909c63637b01bbd604636461d5ca1ea9d92b10a3ce6c195fce2985dd114094ef2ef85f5873058ecce7f2b7e74c91676e8e8cd7264696e14a135
 MISC metadata.xml 748 BLAKE2B d0cdfaae91bf8b692dd90eb8842c5c5bc78c421e729b713d1091de482e23475aedd1c987de14da5e438228bcbbf15bb488515d7253d635aac6148599fae58c3c SHA512 c0ed4810c5d7eff6fc409ae17f25ece71a89d99ba33fe2c27c04d37859798997a8e29964514fd95d1639688e29044309666e0684befcc598c4ea9ce9c82fd2b6
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch
deleted file mode 100644
index 17016c66e67c..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/apache/mod_mapserver.c b/apache/mod_mapserver.c
-index 7949ddf..c8dbde6 100644
---- a/apache/mod_mapserver.c
-+++ b/apache/mod_mapserver.c
-@@ -40,7 +40,7 @@ static int
- msIO_apacheError (void *cbData, void *data, int byteCount)
- {
-   /* error reporting is done through the log file... */
--  ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, (char*) data);
-+  ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "%s", (char*) data);
-   return strlen ((char*) data);
- }
- 
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch
deleted file mode 100644
index ee8da6ca1fe0..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 7e4be3d354053bca65838c2c481a61d4d5c24a3b
-Author: Ettore Di Giacinto <mudler@gentoo.org>
-Date:   Tue May 23 20:12:20 2017 +0200
-
-    Fix mapserver to build when TRUE macro is not defined
-
-diff --git a/mapserver.h b/mapserver.h
-index 32182fa0..19b1075c 100644
---- a/mapserver.h
-+++ b/mapserver.h
-@@ -78,6 +78,10 @@
- #include <stdint.h>
- #endif
- 
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
- #ifdef _WIN32
- #ifndef SIZE_MAX
- #ifdef _WIN64
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
deleted file mode 100644
index daf5ab1ebc7c..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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.5.ebuild b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
deleted file mode 100644
index e0d969774e18..000000000000
--- a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# 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
-
-inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r3 multilib cmake-utils # 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="bidi cairo gdal geos mysql opengl 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
-	dev-libs/fcgi
-	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
-	media-libs/giflib
-	net-misc/curl
-	virtual/jpeg:=
-	virtual/libiconv
-	x11-libs/agg
-	bidi? ( dev-libs/fribidi
-		media-libs/harfbuzz )
-	cairo? ( x11-libs/cairo )
-	gdal? ( >=sci-libs/gdal-1.8.0 )
-	geos? ( sci-libs/geos )
-	mysql? ( virtual/mysql )
-	opengl? (
-		media-libs/ftgl
-		media-libs/mesa[X(+)]
-	)
-	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 )"
-
-need_apache2
-
-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}/${P}-missing-macro.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-	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
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DWITH_ORACLESPATIAL=OFF"
-		"-DWITH_SDE=OFF"
-		"-DWITH_APACHE_MODULE=ON"
-		"-DWITH_ICONV=ON"
-		"-DWITH_GD=ON"
-		"-DWITH_GIF=ON"
-		"-DWITH_CURL=ON"
-		"-DWITH_FCGI=ON"
-		"-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
-		"-DWITH_PROJ=$(usex proj ON OFF)"
-		"-DWITH_WMS=$(usex proj ON OFF)"
-		"-DWITH_KML=$(usex xml ON OFF)"
-		"-DWITH_GEOS=$(usex geos ON OFF)"
-		"-DWITH_GDAL=$(usex gdal ON OFF)"
-		"-DWITH_OGR=$(usex gdal 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() {
-	cmake-utils_src_install
-
-	if use php ; then
-		php-ext-source-r3_createinifiles
-	fi
-	webapp_src_preinst
-	exeinto "${MY_CGIBINDIR}"
-	doexe "${S}_build/mapserv"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	webapp_pkg_prerm
-}
diff --git a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
deleted file mode 100644
index 27ff52df21b1..000000000000
--- a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# 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[X(+)]
-	)
-	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/opencpn-plugins-meta/Manifest b/sci-geosciences/opencpn-plugins-meta/Manifest
index 6ac8b7214245..f379b357f0a5 100644
--- a/sci-geosciences/opencpn-plugins-meta/Manifest
+++ b/sci-geosciences/opencpn-plugins-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1372 BLAKE2B 0a1cee39e987227373847e8689e957dffb0dbf80a176dafb5d119d8411d5b3cfc7487b98ba0d3eb74fdf99ae022e6b55523ccd44a73fc7a25cc3e3917cb304f2 SHA512 8b37b575709ead8bb0f2a3f79f37fe5025c3af6aa8c6e594060e3e061025586716955427b8867c6c0e76a90be8209cc39a9383258f0b702bbac990be1ab845ca
+EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1369 BLAKE2B e175b030be15c0137c8f578cccc524c8966534dbfcca765a5a0530acd655ab93188d675041c398ce0e950fc09b47008486c6585ee9f0de2010fa7367a3279fb8 SHA512 518cbc96c138438ff8a45bb2e9f73670f4f89148e6ac2f7392217f2b524b735825612c39ca64127f52d1f07e075912ec644fb573d64a020351c35e17dc89e45e
 MISC metadata.xml 380 BLAKE2B e36e71274105ca4ccc90d1956dbd050ef82af00c0342c17b6d98e7b1d2e7fb9096ab4a2aea3763d054ffb9165d6d8b20122908c6b4ab651f18b722aeec66672a SHA512 8e6413ba8a2f51d21bd883f097825a3e86a410d222496242fc2b6da34ee8d759c473e1c1c58ee93c90b0d88db2cfd6e1f8c00fa29bd8a1637a2026142b9b18ab
diff --git a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
index 1f85e8dec7a6..53a7955cde5b 100644
--- a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
+++ b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index f278272bfe46..d7bd15128464 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,6 +1,4 @@
-DIST osm2pgsql-0.94.0.tar.gz 1203310 BLAKE2B df9af84aab13bfd79763238e89dfc216401be2460be468a2f5467513dfcbd48650d779586f9cefd4100d6404f430a2401326919e9a1c72d86b80c6526881f206 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e
 DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372
-EBUILD osm2pgsql-0.94.0.ebuild 864 BLAKE2B a500d39a0cb460cac74f228d6fafca27c9d8ac3c9b33e8c895f5287e6b7ec3fa88be469804068429c9c9390d19cf487f302412bcf8275e83906d12122b197640 SHA512 6605ebc9725f55851feb512b63f2f6b4e3a58147b87e5ee0cb91b4523737dca4f8d9b35a0db0aa762539ae9362a4193db6476562362dffed3e0493fdd5f5171c
-EBUILD osm2pgsql-0.96.0.ebuild 870 BLAKE2B ef29fd0117b292a6691bf77d8aedabd83bc2befb7414d3a0b9de518c75876f3b6bc59a3a38858fa47cec24ac273d5417fc9dcbe35d2e66a71fcdf6cd8aa32382 SHA512 3d381f02b8f1283867133da665fe8c97f37222964f84e2cce77f27ba910c2f439b5572871dda54b43dea74c62b00642f124a9e24f01022c999d024f837fcd2df
-EBUILD osm2pgsql-99999999.ebuild 812 BLAKE2B 3f4fd25082adf137822d07ac89cb27f5a8c7d9e80437ad047241e6589e90f746aacf5d7332093a8604b566ac41d638530b47efaf2c33382856e7bdbe48f4be5e SHA512 a70c0352ec4299ddc7df14d5d10c3756d569958ca78789989ee55460e0918315a076157e03477b6054a5614e1f537ba9fe9bd680d5102f49f3135f0c1b5475e1
+EBUILD osm2pgsql-0.96.0.ebuild 929 BLAKE2B 8e6439ecb63014d35000663c76b622d08e196ed81331c715122e6f512347e136d0157491d568baa693755f4d335b23c5782a7ef50d9e43487e5b12e88ff86949 SHA512 efdadf44119fedd15a4b15108e197edd16ffdff5f1b76e64a75091c4a8df3ac06a7bb21f3721391e15a0518ae96424b0ea7c17e410af1b7e642438153469cbfa
+EBUILD osm2pgsql-99999999.ebuild 913 BLAKE2B a41beca987915d3502321a499e7eff09fe69421e5d0c767c5f3c08a415739123b6df1b1c27ed12861556a684f5063df041a21f074b3fb44dc8cab66c6ed57712 SHA512 7cfb4ae3e48254f7c02563f6430ee8b8886d0b266f65762a12c3b4b6fb85979262ca0c71359355d1fac077e824ac3ff0de400a407e9032a9ef077a5e07cc04de
 MISC metadata.xml 793 BLAKE2B d74e55e2b2cd946a65cba5bd3f0ba953edf8528d6d30037fbd69640d7379ced6e07a0e81e57f02f2e49afde4a55b07c21cb5430de1d42a682e10bfd964ab7939 SHA512 2f76c2c5946179da213b0bf193e89f110c46818ab77a4dea41df1fc78d1527ace8ff81a3887ebb47e6ee0a799e0ee037364e22bfdd5ce72feb765209b6a3fcd6
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
deleted file mode 100644
index f6ef3e3fbfc4..000000000000
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
-HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql https://github.com/openstreetmap/osm2pgsql"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lua"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-db/postgresql:=
-	dev-libs/expat
-	sci-libs/proj
-	sys-libs/zlib
-	lua? ( dev-lang/lua:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-db/postgis
-"
-
-# Tries to connect to local postgres server and other shenanigans
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LUA=$(usex lua)
-		-DBUILD_TESTS=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
index 990f5c9422a8..e5e751831c5d 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake flag-o-matic
 
-DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
 HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql
-		  https://github.com/openstreetmap/osm2pgsql"
+	https://github.com/openstreetmap/osm2pgsql"
 SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lua"
 
 COMMON_DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
 	dev-libs/expat
-	sci-libs/proj
+	sci-libs/proj:=
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )
 "
@@ -34,9 +34,10 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 src_configure() {
+	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
 	local mycmakeargs=(
 		-DWITH_LUA=$(usex lua)
 		-DBUILD_TESTS=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index 44e16db48041..78b4534c993e 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake flag-o-matic git-r3
 
 EGIT_REPO_URI="https://github.com/openstreetmap/${PN}.git"
 
 DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
-HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql"
+HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql
+	https://github.com/openstreetmap/osm2pgsql"
 SRC_URI=""
 
 LICENSE="GPL-2"
@@ -20,7 +21,7 @@ COMMON_DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
 	dev-libs/expat
-	sci-libs/proj
+	sci-libs/proj:=
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )
 "
@@ -35,9 +36,10 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 src_configure() {
+	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
 	local mycmakeargs=(
 		-DWITH_LUA=$(usex lua)
 		-DBUILD_TESTS=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }