summaryrefslogtreecommitdiff
path: root/sci-geosciences
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sci-geosciences
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/Manifest.gzbin11424 -> 11262 bytes
-rw-r--r--sci-geosciences/geocode-glib/Manifest2
-rw-r--r--sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild44
-rw-r--r--sci-geosciences/gpsbabel/Manifest4
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch132
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch133
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch27
-rw-r--r--sci-geosciences/gpsbabel/gpsbabel-9999.ebuild119
-rw-r--r--sci-geosciences/gpxsee/Manifest4
-rw-r--r--sci-geosciences/gpxsee/gpxsee-7.25.ebuild66
-rw-r--r--sci-geosciences/gpxsee/gpxsee-7.26.ebuild66
-rw-r--r--sci-geosciences/liblas/Manifest3
-rw-r--r--sci-geosciences/liblas/liblas-1.8.1-r2.ebuild50
-rw-r--r--sci-geosciences/liblas/liblas-1.8.1-r3.ebuild2
-rw-r--r--sci-geosciences/merkaartor/Manifest11
-rw-r--r--sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch30
-rw-r--r--sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch12
-rw-r--r--sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch186
-rw-r--r--sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch35
-rw-r--r--sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch135
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild (renamed from sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild)17
-rw-r--r--sci-geosciences/merkaartor/merkaartor-9999.ebuild58
-rw-r--r--sci-geosciences/osm-gps-map/Manifest2
-rw-r--r--sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild2
-rw-r--r--sci-geosciences/qgis/Manifest2
-rw-r--r--sci-geosciences/qgis/qgis-3.10.3.ebuild206
-rw-r--r--sci-geosciences/tappy/Manifest3
-rw-r--r--sci-geosciences/tappy/metadata.xml8
-rw-r--r--sci-geosciences/tappy/tappy-0.9.0-r1.ebuild29
-rw-r--r--sci-geosciences/viking/Manifest2
-rw-r--r--sci-geosciences/viking/files/viking-1.7-no-common.patch13
-rw-r--r--sci-geosciences/viking/viking-1.7-r1.ebuild92
32 files changed, 958 insertions, 537 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index e7db37a99582..6aad1d93038e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
Binary files differ
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index 1e47ae563304..2bb610aee03a 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,4 +1,6 @@
AUX disable-installed-tests.patch 1245 BLAKE2B e66fe773ad51475247306ea3b2459bf062e5b26cf8e85c52ce99dd05bfdcd32dd40c5d3d591737f6c3ce7c2688f31526b39af852a92a40c06657fc3e9149035c SHA512 7ab8113b1468c9291838def18b57e4dc3cc1a5bcbc22208ac2920b1199121a2055dcd31346551cbcafc1101945f242afdbabd8738d32fdc254a5b7474aeaa038
DIST geocode-glib-3.26.1.tar.xz 75296 BLAKE2B 68e42868edfd73db94d16dcc754eea1ee736ad910c5180616ba351cc50b682cd3b7ea4a64c9e1296af315298f68ea850a1773c4a05955c1159a6038773aad184 SHA512 0eb8e8a668c3950d06e77a379d375e2297cf7d95435aa8212715ddc36c3a57a53192e75dd0c82a2f2e7e558ea0e903a477c9dfa54f8cd2805d048fe46265d621
+DIST geocode-glib-3.26.2.tar.xz 72956 BLAKE2B 40a32fb0ba61cd91b28e57c518dc5450ce89a16889a335d19fe722c1088a4cdb085237d1fe24d08eeac62581ac68895a7a2b432d66f46fc4e03466485cfe5060 SHA512 b3ef81fac6959f6c4725ca721125cdafbbec69233f321872e17f9035266ed7616018ef54a9082fbd0a83395d18c664144cfe3b431d63744be433f058071cd435
EBUILD geocode-glib-3.26.1.ebuild 1106 BLAKE2B 82e4c8e16549e78d973423a02f29787df6af42dcad996e4d4ccbb1f837c25bba5fb1e7555d2d5c912835af0c9e6043772906846b56963eb335584418a3cd3cb7 SHA512 a5c249357dad6a1d719defe06f2b05d6de07c1b69f7ba86acee24792459b02eb68f1b82f63c7fb5cfcea29a8f1f0e6358fb6dc5aa7268e822d976b967d39444e
+EBUILD geocode-glib-3.26.2.ebuild 1119 BLAKE2B d823c5d5559b8eb1e371defd656555cd0ba3b3049c9e6fac97cecf40661c65228b445df4e7420e644b74a69d0f472f8d4949236f4f69b47db5a2336d640523b6 SHA512 82d3ec043654edb936dbfa981df3d603fcc156a260f825686dc662206f676fc16f5f0e1ff0f9dc35a3b25894ca5f545eaff5847fb76b614ee35b9db5069d7eb2
MISC metadata.xml 416 BLAKE2B dfe7b0b1aa8cd6c4664d3cbc0d9bda64b4452e8bf606f105a24829f19a9151b36406c676ffd66e81150e0cfd813d1f7b33ada08b71be9e93ac3547815ba9721c SHA512 d3c5f22341ffa6a9a63d788f9cdb801b496142336bed66318d780ad7cb16d75cbc964d11b472e0cb268d431542b4d2b2a2ccc87fff20fd77777bae0418009cb8
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild
new file mode 100644
index 000000000000..b194bf3c6a33
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="GLib helper library for geocoding services"
+HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection test"
+
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/json-glib-0.99.2[introspection?]
+ >=net-libs/libsoup-2.42:2.4[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.13
+ app-text/docbook-xml-dtd:4.3 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/disable-installed-tests.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use test enable-installed-tests) # Actual installation to live system is sedded out, but we need this for running them in src_test
+ $(meson_use introspection enable-introspection)
+ $(meson_use gtk-doc enable-gtk-doc)
+ )
+ meson_src_configure
+}
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index b19db68454a1..a1d520093542 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -7,7 +7,11 @@ AUX gpsbabel-1.5.4-qt-5.9-2.patch 3488 BLAKE2B 98160e59145b84957948dda2dc00338fb
AUX gpsbabel-1.5.4-use_system_shapelib.patch 2868 BLAKE2B c21666bc49b5ec6f433ca4c7a11b7ff3523117f0155b053fac9a88aa91fa0e8bdbeb18efdb87f2360cb39df7e50b144f2d7839d4bd007751bfc67d966139fe54 SHA512 437a15bea31b6b6e45571ce14540d337a0d46afdae4a1c72f3dbfcdbe9314b1368f734e009d9039200814a419390d51ccce03fd30c8857ad7208230be092da10
AUX gpsbabel-1.5.4-use_system_zlib.patch 2814 BLAKE2B 58fb1dd0dc25897613125e45495bb9a9253aa9c6ac944b6f41a234295633e7740e497fb90aeb250b871c434d2298ed5cbf3c1cd3203053644ebd7007fb64ab56 SHA512 dbda711da83232e4ad38bda19ab2be28a4aded357d037443e9b2f34edbb1ae36afbbff33f3a36326154d9942a29f5a8458cfe459d7c1085f7044da0a231bcf15
AUX gpsbabel-1.5.4-xmldoc.patch 497 BLAKE2B 5843fb604ec984324258e6cd00aa5bddf37b6012b4f2fc957cca46f9d767955b7902671ce07d869d8290efb96a2636621cecbede623cbfe6b6e7dd7b849fae73 SHA512 d3e1d7f02a54ab5f8d3c552e8849f9450da6469f4ba0d2741c00b30a0b07896dba55d68485f519962d6886626583872c7f0c3603deb6bd69e386f29a2bf48899
+AUX gpsbabel-1.6.0-disable_update_check.patch 4812 BLAKE2B 1b335ff48eeeb2e836091fc4841557693d66c4b6549752cd42e3817af0be934418c8cc824d8899f9c7fbf7ea4b73eeaf848213614ce544b610d207cfb8c96978 SHA512 a9729f4734edb318a045ed8b42ea2ef2725dd010792d8421fd637f68d30fc01f1d9e89a1fe3118c7e9670171db912746891bdf4c027c801118d84239ae33b1c9
+AUX gpsbabel-9999-use_system_shapelib.patch 6398 BLAKE2B a4db5d0547bb38432742ea1bd66c881d9fe33132e8053295d97e76d21ccbf7a6d3ab6065a272b6a6653652b18de27310376a2af84a9cac1ebc0ec7cfa9d92ae8 SHA512 367640b306b36e5cf6cf6f41d829e6b84b0f36ea4ad0462ccd2a72d277ceba305f9b817b7ad3628051442e514a4813cb2fe4364cc956d5b94ac1e53035551162
+AUX gpsbabel-9999-xmldoc.patch 856 BLAKE2B afec4b243b15862af7f0ae7a83ce16dc2406b4748bbf9d84c88934bda2ee0a2a8fe626f993b731f773ffe6b49f3a910bfc629b38b1021c5737f704e5c95573e6 SHA512 585dcbbd3bffee60b971cbd420d44790d2b7a090608938d39712264d8f444c95980377ea5fe4ce2dc7de8262413b58f55c056db95f3961038edef1afb23031ba
DIST gpsbabel-1.5.4.tar.gz 9099765 BLAKE2B 339cc78f94fed883b73c9f74cc6e27dd214438ba86917079b27459f543a9cb360bd8ec12408af1f23b9114d774a3b8eeccfb6b9f4fa9e7dc73b63e11bac20d43 SHA512 5fdc3bc07ad52d6c1e3532b287dcb506aba612ae9bc8db393b4837d79d773d6e22ad31f8f8e65770ec52b1afbda556e452af20dada1e411de93ca6e18054225b
DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
EBUILD gpsbabel-1.5.4-r1.ebuild 2519 BLAKE2B b885d064cf189f23a9edc9aa360139d311882bc856d4261e549a8113d197b3603c2aaba3c3a1734c222e663644d21bb47c47726a2ae28041ddc3a760202ab25f SHA512 0558373ebd1337495bc51107d2d22771aaf44fd803fb81fd6a9ad6e9a0c0d53ca9e04d7a6dee2d16dffce24bbafc25f1743011e47819c1c4d543defd1be32e6c
+EBUILD gpsbabel-9999.ebuild 2540 BLAKE2B 7556ba7682180450dde99a22367209cb7439237079429c596dd155489530606abc4050ad2adea7233124d4b27e53af8ad7a429f11a7e718291b3447c5b194dbf SHA512 c67dcce859401fcb47f0a0017297b8c3993d5bb326b9bf058c48e4f555df2f5c60a70f61d9d9f5c6b97709b623e4296264b5fa766675bf3f37c749f32a0657ab
MISC metadata.xml 351 BLAKE2B 202695326c207a7b3596c8e1f598839897c0214fd242537ec0b50d4a4a7117b7733f9b6f866fcbc9f87fa57daeccde3b2b8c0bf89868324b53e07c96acb4a0e5 SHA512 b6e29834c731b6cb611ec6cb3a9cd38fbd91461aa8d3a3118ba746c40c41d39e3eab92cca689a32f65540869316a7f416cee2cae7d2310368265aa241a181e1c
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch
new file mode 100644
index 000000000000..6adeef664a52
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch
@@ -0,0 +1,132 @@
+From e24573dc7fce7c48da6b960a722b567f24e1318e Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <dilfridge@gentoo.org>
+Date: Thu, 12 Mar 2020 19:48:16 +0100
+Subject: [PATCH] Gentoo: Disable update check
+
+---
+ gui/babeldata.h | 2 +-
+ gui/mainwindow.cc | 16 ----------------
+ gui/mainwinui.ui | 6 ------
+ gui/preferences.cc | 2 --
+ gui/preferences.ui | 7 -------
+ 5 files changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/gui/babeldata.h b/gui/babeldata.h
+index a8586f30..4d73a4e4 100644
+--- a/gui/babeldata.h
++++ b/gui/babeldata.h
+@@ -64,7 +64,7 @@ public:
+ upgradeErrors_(0),
+ upgradeOffers_(0),
+ runCount_(0),
+- startupVersionCheck_(true),
++ startupVersionCheck_(false),
+ reportStatistics_(false),
+ allowBetaUpgrades_(false),
+ ignoreVersionMismatch_(false),
+diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
+index adbac733..b0a8483a 100644
+--- a/gui/mainwindow.cc
++++ b/gui/mainwindow.cc
+@@ -174,7 +174,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+ connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
+ connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
+ connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
+- connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
+ connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
+
+ connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)),
+@@ -233,17 +232,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+ restoreSettings();
+
+ upgrade = new UpgradeCheck(parent, formatList_, babelData_);
+- if (babelData_.startupVersionCheck_) {
+- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
+- allowBetaUpgrades());
+- }
+-
+- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) {
+- VersionMismatch vm(nullptr, babelVersion_, QString(VERSION));
+-
+- vm.exec();
+- babelData_.ignoreVersionMismatch_ = vm.neverAgain();
+- }
+ }
+
+ //------------------------------------------------------------------------
+@@ -1067,10 +1055,6 @@ void MainWindow::applyActionX()
+ //------------------------------------------------------------------------
+ void MainWindow::closeActionX()
+ {
+- QDateTime wt= upgrade->getUpgradeWarningTime();
+- if (wt.isValid()) {
+- babelData_.upgradeCheckTime_ = wt;
+- }
+ babelData_.runCount_++;
+
+ QDateTime now = QDateTime::currentDateTime();
+diff --git a/gui/mainwinui.ui b/gui/mainwinui.ui
+index f5765e10..4533f234 100644
+--- a/gui/mainwinui.ui
++++ b/gui/mainwinui.ui
+@@ -691,7 +691,6 @@
+ <addaction name="actionHelp"/>
+ <addaction name="separator"/>
+ <addaction name="actionAbout"/>
+- <addaction name="actionUpgradeCheck"/>
+ <addaction name="separator"/>
+ <addaction name="actionVisit_Website"/>
+ <addaction name="actionMake_a_Donation"/>
+@@ -720,11 +719,6 @@
+ <string>Preferences...</string>
+ </property>
+ </action>
+- <action name="actionUpgradeCheck">
+- <property name="text">
+- <string>Check for Upgrade</string>
+- </property>
+- </action>
+ <action name="actionVisit_Website">
+ <property name="text">
+ <string>Visit Website...</string>
+diff --git a/gui/preferences.cc b/gui/preferences.cc
+index f648324b..ea398f7c 100644
+--- a/gui/preferences.cc
++++ b/gui/preferences.cc
+@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
+ {
+ ui_.setupUi(this);
+
+- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
+ ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
+ ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
+ // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
+@@ -85,7 +84,6 @@ void Preferences::acceptClicked()
+ formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
+ }
+
+- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
+ babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
+ babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
+ accept();
+diff --git a/gui/preferences.ui b/gui/preferences.ui
+index 3bea6c2c..48f5deb3 100644
+--- a/gui/preferences.ui
++++ b/gui/preferences.ui
+@@ -39,13 +39,6 @@
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+- <item>
+- <widget class="QCheckBox" name="startupCheck">
+- <property name="text">
+- <string>Check for newer version on start.</string>
+- </property>
+- </widget>
+- </item>
+ <item>
+ <widget class="QCheckBox" name="reportStatisticsCheck">
+ <property name="text">
+--
+2.24.1
+
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch
new file mode 100644
index 000000000000..8df45d839cdc
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch
@@ -0,0 +1,133 @@
+From b69718b85b4ea9025f0f91d1e5de8b051a3c102d Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <dilfridge@gentoo.org>
+Date: Thu, 12 Mar 2020 20:10:59 +0100
+Subject: [PATCH] Gentoo: Use system shapelib
+
+---
+ Makefile.in | 23 ++++++++++-------------
+ shape.cc | 2 +-
+ shape.h | 3 +--
+ 3 files changed, 12 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f04c6408..5365cf56 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -105,7 +105,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
+ # Extra modules in Jeeps that we don't use
+ # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
+
+-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
++SHAPE=-lshp
+
+ ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
+ zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
+@@ -121,7 +121,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
+ src/core/textstream.o \
+ src/core/usasciicodec.o \
+ src/core/xmlstreamwriter.o \
+- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
++ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
+ OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
+
+ DEPFILES = $(OBJS:.o=.d)
+@@ -154,10 +154,10 @@ toolinfo
+ all: gpsbabel$(EXEEXT)
+
+ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @USB_DEPS@ @GPSBABEL_DEBUG@
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ gpsbabel-debug: $(OBJS) @USB_DEPS@
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
+ gbversion.h.in gui/setup.iss.in
+@@ -511,7 +511,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+ position.h radius.h reverse_route.h smplrout.h sort.h stackfilter.h \
+ swapdata.h trackfilter.h transform.h validate.h gbversion.h vecs.h \
+ format.h ggv_bin.h gpx.h src/core/file.h src/core/xmlstreamwriter.h \
+- src/core/xmltag.h shape.h shapelib/shapefil.h yahoo.h xmlgeneric.h \
++ src/core/xmltag.h shape.h yahoo.h xmlgeneric.h \
+ legacyformat.h mynav.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
+ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
+ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
+@@ -535,7 +535,7 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+ jeeps/gpsrqst.h garmin_tables.h grtcirc.h jeeps/gpsserial.h vecs.h \
+ ggv_bin.h gpx.h src/core/file.h src/core/xmlstreamwriter.h \
+- src/core/xmltag.h shape.h shapelib/shapefil.h yahoo.h xmlgeneric.h \
++ src/core/xmltag.h shape.h yahoo.h xmlgeneric.h \
+ legacyformat.h mynav.h xcsv.h src/core/textstream.h
+ garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \
+ zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
+@@ -817,7 +817,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+ formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
+ src/core/optional.h explorist_ini.h format.h gbser.h magellan.h vecs.h \
+ ggv_bin.h gpx.h src/core/file.h src/core/xmlstreamwriter.h \
+- src/core/xmltag.h shape.h shapelib/shapefil.h yahoo.h xmlgeneric.h \
++ src/core/xmltag.h shape.h yahoo.h xmlgeneric.h \
+ legacyformat.h mynav.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
+ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
+ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
+@@ -831,7 +831,7 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ stackfilter.h swapdata.h trackfilter.h transform.h validate.h format.h \
+ src/core/file.h src/core/usasciicodec.h vecs.h ggv_bin.h gpx.h \
+ src/core/xmlstreamwriter.h src/core/xmltag.h shape.h \
+- shapelib/shapefil.h yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
++ yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
+ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
+ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+@@ -954,10 +954,7 @@ session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+ shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
+- shape.h format.h shapelib/shapefil.h
+-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
+-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
+-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
++ shape.h format.h
+ skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
+ formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
+ src/core/optional.h
+@@ -1048,7 +1045,7 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
+ vecs.h format.h ggv_bin.h gpx.h src/core/file.h \
+ src/core/xmlstreamwriter.h src/core/xmltag.h shape.h \
+- shapelib/shapefil.h yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
++ yahoo.h xmlgeneric.h legacyformat.h mynav.h xcsv.h \
+ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
+ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+diff --git a/shape.cc b/shape.cc
+index 933eb95a..f2ec5365 100644
+--- a/shape.cc
++++ b/shape.cc
+@@ -32,7 +32,7 @@
+
+ #include "defs.h"
+ #include "shape.h"
+-#include "shapelib/shapefil.h"
++#include <libshp/shapefil.h>
+
+
+ #if SHAPELIB_ENABLED
+diff --git a/shape.h b/shape.h
+index 75ec82c2..3bf1072f 100644
+--- a/shape.h
++++ b/shape.h
+@@ -27,8 +27,7 @@
+
+ #include "defs.h" // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file
+ #include "format.h" // for Format
+-#include "shapelib/shapefil.h" // for DBFHandle, SHPAPI_CALL, SHPHandle
+-
++#include <libshp/shapefil.h>
+
+ #if SHAPELIB_ENABLED
+ class ShapeFormat : public Format
+--
+2.24.1
+
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch
new file mode 100644
index 000000000000..32728e04df28
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch
@@ -0,0 +1,27 @@
+From 7930deeee0c6f00a092b73c9d098873c2344ffdf Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <dilfridge@gentoo.org>
+Date: Thu, 12 Mar 2020 21:25:04 +0100
+Subject: [PATCH] Gentoo: Use xml stylesheet from distdir instead of net access
+
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 091db602..0093e581 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -282,8 +282,8 @@ gpsbabel.html: FORCE # gpsbabel
+ --stringparam html.cleanup "1" \
+ --stringparam make.clean.html "1" \
+ --stringparam html.valid.html "1" \
+- --stringparam html.stylesheet \
+- "https://www.gpsbabel.org/style3.css" \
++ --nonet \
++ --stringparam html.stylesheet "gpsbabel.org-style3.css" \
+ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+ xmldoc/readme.xml
+
+--
+2.24.1
+
diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
new file mode 100644
index 000000000000..e7b3f8abc911
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils qmake-utils
+
+MY_PV=${PV//./_}
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+LICENSE="GPL-2"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
+ SRC_URI="doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+else
+ SRC_URI="
+ https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
+ doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
+ "
+ KEYWORDS="~amd64 ~ppc ~x86"
+ S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
+fi
+
+SLOT="0"
+IUSE="doc +gui"
+
+RDEPEND="
+ dev-libs/expat
+ dev-qt/qtcore:5
+ sci-libs/shapelib:=
+ sys-libs/zlib[minizip]
+ virtual/libusb:0
+ gui? (
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ dev-lang/perl
+ dev-libs/libxslt
+ )
+ gui? ( dev-qt/linguist-tools:5 )
+"
+
+DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.4-disable_statistic_uploading.patch
+ "${FILESDIR}"/${PN}-1.6.0-disable_update_check.patch
+ "${FILESDIR}"/${PN}-1.5.4-disable_version_check.patch
+ "${FILESDIR}"/${PN}-9999-use_system_shapelib.patch
+ "${FILESDIR}"/${PN}-9999-xmldoc.patch
+)
+
+RESTRICT="test" # bug 421699
+
+src_prepare() {
+ default
+
+ # remove bundled libs and cleanup
+ rm -r shapelib || die
+
+ use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with doc doc "${S}"/doc/manual) \
+ LRELEASE=$(qt5_get_bindir)/lrelease \
+ LUPDATE=$(qt5_get_bindir)/lupdate \
+ QMAKE=$(qt5_get_bindir)/qmake \
+ --with-zlib=system
+
+ if use gui; then
+ pushd "${S}/gui" > /dev/null || die
+ $(qt5_get_bindir)/lrelease *.ts || die
+ eqmake5
+ popd > /dev/null
+ fi
+}
+
+src_compile() {
+ default
+ if use gui; then
+ pushd "${S}/gui" > /dev/null || die
+ emake
+ popd > /dev/null
+ fi
+
+ if use doc; then
+ perl xmldoc/makedoc || die
+ emake gpsbabel.html
+ fi
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
+
+ default
+
+ if use gui; then
+ dobin gui/objects/gpsbabelfe
+ insinto /usr/share/${PN}/translations/
+ doins gui/gpsbabel*_*.qm
+ newicon gui/images/appicon.png ${PN}.png
+ make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
+ fi
+}
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 97509bb92fab..1d1cda52878b 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,7 +1,11 @@
DIST gpxsee-7.18.tar.gz 5006604 BLAKE2B b7568a677e3cff08903d862921ace01374a594e216b1bd9eda457a92f700ef232b5804dff24696ee0574bcbe1d4e8a103dac6b5db33482cb0139f73b21852883 SHA512 562944a14ac2af4ec6837e77a6610b8ad7d254ffada4202e589c05a4306c0410e815212d7a7847708c50de72fa21a02d41bf5152f5d5f313c96da5b2516138fd
DIST gpxsee-7.20.tar.gz 5348758 BLAKE2B d7e8f0f29dfe666572a58a1a5072545cda345f51d305d6c0351ee5639ba09c185b9b3e7e883d2d02198e70a58ef69508cfd5ab561183c68a625fa4101dc17285 SHA512 37c975d9e64cf6fe5455a0e6cfb896275db6a0469ba772c97615c8b2f79af591bf4eb7f6dd414c6a3f0344fe1b9f443f402e0b8c173beee0a301ede783fa26db
DIST gpxsee-7.23.tar.gz 5358562 BLAKE2B aaa1fd5815ba1f0e3592d034033f0335cf257f408a1344eb6adc1cba1b8f0bfb7e61374b83721efb75b99b9fed06fce8f1921b0af31b7375623c8dec1fd383ca SHA512 a6ffbb6d15efbf2491b447cfabbc3a50f6ef97e438fa788c98230f76d3c3acabc96f713839fe13b238d39ecac84554e80f1d3f8c282122dff92eb987ca3d3dba
+DIST gpxsee-7.25.tar.gz 5359026 BLAKE2B 9ff5d48883c065cb1f93fcf853d1e6772538ef2d6ee2ce0aaadacfbbe84347dc62d8eed81f9c115b58054a1348f8624518c4c16552245ce5bf168450e60b366c SHA512 f31d7a8b174670b2458abbca6082cf3adbf7cc45f0bd7e73537bf2210ec89eb5ab23518b8b15f2a16d2ddba8c75f82ff903c0bb356de42b90f6f187efb73c065
+DIST gpxsee-7.26.tar.gz 5362613 BLAKE2B 935508f33060dda9c259d9172daf7c611895500584f4cf687edd32a98e4aed4f950c3ef309808db816ebc52b92c4f06bf8dc2ac6e015c034749d883f3dbac1c8 SHA512 97d15b644a0a9656e849caeb0f171b42213a0ae3e090c3a2b70e43614d2b50446757483704814af5b678aba5e129ca748cdacb6f97f38189c2af7f7d7bcc26a9
EBUILD gpxsee-7.18.ebuild 1330 BLAKE2B 55fbeb2d5ec0f423be33378c5a30b1aad457f8a39cc70d1466db18f8bdc0a9b530ecb54273721dabbe9423198dbcba67c5b6bebdd86e51ab36d8fec516398a28 SHA512 fedc7457011576ce608610be5f97507ddb7465508f001151ca30f8aef469b06832ccb62d687b7521f7dd88e5e82d0e830cf6e1d6bece6b887a47a1dadd902313
EBUILD gpxsee-7.20.ebuild 1329 BLAKE2B 0519cac214de89aaf141f90bc9a47432e11c764462ecf42bb4728e335bac20eb5256d05622fc0f62e46b0a6dbe779491d7cf19874e0d05119c4671aa0286b4f6 SHA512 597e0ea32097a2908a8e1ae4ce822873c8e4511dc26deb5a6fdf0b723dc20c2cf53a3295a30a35b77c903d40b858c7ab28a646546dc33d7ae7335d5396423350
EBUILD gpxsee-7.23.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb
+EBUILD gpxsee-7.25.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb
+EBUILD gpxsee-7.26.ebuild 1332 BLAKE2B 42ad66c628a19675ebe8e7f730cc683166cac2f6f8101b093bfdf5f7e9feca2d0815dec5c4884cc98a0cf98555d0ce8330c654b77549720043cfec2f0a786e2f SHA512 5ba50c60ab60d45c871dffccc971b32d8ea32192ddc91ddb5c1201db24ba26a6db4c97c6f9b4923ad43fe32a07d0ff4a7e2439637fd26354899ca7f70b603eeb
MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.25.ebuild b/sci-geosciences/gpxsee/gpxsee-7.25.ebuild
new file mode 100644
index 000000000000..c5b1bd5f1e11
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.25.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en es fi fr hu nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+ rm_ts() {
+ sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+ }
+
+ l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+ lrelease gpxsee.pro
+ eqmake5 gpxsee.pro
+ emake
+}
+
+src_install() {
+ local lang
+ dobin ${PN}
+ dodoc README.md
+ insinto /usr/share/${PN}
+ doins -r pkg/maps pkg/csv
+
+ insinto /usr/share/${PN}/translations
+ for lang in lang/*.qm; do
+ [ -f "${lang}" ] && doins "${lang}"
+ done
+
+ domenu pkg/${PN}.desktop
+ insinto /usr/share/mime/packages
+ doins pkg/${PN}.xml
+ doicon icons/${PN}.png
+}
diff --git a/sci-geosciences/gpxsee/gpxsee-7.26.ebuild b/sci-geosciences/gpxsee/gpxsee-7.26.ebuild
new file mode 100644
index 000000000000..c5b1bd5f1e11
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.26.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en es fi fr hu nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+ rm_ts() {
+ sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+ }
+
+ l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+ lrelease gpxsee.pro
+ eqmake5 gpxsee.pro
+ emake
+}
+
+src_install() {
+ local lang
+ dobin ${PN}
+ dodoc README.md
+ insinto /usr/share/${PN}
+ doins -r pkg/maps pkg/csv
+
+ insinto /usr/share/${PN}/translations
+ for lang in lang/*.qm; do
+ [ -f "${lang}" ] && doins "${lang}"
+ done
+
+ domenu pkg/${PN}.desktop
+ insinto /usr/share/mime/packages
+ doins pkg/${PN}.xml
+ doicon icons/${PN}.png
+}
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index c7b6ffc11618..6298318e9004 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -5,6 +5,5 @@ AUX liblas-1.8.1-fix-debug.patch 600 BLAKE2B 6e8f94881f49058bb835e9978640721db4e
AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
AUX liblas-1.8.1-gdal-2.5.0.patch 1052 BLAKE2B 8686e4c02fccd1d638f7fc006a42ff7a84964bc236d8283bba24355352e2ef62a43eb8f3a44105cce516886c81cff43fb5be1162d3009b6d00a5f47425f01099 SHA512 3c784cedd45bf7fcd96438e22c5b8d672f91bcf08ce891d14aa2d6f9324f6106f8948b3002e8ceddbe03a949569b7e0a97087883eef4e79724fd33fd33d2558f
DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
-EBUILD liblas-1.8.1-r2.ebuild 1105 BLAKE2B aff71a1dd3b4775796cce7ab64422313b2c98e78077c8c69ce3eb0dfe1d49fe4f7ecaed3af5972d285c40f05b8957b996295dcaa34e0dc2ac26270666e4246de SHA512 c0c539ca00cebe2aaa63ac2711d876479738de072b407d3bf749fb31e86480106bcaba1e39903fd4783bd5e14ed3acb20306624a5dcd876c16a1813189bbfbe6
-EBUILD liblas-1.8.1-r3.ebuild 1333 BLAKE2B 3923e2d4636137859678df1098150925311ed192a6ec32c7ddd79ef8b44cbd6513f46929d8a33a3961977f18f809628b5b0d1ca755aa45c75da485a64828c683 SHA512 4bcf473335cae6fde45c2733a5014400983213a25dd3063cb39aba3d2590b2ae5f23f7e63ab3e4299701b28270943ee9ee3ee0da3ee18b82d2c48f6b7a52dfe9
+EBUILD liblas-1.8.1-r3.ebuild 1331 BLAKE2B 195719248c3083ebbf3b4bcc054afbf904216b4980ab7db205739fc737032ac5bc86cb31eec11a43f52abd5392be4f640c4ea2246f3104fd56408567e9833d7f SHA512 6af1d59520f69d8d4c4649617bb00bd05cbb409b9d0b4e8b8af1b89fd9460038ca1838e4f545c130cde69b01899bf073f7621d260ce3f4190383ec822f020f80
MISC metadata.xml 497 BLAKE2B cdae8ef4bfaffefd73a5751950379c704581e09a9f435fc52bac7520f3632fc37007d21750616a05060e2f9213a8ee05278c565be9b80ee8529ff9e5a6c07b6c SHA512 21d5b18461e131a543ba5a5ac1b2f06652d5d49ebd0e590f0bd0971deb337efeb813698613e4bbf200a934a3afa9b20dbb80d6659778c22c8a97d9471007d3d7
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
deleted file mode 100644
index 949af96ab07b..000000000000
--- a/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
-HOMEPAGE="https://github.com/libLAS/libLAS/"
-SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE="gdal"
-
-DEPEND="
- dev-libs/boost:=
- sci-geosciences/laszip
- sci-libs/libgeotiff:=
- gdal? ( sci-libs/gdal:= )
-"
-RDEPEND="${DEPEND}"
-
-# tests known to fail due to LD_LIBRARY_PATH issue
-RESTRICT="test"
-
-S="${WORKDIR}/libLAS-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
- "${FILESDIR}"/${P}-fix-overload-call.patch # bug 661654
- "${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # add missing linkage
- sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \
- -i "${S}/apps/CMakeLists.txt" || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIBLAS_LIB_SUBDIR=$(get_libdir)
- -DWITH_GDAL=$(usex gdal)
- )
- cmake_src_configure
-}
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
index c8f1fb5c1aa8..46930174cabd 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
IUSE="gdal"
DEPEND="
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 4d3240c630db..b7072f92d314 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,10 +1,5 @@
-AUX merkaartor-0.18.3-desktopfile.patch 1256 BLAKE2B 56fb860fb21b4d2fea6c1eb1688680f214b084b6aa021beaaf77c7b3ea331c1c77836962cf354389fe5f41a70bef67cc267f86384e54eb622eaf0be25998d2aa SHA512 a720ace02cfbb6d51e844894ec319e9604c5e8ad92ee5db410bb9429c60157798c1ebf065dec7e7dfe32cc20fa33897ffc5541f988f0ba662896025d5e6c678b
-AUX merkaartor-0.18.3-exiv2-0.27.1.patch 341 BLAKE2B b0b3fd74f4db5b0580fef7903c5d42489d7a4e296a87cd3c2df8c5be50816f00d5d5c484fb0887af1b15701840c14c3b430b44eb1b6f7bb3cc35ecda26f352ed SHA512 8276f04c5345a49c8758d1835887ae85a014e49ca60d915f98e65ea7d9f361c2d0934301aa01bcb4967321fbf24fa54cc79d91f673240d552d62159c0673a900
AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
-AUX merkaartor-0.18.3-webengine1.patch 6601 BLAKE2B efcb88f07abc23ff5221f42beb433a39f566f8f0433a1ecb7526700df787b17e2367b45b550b4672b4003f6342602dd60299c833b38cead09b3cf774f9b76eca SHA512 aa22c90c418eb175ba74f3d029b92640113a799005ca34fa6e08b4c3a68431d442589d8e80ec7aa721c1ef279bdfa78e67f9dd982e586fd7887122c54ed27794
-AUX merkaartor-0.18.3-webengine2.patch 1647 BLAKE2B eb11ac314da643a6db425b8c0f520e315218420be2a438995a9f9deaaebf48c9f5e1bb65fa59bb20aab0c269f8730e299aedbaa40152eba44ae2b7a8c0139885 SHA512 faf8a4b22da050a88278672a77029c87a2b30658efc424a4c046a8fcecd491f763278076aad32cb88d8bd254d3f5837e272f178ca97c88a55831199aff0a138a
-AUX merkaartor-0.18.3-webengine3.patch 4895 BLAKE2B 38a9a6a87774094a8a6b1104dc2f5a4156bb908799ae6388b6d90ad41d9ef1a288368e7854dcdeddcd1db6a316c3488c90d7760c8757787be605a5e3de0c9afc SHA512 8b7478f5d3342f288f368b22ccfae113c0358d81ddce31eb211671202ac97ac314d73e0762ab66f0f708edfbeef3dfd5a4a6a2da7a37bf8f93b2151cfa56def2
-DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
-EBUILD merkaartor-0.18.3-r4.ebuild 2492 BLAKE2B daa195096aad14b7ba302586ebcc553f5117848936ec21fd74e9abed96847582cb77b7fa04f8cdfd4178e340534227db81e05956f87690acfc36546751112ec1 SHA512 4933c88b159818cfccad244e6323f36a72260447586eb6c399288f12987da4df96a508306d2a499adee7bde7b668ae831e7d3803f4ed607fc2cd896741aae051
-EBUILD merkaartor-9999.ebuild 2268 BLAKE2B 2431fed8777bd74e71105237819bf59e0e1ca208514221b391fc7ffacd1ccd101df7d59a13c667a92b9686af89a3a3fcb2ba9d22b60334e0683a714aea90a6aa SHA512 4ba01bcfc9e0ac5a5deeabb265a695e35e7a7991d98479d0e802f786e2103bbbe3d21d5b7f3366f61d2870f6a45607cd004490d8d53f362d7ccf9004ac9d60fa
+DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
+EBUILD merkaartor-0.18.4.ebuild 2382 BLAKE2B d925b465b72cfbf34cfb589480d58da47f78403d37b13036014d1b9d736ab1f35aaf85609c2d5a3b721a9ce72666253417cdfbbab683967aa8233fde10860511 SHA512 77ee2d718b52c1f4c87a1063827482019911c1ab04468fd3e6849fe225b2dddfa69ced7594a3df2b9ed6f722f7422aee300775650bc8da79597cfdcd54a2daeb
+EBUILD merkaartor-9999.ebuild 2533 BLAKE2B 8962729b3afc4066cfcab4fe076845b919cc17ac725d7c24af1a9b0da7fa5dd23784e27d34fa4c6579a098ef60346e62b4042764a74cf51dd8d5746be5a7a1e1 SHA512 cf5fa7525b1de10b457c1ea28b8f21d3596773302308b2194674242eeabc50190c38111edf3acd54ab9852f4998b8c4c46e979f7ce7a2392fa2c3f8dd0826766
MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
deleted file mode 100644
index 6c844ea3cf7a..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 85ee9b1855bf3256daf4decd1f25021c1a28abdc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
-Date: Sat, 19 May 2018 13:43:24 +0200
-Subject: [PATCH] Renamed merkaartor.desktop to
- org.merkaartor.merkaartor.desktop
-
-A possible solution for issue #150.
----
- src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} | 0
- src/src.pro | 2 +-
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} (100%)
-
-diff --git a/src/merkaartor.desktop b/src/org.merkaartor.merkaartor.desktop
-similarity index 100%
-rename from src/merkaartor.desktop
-rename to src/org.merkaartor.merkaartor.desktop
-diff --git a/src/src.pro b/src/src.pro
-index 81a65f34..477c459e 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -289,7 +289,7 @@ contains(SANITIZE, 2) {
-
- unix:!macx {
- desktop.path = $${PREFIX}/share/applications
-- desktop.files = merkaartor.desktop
-+ desktop.files = org.merkaartor.merkaartor.desktop
- desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/
- desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png
- desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch
deleted file mode 100644
index d54422be14e9..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/Docks/GeoImageDock.h 2016-09-06 00:29:45.000000000 +0200
-+++ b/src/Docks/GeoImageDock.h 2019-07-01 19:20:43.450789475 +0200
-@@ -7,8 +7,7 @@
- #include <QDockWidget>
- #include <QMouseEvent>
- #include <QShortcut>
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <QDrag>
-
- class ImageView;
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch
deleted file mode 100644
index 5f4f605ce5bb..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From df515ecf4e6ce1a249af299840e82126c68fcf91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
-Date: Mon, 26 Sep 2016 13:02:57 +0200
-Subject: [PATCH] Updated QWeb to QWebView.
-
----
- src/Layers/LicenseDisplayDialog.ui | 6 +++---
- src/QMapControl/browserimagemanager.cpp | 20 +++++++++-----------
- src/QMapControl/browserimagemanager.h | 17 ++++++-----------
- src/src.pro | 2 +-
- 4 files changed, 19 insertions(+), 26 deletions(-)
-
-diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
-index 103816c6..3dabd130 100755
---- a/src/Layers/LicenseDisplayDialog.ui
-+++ b/src/Layers/LicenseDisplayDialog.ui
-@@ -15,7 +15,7 @@
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
-- <widget class="QWebView" name="webView">
-+ <widget class="QWebEngineView" name="webView">
- <property name="url">
- <url>
- <string>about:blank</string>
-@@ -41,9 +41,9 @@
- </widget>
- <customwidgets>
- <customwidget>
-- <class>QWebView</class>
-+ <class>QWebEngineView</class>
- <extends>QWidget</extends>
-- <header>QtWebKit/QWebView</header>
-+ <header>QWebEngineView</header>
- </customwidget>
- </customwidgets>
- <resources/>
-diff --git a/src/QMapControl/browserimagemanager.cpp b/src/QMapControl/browserimagemanager.cpp
-index 468cf2b6..4021d40f 100644
---- a/src/QMapControl/browserimagemanager.cpp
-+++ b/src/QMapControl/browserimagemanager.cpp
-@@ -47,9 +47,8 @@ void BrowserWebPage::javaScriptConsoleMessage ( const QString & message, int lin
- //printf("%s\n", s);
- }
-
--void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
-+void BrowserWebPage::javaScriptAlert ( const QString & msg )
- {
-- Q_UNUSED(frame)
- //QMessageBox::information(NULL, tr("Javascript alert"), msg);
-
- if (msg.startsWith("Coord")) {
-@@ -105,8 +104,10 @@ void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
-
- void BrowserWebPage::launchRequest ( const QUrl & url )
- {
-+ qDebug() << "Warning: you are using BrowserWebPage to render background imagery. "<<
-+ "This code is not tested and may not work as expected. If you experience issues, please let us know.";
- sw = sh = 0;
-- mainFrame()->load(url);
-+ load(url);
- }
-
- BrowserImageManager* BrowserImageManager::m_BrowserImageManagerInstance = 0;
-@@ -138,8 +139,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
- }
-
- page = new BrowserWebPage();
-- page->setNetworkAccessManager(m_networkManager);
-- page->setViewportSize(QSize(1024, 1024));
-
- connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool)));
-
-@@ -220,7 +219,6 @@ void BrowserImageManager::launchRequest()
-
- QUrl u = QUrl( R.url);
-
-- page->networkAccessManager()->setProxy(M_PREFS->getProxy(u));
- page->launchRequest(u);
- requestActive = true;
- #ifndef BROWSERIMAGEMANAGER_IS_THREADED
-@@ -246,7 +244,7 @@ void BrowserImageManager::pageLoadFinished(bool ok)
- qDebug() << "BrowserImageManager::pageLoadFinished: " << " Hash: " << R.hash;
- QPixmap pt(page->sw, page->sh);
- QPainter P(&pt);
-- page->mainFrame()->render(&P, QRegion(0,0,page->sw,page->sh));
-+ page->view()->render(&P, QPoint(), QRegion(0,0,page->sw,page->sh));
- P.end();
-
- // if (page->sw != BROWSER_TILE_SIZE || page->sh != BROWSER_TILE_SIZE) {
-@@ -319,7 +317,7 @@ void BrowserImageManager::loadingQueueEmpty()
- void BrowserImageManager::abortLoading()
- {
- //qDebug() << "BrowserImageManager::abortLoading";
-- page->triggerAction(QWebPage::Stop);
-+ page->triggerAction(QWebEnginePage::Stop);
- if (!loadingRequests.isEmpty()) {
- LoadingRequest R = loadingRequests.dequeue();
- loadingRequests.clear();
-@@ -331,7 +329,7 @@ void BrowserImageManager::abortLoading()
- #ifdef BROWSERIMAGEMANAGER_IS_THREADED
- void BrowserImageManager::run()
- {
-- page = new BrowserWebPage();
-+ page = new BrowserWebEnginePage();
- page->setViewportSize(QSize(1024, 1024));
-
- QTimer theTimer;
-@@ -354,7 +352,7 @@ void BrowserImageManager::checkRequests()
- } else {
- if ((requestDuration++) > 100) {
- requestDuration = 0;
-- page->triggerAction(QWebPage::Stop);
-+ page->triggerAction(QWebEnginePage::Stop);
- qDebug() << "BrowserImageManager Timeout";
- }
- }
-@@ -365,7 +363,7 @@ void BrowserImageManager::checkRequests()
- void BrowserImageManager::timeout()
- {
- qDebug() << "BrowserImageManager::timeout";
-- page->triggerAction(QWebPage::Stop);
-+ page->triggerAction(QWebEnginePage::Stop);
- pageLoadFinished(false);
- }
- #endif // BROWSERIMAGEMANAGER_IS_THREADED
-diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h
-index 10f8a477..ca846e31 100644
---- a/src/QMapControl/browserimagemanager.h
-+++ b/src/QMapControl/browserimagemanager.h
-@@ -24,14 +24,10 @@
- #include <QPixmap>
-
- #include <QtNetwork/QtNetwork>
--#include <QWebFrame>
--#include "qwebhistory.h"
--#include "qwebhistoryinterface.h"
--#include "qwebkitglobal.h"
--#include "qwebpage.h"
--#include "qwebpluginfactory.h"
--#include "qwebsettings.h"
--#include "qwebview.h"
-+#include <QWebEnginePage>
-+#include <QWebEngineHistory>
-+#include <QWebEngineSettings>
-+#include <QWebEngineView>
-
- #include <QThread>
-
-@@ -41,13 +37,13 @@
- @author Chris Browet <cbro@semperpax.com>
- */
-
--class BrowserWebPage : public QWebPage
-+class BrowserWebPage : public QWebEnginePage
- {
- friend class BrowserImageManager;
-
- protected:
- virtual void javaScriptConsoleMessage ( const QString & message, int lineNumber, const QString & sourceID );
-- virtual void javaScriptAlert ( QWebFrame * frame, const QString & msg ) ;
-+ virtual void javaScriptAlert ( const QString & msg ) ;
- void launchRequest ( const QUrl & url );
-
- private:
-@@ -116,7 +112,6 @@ class BrowserImageManager : public QObject, public IImageManager
- static BrowserImageManager* m_BrowserImageManagerInstance;
-
- BrowserWebPage* page;
-- QWebFrame *frame;
- QNetworkAccessManager* qnam;
-
- signals:
-diff --git a/src/src.pro b/src/src.pro
-index eb93b263..137d7e14 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -34,7 +34,7 @@ TEMPLATE = app
-
- CONFIG += rtti stl exceptions
- #CONFIG -= exceptions
--QT += svg network xml core gui webkitwidgets concurrent printsupport
-+QT += svg network xml core gui webenginewidgets concurrent printsupport
- win32-msvc* {
- LIBS += -lzlib
- } else {
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch
deleted file mode 100644
index 48c4af7b9c50..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 20edcc7e85413e60ff180bd9f20e5428e5729222 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
-Date: Mon, 26 Sep 2016 13:11:33 +0200
-Subject: [PATCH] Replaced missing QT += webkit, updated linux package list.
-
----
- ci/travis-linux-install.sh | 3 +--
- src/QMapControl.pri | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/ci/travis-linux-install.sh b/ci/travis-linux-install.sh
-index 79975d27..4e83c9bb 100755
---- a/ci/travis-linux-install.sh
-+++ b/ci/travis-linux-install.sh
-@@ -8,6 +8,5 @@ sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
- sudo apt-get update -qq
- sudo apt-cache search qt
- sudo apt-get -qq install gdb libgdal-dev libproj-dev
--sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake
--sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
-+sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webengine5{,-dev} libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
- qtchooser -list-versions
-diff --git a/src/QMapControl.pri b/src/QMapControl.pri
-index bbfc09b5..92769565 100644
---- a/src/QMapControl.pri
-+++ b/src/QMapControl.pri
-@@ -26,7 +26,7 @@ QT += network
- DEFINES += USE_WEBKIT
- SOURCES += browserimagemanager.cpp
- HEADERS += browserimagemanager.h
-- QT += webkit
-+ QT += webenginewidgets
- contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
- }
- }
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch
deleted file mode 100644
index 97d76a187641..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 3019f1d2c76a0ae0c51e70d34bc25a49cb030845 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
-Date: Wed, 28 Sep 2016 21:41:02 +0200
-Subject: [PATCH] Removed webengine from LicenseDisplayDialog and renamed
- conditional.
-
-This removes the QWebEngine dependency for most build configurations.
-None of the code actually uses it, but there are some plugins that do.
-I expect they are all obsolete, but will keep it in until they are
-replaced/deemed not working.
----
- COMPILE.md | 2 +-
- src/Layers/ImageMapLayer.cpp | 2 +-
- src/Layers/LicenseDisplayDialog.ui | 29 +++++++++++++++--------------
- src/QMapControl.pri | 14 ++++++--------
- src/src.pro | 2 +-
- 5 files changed, 24 insertions(+), 25 deletions(-)
-
-diff --git a/COMPILE.md b/COMPILE.md
-index 9324019d..108a2eee 100644
---- a/COMPILE.md
-+++ b/COMPILE.md
-@@ -151,7 +151,7 @@ There are some parameters you can pass to qmake to customize build:
- | TRANSDIR_MERKAARTOR=<path> | where will the Merkaartor translations be installed |
- | TRANSDIR_SYSTEM=<path> | where your global Qt translation directory is |
- | NODEBUG=1 | release target |
--| NOUSEWEBKIT | disable use of WebKit (Yahoo adapter) |
-+| USEWEBENGINE=1 | enable use of WebEngine (required for some external plugins) |
- | SYSTEM_QTSA | use system copy of qtsingleapplication instead of internal |
-
-
-diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp
-index 31966b09..b46199b9 100644
---- a/src/Layers/ImageMapLayer.cpp
-+++ b/src/Layers/ImageMapLayer.cpp
-@@ -263,7 +263,7 @@ void ImageMapLayer::setMapAdapter(const QUuid& theAdapterUid, const QString& ser
- QDialog dlg;
- ui.setupUi(&dlg);
- dlg.setWindowTitle(tr("Licensing Terms: %1").arg(name()));
-- ui.webView->load(u);
-+ ui.urlLabel->setText(QString("<a href='%1'>%2</a>").arg(u.toString()).arg(u.toString()));
-
- bool OK = false;
- while (!OK) {
-diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
-index 3dabd130..dd748e41 100755
---- a/src/Layers/LicenseDisplayDialog.ui
-+++ b/src/Layers/LicenseDisplayDialog.ui
-@@ -6,8 +6,8 @@
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>650</width>
-- <height>400</height>
-+ <width>786</width>
-+ <height>171</height>
- </rect>
- </property>
- <property name="windowTitle">
-@@ -15,11 +15,19 @@
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
-- <widget class="QWebEngineView" name="webView">
-- <property name="url">
-- <url>
-- <string>about:blank</string>
-- </url>
-+ <widget class="QLabel" name="label">
-+ <property name="text">
-+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The content selected is shared under a non-standard license agreement. The full text is available on the following URL. It is your reponsibility to read, understand and agree to the license.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-+ </property>
-+ <property name="wordWrap">
-+ <bool>true</bool>
-+ </property>
-+ </widget>
-+ </item>
-+ <item>
-+ <widget class="QLabel" name="urlLabel">
-+ <property name="text">
-+ <string>TextLabel</string>
- </property>
- </widget>
- </item>
-@@ -39,13 +47,6 @@
- </item>
- </layout>
- </widget>
-- <customwidgets>
-- <customwidget>
-- <class>QWebEngineView</class>
-- <extends>QWidget</extends>
-- <header>QWebEngineView</header>
-- </customwidget>
-- </customwidgets>
- <resources/>
- <connections>
- <connection>
-diff --git a/src/QMapControl.pri b/src/QMapControl.pri
-index 92769565..3491c8b1 100644
---- a/src/QMapControl.pri
-+++ b/src/QMapControl.pri
-@@ -21,13 +21,11 @@ SOURCES += \
-
- QT += network
-
--!contains(NOUSEWEBKIT,1) {
-- greaterThan(QT_VER_MAJ, 3) : greaterThan(QT_VER_MIN, 3) {
-- DEFINES += USE_WEBKIT
-- SOURCES += browserimagemanager.cpp
-- HEADERS += browserimagemanager.h
-- QT += webenginewidgets
-- contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
-- }
-+contains(USEWEBENGINE,1) {
-+ DEFINES += USE_WEBKIT
-+ SOURCES += browserimagemanager.cpp
-+ HEADERS += browserimagemanager.h
-+ QT += webenginewidgets
-+ contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
- }
-
-diff --git a/src/src.pro b/src/src.pro
-index 137d7e14..81a65f34 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -34,7 +34,7 @@ TEMPLATE = app
-
- CONFIG += rtti stl exceptions
- #CONFIG -= exceptions
--QT += svg network xml core gui webenginewidgets concurrent printsupport
-+QT += svg network xml core gui concurrent printsupport
- win32-msvc* {
- LIBS += -lzlib
- } else {
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
index 6eed24c61504..e5d0a17a1269 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,13 +23,14 @@ DEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtsingleapplication[X,qt5(+)]
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
- sci-libs/gdal
- sci-libs/proj
+ sci-libs/gdal:=
+ sci-libs/proj:=
sys-libs/zlib
exif? ( media-gfx/exiv2:= )
gps? ( >=sci-geosciences/gpsd-3.17-r2 )
@@ -38,12 +39,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
- "${FILESDIR}"/${P}-desktopfile.patch
- "${FILESDIR}"/${P}-webengine{1,2,3}.patch
- "${FILESDIR}"/${P}-exiv2-0.27.1.patch # bug 689098
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
DOCS=( AUTHORS CHANGELOG )
@@ -67,7 +63,7 @@ src_prepare() {
}
src_configure() {
- append-flags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+ append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
# TRANSDIR_SYSTEM is for bug #385671
eqmake5 \
@@ -84,7 +80,6 @@ src_configure() {
GPSDLIB=$(usex gps 1 0) \
LIBPROXY=$(usex libproxy 1 0) \
USEWEBENGINE=$(usex webengine 1 0) \
- ZBAR=0 \
Merkaartor.pro
}
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 7fb038016249..8ff9caf11e1f 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,18 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit git-r3 l10n qmake-utils xdg-utils
+inherit l10n qmake-utils xdg-utils
+
+if [[ ${PV} != *9999 ]] ; then
+ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
+ inherit git-r3
+fi
DESCRIPTION="Qt based map editor for the openstreetmap.org project"
HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
IUSE="debug exif gps libproxy webengine"
BDEPEND="
@@ -23,16 +29,17 @@ DEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtsingleapplication[X,qt5(+)]
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
- sci-libs/gdal
- sci-libs/proj
+ sci-libs/gdal:=
+ sci-libs/proj:=
sys-libs/zlib
exif? ( media-gfx/exiv2:= )
- gps? ( >=sci-geosciences/gpsd-3.17-r2 )
+ gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
libproxy? ( net-libs/libproxy )
webengine? ( dev-qt/qtwebengine:5[widgets] )
"
@@ -42,13 +49,11 @@ PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
DOCS=( AUTHORS CHANGELOG )
-src_unpack() {
- git-r3_src_unpack
-}
-
src_prepare() {
default
+ rm -r 3rdparty || die "Failed to remove bundled libs"
+
my_rm_loc() {
sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
rm "translations/${PN}_${1}.ts" || die
@@ -67,20 +72,23 @@ src_prepare() {
src_configure() {
# TRANSDIR_SYSTEM is for bug #385671
- eqmake5 \
- PREFIX="${ED}/usr" \
- LIBDIR="${ED}/usr/$(get_libdir)" \
- PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
- SHARE_DIR_PATH="/usr/share/${PN}" \
- TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
- TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
- SYSTEM_QTSA=1 \
- NODEBUG=$(usex debug 0 1) \
- GEOIMAGE=$(usex exif 1 0) \
- GPSDLIB=$(usex gps 1 0) \
- LIBPROXY=$(usex libproxy 1 0) \
- USEWEBENGINE=$(usex webengine 1 0) \
- Merkaartor.pro
+ local myeqmakeargs=(
+ PREFIX="${ED}/usr"
+ LIBDIR="${ED}/usr/$(get_libdir)"
+ PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins"
+ SHARE_DIR_PATH="/usr/share/${PN}"
+ TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations"
+ TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations"
+ SYSTEM_QTSA=1
+ NODEBUG=$(usex debug 0 1)
+ GEOIMAGE=$(usex exif 1 0)
+ GPSDLIB=$(usex gps 1 0)
+ LIBPROXY=$(usex libproxy 1 0)
+ USEWEBENGINE=$(usex webengine 1 0)
+ )
+ [[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 )
+
+ eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
}
pkg_postinst() {
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index 0688cf110d5a..bfb8f71ddfc9 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1,5 +1,5 @@
AUX osm-gps-map-1.1.0-gtk-doc-module.patch 392 BLAKE2B 73bdfd92240b7e96b05a3cf1c6b77075e1b2e45f47919b3123a036f71c43ef6530f939f40609531287594802f37d07d59cfc8de8fb558e99f33710954acd179c SHA512 e49ab51ed248a2e05130bb7c7774c486a71af46207e855ad95d6373d3a6859bd52d56cf7957a3b16f5d65114697f27aff1d3a18a398ea846b77d25c35752c404
AUX osm-gps-map-1.1.0-no-maintainer-mode.patch 1048 BLAKE2B bd95f60bf9ba525e7bb9ffbc46a4003a4f00a19e156ba2a288aa0aff0a72fc2d5363004ef3e91aeb6d3c2caea43f710cf77dc76d61b26834be359558baae7af6 SHA512 e6cd05ca74d77851b4b40ec167bad20f1b06840378ef93f4f961fcf795212d5f0f5ae4198bd345143e0eb0418c4bfd9e59d62b69936ae68cccb24fb84d9f87fa
DIST osm-gps-map-1.1.0.tar.gz 440480 BLAKE2B d1847937b4f9691c2ba14908f3cbca3c9911f76e05a6f8e96cd741ca291b74e238a06b6d01fbd8bac9c43bdd73788e8ef0c035d75290ffb631a15ee0b9f749e5 SHA512 74924e5caa0b2bac822f678236d94203b34d9af1dce24cfcd44e1fb9f7551558137dd02b35ca970e36472748acfd611c6251ff5c52d998bfaffccb9821cc0fe0
-EBUILD osm-gps-map-1.1.0.ebuild 891 BLAKE2B 45323abdfd84c2c55e532a8a6382b01d79e8f9008378460afb52f87434342e6b45b243b62d69081991025c5623d770c31f50af9f9a2c44cbed543cc3f91c0fc4 SHA512 0acf12599916c36f6a5a1f5dc4765140700776e00e8e925297c7904e7fd85d086ab959a10a29d8f1c4ccc2234394b231c276d535a5235d67c8d36905dd1e6230
+EBUILD osm-gps-map-1.1.0.ebuild 892 BLAKE2B 31040324b37c0e3df7e4338a83d6d476fd47b5f2ff53bd02e5ccff711cd45cdb5088616297f7aa14ba643782916b714029f138e641ffae6d79490e9d7d2bce0f SHA512 356bc4dd01e5feebc5ebc610aa6eef2461b7a1b55d47a895ff43b496d93ac99140fd3f0e86c016717c7891bef461487ee7b0ba771632861f0b4d33826704c6a3
MISC metadata.xml 327 BLAKE2B 33d0eccf4eaefa31ad6a2a5fa2aea8ac9a03e9c423c8c96400c4a6921429886bcba4c388f8ed739af67673bc00cc07a038b4664a23c6a808b1b9a699866860c1 SHA512 67dd8500028be31b9bbae47ea255981f82762bc6a1c2a98b1d76c04e09e3bd794bdcac589e09c9158425e9ed8500a2d8d02d5add82e5d269848ca19b4fd299ea
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
index 63f13d8b8643..2fcde8616055 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit autotools gnome2
DESCRIPTION="A GTK+ widget for displaying OpenStreetMap tiles"
-HOMEPAGE="http://nzjrs.github.io/osm-gps-map/"
+HOMEPAGE="https://nzjrs.github.io/osm-gps-map/"
SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index cecd0cc83476..7a7911854826 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,7 +2,9 @@ AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81b
AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133
AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f
DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
+DIST qgis-3.10.3.tar.bz2 102032791 BLAKE2B f64375438698f5477162644dc233e1014e6b541c5630398daa164582c3fb9130516144a9b0a5405948923416c1239cfa5260ee1e2f195b437044b0ae1bb29b9f SHA512 05501763e6ff38caa3b527e2f800da945bc08a9a194aae531c4466b76bc8bd18582e2ed5eceb82affaeec3db895ab9e36b3e09c9a4c7b3406bf98c88d54cc1a4
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
EBUILD qgis-3.10.2-r1.ebuild 5605 BLAKE2B 6a843e029a5428a3908d8029056b0dcf50b59417d3f0f3b0f0de269b049bae110d69d80c11d588c769b54539457bbdae425820d2c1438684db2a13e8875a2fd6 SHA512 a2ade40ebb1b8ed733af9b36c265cd9254a3b13d4f46a6ae0640f0786d760878d4bc6667c3c413f3f24b5880692c72b9254c564edbe01799a4864fa16bf757a8
+EBUILD qgis-3.10.3.ebuild 5607 BLAKE2B 3acd63ef9604d2860ff2a8d6a2291d35f8d39ba277ecbedf81336b6d7142ec6ae9509c1325cfc5d1595aa4b669d5e69b9740020b251c59b9e009a28f17607037 SHA512 f86052c3b6d11030293712bddf071a969fb7cbff86ecca27d920019bb735fd8be0485ba1066b069d57067533071302af780d19d5c2034325e861c7a9c12e7706
EBUILD qgis-9999.ebuild 5607 BLAKE2B 3acd63ef9604d2860ff2a8d6a2291d35f8d39ba277ecbedf81336b6d7142ec6ae9509c1325cfc5d1595aa4b669d5e69b9740020b251c59b9e009a28f17607037 SHA512 f86052c3b6d11030293712bddf071a969fb7cbff86ecca27d920019bb735fd8be0485ba1066b069d57067533071302af780d19d5c2034325e861c7a9c12e7706
MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
diff --git a/sci-geosciences/qgis/qgis-3.10.3.ebuild b/sci-geosciences/qgis/qgis-3.10.3.ebuild
new file mode 100644
index 000000000000..74129055f6bb
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.10.3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+if [[ ${PV} = *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+ inherit git-r3
+else
+ SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+ examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+ KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-qt/linguist-tools-${QT_MIN_VER}:5
+ sys-devel/bison
+ sys-devel/flex
+"
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+),ssl]
+ >=dev-db/spatialite-4.2.0
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/libzip:=
+ dev-libs/qtkeychain[qt5(+)]
+ >=dev-qt/designer-${QT_MIN_VER}:5
+ >=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+ >=dev-qt/qtcore-${QT_MIN_VER}:5
+ >=dev-qt/qtgui-${QT_MIN_VER}:5
+ >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+ >=dev-qt/qtpositioning-${QT_MIN_VER}:5
+ >=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+ >=dev-qt/qtserialport-${QT_MIN_VER}:5
+ >=dev-qt/qtsvg-${QT_MIN_VER}:5
+ >=dev-qt/qtsql-${QT_MIN_VER}:5
+ >=dev-qt/qtwidgets-${QT_MIN_VER}:5
+ >=dev-qt/qtxml-${QT_MIN_VER}:5
+ media-gfx/exiv2:=
+ >=sci-libs/gdal-3.0.4:=[geos]
+ sci-libs/geos
+ sci-libs/libspatialindex:=
+ >=sci-libs/proj-4.9.3:=
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+ >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+ 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+ georeferencer? ( sci-libs/gsl:= )
+ grass? ( =sci-geosciences/grass-7*:= )
+ hdf5? ( sci-libs/hdf5:= )
+ mapserver? ( dev-libs/fcgi )
+ netcdf? ( sci-libs/netcdf:= )
+ opencl? ( virtual/opencl )
+ oracle? (
+ dev-db/oracle-instantclient:=
+ sci-libs/gdal:=[oracle]
+ )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ postgres? ( dev-db/postgresql:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/future[${PYTHON_MULTI_USEDEP}]
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+ dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+ dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+ dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+ dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+ dev-python/six[${PYTHON_MULTI_USEDEP}]
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
+ qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+ webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qttest-${QT_MIN_VER}:5
+ python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+ sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+ # git master
+ "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+ # TODO upstream
+ "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+ "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQGIS_MANUAL_SUBDIR=share/man/
+ -DQGIS_LIB_SUBDIR=$(get_libdir)
+ -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+ -DQWT_INCLUDE_DIR=/usr/include/qwt6
+ -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+ -DPEDANTIC=OFF
+ -DUSE_CCACHE=OFF
+ -DWITH_ANALYSIS=ON
+ -DWITH_APIDOC=OFF
+ -DWITH_GUI=ON
+ -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=OFF
+ -DWITH_3D=$(usex 3d)
+ -DWITH_GEOREFERENCER=$(usex georeferencer)
+ -DWITH_GRASS7=$(usex grass)
+ $(cmake_use_find_package hdf5 HDF5)
+ -DWITH_SERVER=$(usex mapserver)
+ $(cmake_use_find_package netcdf NetCDF)
+ -DUSE_OPENCL=$(usex opencl)
+ -DWITH_ORACLE=$(usex oracle)
+ -DWITH_QWTPOLAR=$(usex polar)
+ -DWITH_POSTGRESQL=$(usex postgres)
+ -DWITH_BINDINGS=$(usex python)
+ -DWITH_CUSTOM_WIDGETS=$(usex python)
+ -DWITH_QUICK=$(usex qml)
+ -DWITH_QTWEBKIT=$(usex webkit)
+ )
+
+ if use grass; then
+ mycmakeargs+=(
+ -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+ )
+ fi
+
+ use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+ # bugs 612956, 648726
+ addpredict /dev/dri/renderD128
+ addpredict /dev/dri/renderD129
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ if use python; then
+ python_optimize
+ python_optimize "${ED}"/usr/share/qgis/python
+ fi
+
+ if use grass; then
+ python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ xdg_pkg_postinst
+}
diff --git a/sci-geosciences/tappy/Manifest b/sci-geosciences/tappy/Manifest
deleted file mode 100644
index 1dd5cac5a19d..000000000000
--- a/sci-geosciences/tappy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tappy-0.9.0.tar.gz 1250867 BLAKE2B e88a4744d29dfbf8f225b0167e845e9df57ad9f81d4edb840d59f05d28f99f26df7d9feb278d0ad6eedcc538fee112aae266c52aca27a3c8c780c8b1b43f1a3c SHA512 2f3c7676c166dbfe88436cac9a0c4e3d3d4c027e17c39617c45eb02c1c2eda9276afb1ceaa16afd54bb6de130248f83c8c66aeb3509483cce642d2eb631fb9df
-EBUILD tappy-0.9.0-r1.ebuild 708 BLAKE2B bad8b6e603aaaf43c38120b1d726a300b2c65e59dc72bc926cc8b66989da7a51e016574c912eaa34f68b6486d10dfbf380069670fc071980d09fbe544c2e2788 SHA512 c4caf04431d745d5da389f074a4603330f4108fc169168cc3be867ee7eeb635c1007f8ae94ed056805e60cc2610893d7dfc8a8d0479c1d9b7a4a6ffdbf97f699
-MISC metadata.xml 242 BLAKE2B cdc1157283a9439880469dfa1c51696b63562ffb6e4c911b653daabb26541d50c7eb2584b63b1616aff50b84723429002cf1adf21b944a95b3cb72df74228b09 SHA512 9f5f87d23e28667049584a6c7d3104f7c54a90c71a5527728415a683af6fdae01f64b9b22e9bf4e8d2627396b1000480cbaaaeb286ad7370ccf0aab9e93e01a3
diff --git a/sci-geosciences/tappy/metadata.xml b/sci-geosciences/tappy/metadata.xml
deleted file mode 100644
index 77c02458b0a4..000000000000
--- a/sci-geosciences/tappy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">tappy</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild b/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild
deleted file mode 100644
index 8f6ed281d6cb..000000000000
--- a/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit distutils-r1
-
-DESCRIPTION="Tidal Analysis in Python breaks hourly water level into tidal components"
-HOMEPAGE="http://tappy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- || (
- dev-python/matplotlib-python2[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- )
- dev-python/pywavelets[${PYTHON_USEDEP}]
- || (
- sci-libs/scipy-python2[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- )"
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 406a6c4cdcb3..c145b90138a0 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,6 +1,8 @@
+AUX viking-1.7-no-common.patch 453 BLAKE2B 1d2117f44ea8f99fad79702b350b9c622501b2e02d5b688f835e89cf4868f992f315bdbcd90897f00f8c0fef4721473c5c1a30797fa6b636e3a4204a3abdca96 SHA512 8e4908697109bb00e39ec1c8b07c81167aa6bf4bd3572cf14e1e0a5175ed01ea89ddfa4373f2cee072e9e65a3ecb90fbb9da5a7655d2cee352f62272f34c88a4
DIST viking-1.6.2.tar.bz2 3324897 BLAKE2B ef3ab1d60d6cdca514776aaf59d01dedd063c8850ad842d7cbd23c321304b51ccceaa9e5c4f702afc56819e557b28a7ca2b3242ae2fa207e172f7cfdfbba0c45 SHA512 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8
DIST viking-1.7.tar.bz2 3438343 BLAKE2B 2fbf154c94a0bc745e353dd07e67424b5dd27fab1e0158cac4afe2bf8e7d0d9e1d452b3275219fdd8599ebf2044c17267899f2b0508fc36f274557c1db253320 SHA512 ff26cd808b407af5cb7c3cebed4c550e0c28ac1871497c2cedd09f7e1e72bd24ef0048e6e5d587aa9b03cb1860c3d3afcbe62308ade2179dea4b5f9668d05600
DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
EBUILD viking-1.6.2-r2.ebuild 1756 BLAKE2B 5d914b4f1ab4d07fba05485d77e6a5802a4c59d5110b49a0c7914367a4684d9a64f8bbdc164bbcbb961b5372eff36fe9ebd58fac4d6ac4567031d12820c7f1ea SHA512 b2672f59cc289c0554989adec8d20eab69b81c27305a9a36c7227f4393afac4b99f03549ae122a59aa497c5ad26f0760df4b85015ad2053b4d120b977e84d438
+EBUILD viking-1.7-r1.ebuild 1939 BLAKE2B af65d6185272c5a71256e8928de8c4dc06c2da8a930ecdb08b89e8016b53073afd29f0e90786c76d2802ddc7d96e4dfdadcb789df88bac2f3bee56b88c3c1739 SHA512 18a4ffdafe72f226e8538e9a1a5214839d35881e6f86453f2faf73217c1ecf48c6b5a5e219abf4126b8df93bb70c7b0be2e69ec647b44a9f9b52621262d2de02
EBUILD viking-1.7.ebuild 1922 BLAKE2B 9c9bc4fdb8ede308da5d6f149e8b25916a167c27b9a1fe17b1dcad4aeb10a03ee1f75a02031aae28e19e028c6260ffe993ab74a6bfc9b6b1281e4399a1c3ef42 SHA512 157328f298a3e3fcef1e7cc1dba866d2fadf75694f046f20bf2d7368fbc327436fe2dc0e13e1fbae852db50813777953ef59cbfb30ef05f0dc54e2a8d538914d
MISC metadata.xml 934 BLAKE2B 7f6af7f644e184f8595aa373c4599c55faa6a2e426a64cad0a3932b047a0d842d12f984f6633f34a31114da32cfbcf5cafda739a8f6fc2599f61f63e1e98b5ff SHA512 23e71b45b9d974af69029358c24e47bbb01228dda6ad32ca1453617879d776cc8b212d88728c694a46b46634dc5f77f52b050349a1287249e483e7f4cd5b1b35
diff --git a/sci-geosciences/viking/files/viking-1.7-no-common.patch b/sci-geosciences/viking/files/viking-1.7-no-common.patch
new file mode 100644
index 000000000000..bf49709dc865
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.7-no-common.patch
@@ -0,0 +1,13 @@
+--- a/src/babel.h.orig 2020-02-06 07:22:12.924565811 +0100
++++ b/src/babel.h 2020-02-06 07:22:25.092329302 +0100
+@@ -109,8 +109,8 @@
+ gchar *label;
+ } BabelFile;
+
+-GList *a_babel_file_list;
+-GList *a_babel_device_list;
++extern GList *a_babel_file_list;
++extern GList *a_babel_device_list;
+
+ void a_babel_foreach_file_with_mode (BabelMode mode, GFunc func, gpointer user_data);
+ void a_babel_foreach_file_read_any (GFunc func, gpointer user_data);
diff --git a/sci-geosciences/viking/viking-1.7-r1.ebuild b/sci-geosciences/viking/viking-1.7-r1.ebuild
new file mode 100644
index 000000000000..49c888a29271
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.7-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="GPS data editor and analyzer"
+HOMEPAGE="https://sourceforge.net/projects/viking/"
+IUSE="doc +exif libexif geoclue gps +magic mapnik nls oauth sqlite"
+SRC_URI="
+ mirror://sourceforge/${PN}/${P}.tar.bz2
+ doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMONDEPEND="
+ app-arch/bzip2
+ >=dev-tcltk/expect-5.45.4
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nettle
+ net-misc/curl
+ sys-libs/zlib
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ geoclue? ( app-misc/geoclue:2.0 )
+ gps? ( >=sci-geosciences/gpsd-2.96 )
+ exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+ magic? ( sys-apps/file )
+ mapnik? ( sci-geosciences/mapnik )
+ oauth? ( net-libs/liboauth )
+ sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${COMMONDEPEND}
+ sci-geosciences/gpsbabel
+"
+DEPEND="${COMMONDEPEND}
+ app-text/gnome-doc-utils
+ dev-util/intltool
+ dev-util/gtk-doc-am
+ app-text/rarian
+ dev-libs/libxslt
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-common.patch" )
+
+src_configure() {
+ econf \
+ --disable-deprecations \
+ --with-libcurl \
+ --with-expat \
+ --enable-google \
+ --enable-nettle \
+ --enable-terraserver \
+ --enable-expedia \
+ --enable-openstreetmap \
+ --enable-bluemarble \
+ --enable-geonames \
+ --enable-geocaches \
+ --disable-dem24k \
+ $(use_enable exif geotag) \
+ $(use_with libexif ) \
+ $(use_enable geoclue) \
+ $(use_enable gps realtime-gps-tracking) \
+ $(use_enable magic) \
+ $(use_enable mapnik) \
+ $(use_enable nls) \
+ $(use_enable oauth) \
+ $(use_enable sqlite mbtiles )
+}
+
+src_install() {
+ default
+ if use doc; then
+ dodoc "${DISTDIR}"/${PN}.pdf
+ fi
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}