gentoo resync : 17.06.2021

5 files changed, 0 insertions, 295 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index d42b04509a75..1745544f5633 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index da462d2ad403..71b6810528c4 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -7,11 +7,8 @@ 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-1.7.0-use_system_shapelib.patch 5998 BLAKE2B 7e1228aae03a7ceab05754ff5f1f5c7f346001a7f0533c9d66744b11d8a748de57783a01ec970e246823f97342283f429a0707939e7ddfd4de429ead6b212de0 SHA512 e73e28becd2c9953501f552a30540511422265647a6d9798499d6558927a5b4d36d019f6c4fd1901d2338ea897ea5fc831e827af4c8a18ffdc7bb38d161b50ad
 AUX gpsbabel-1.7.0-xmldoc.patch 498 BLAKE2B a080771489891b16edb2888a6925b3a37b609fb960cd6a2fbff64707eca040199aae36c93272d27d9b955815d47aa190d4481fc96b4d9d80e0b2b3469f8c136b SHA512 5a8bbaecd5975db4e1be8a1df50ff37937cd537e5fe51d4269a16d8cb8b6a390c05d5ff81925ab4ac7d7055b3822d328287d717a141adbc3534954b75e5f6965
-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
 DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
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
deleted file mode 100644
index 6adeef664a52..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.6.0-disable_update_check.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-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
deleted file mode 100644
index 8df45d839cdc..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-9999-use_system_shapelib.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-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
deleted file mode 100644
index 32728e04df28..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-9999-xmldoc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-