diff options
Diffstat (limited to 'sci-geosciences')
33 files changed, 532 insertions, 416 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex e15186fea303..46cbf9089e1c 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/congen/Manifest b/sci-geosciences/congen/Manifest index d4ea3d131327..1ca96f1f7486 100644 --- a/sci-geosciences/congen/Manifest +++ b/sci-geosciences/congen/Manifest @@ -1,3 +1,3 @@ DIST congen-1.6.2.tar.bz2 293130 BLAKE2B 3879e5e04fe260fc65b1852a6ece347b7ea0dc7c846ca788f448c4b0af4ce7af1efe8e398727da243a76b1bd5a52632f308ec626ac708141a163159fb2065164 SHA512 21cabdf0fba8cfa8e72068db44e6db0288ce932f81f526f04421272550244de9c617dc12d2c162186cbb9f70d9a44aca48b6f132317fc2fa3c47860d2f58bad6 -EBUILD congen-1.6.2-r1.ebuild 644 BLAKE2B df76ae478b73787083db7d8fac3dded7a6f3db20ef8609ff64eb878be0e703940a37cf2629da092913b09d93501ae7466b633a839ab8f21132f7dfaf123ed0c4 SHA512 21aee012c5b44e4d712872bd25ddc80a982bf31fc4202489f8fad8fc24e42bd35fc99ce3f496e00fbcf58371978d61b1e3fa81106106ae93b9298947dc04e12b +EBUILD congen-1.6.2-r1.ebuild 663 BLAKE2B 1e058152c380f7643b495c668d0e82d190853edfa4c11f96a5e6ef9f8916f0a077428b1f83951741237ddf29c7b50a3189d673bcb8194069826b3e0595bdea73 SHA512 96de779cf3ed57b4bc967699de56c4fab51a2f51ee6946e40399aa24f8778c7d03a455ebd3f9e3ea948b6707d5b148196c10e1d86aa1f5ffcfd12adcf6a3f80d MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/sci-geosciences/congen/congen-1.6.2-r1.ebuild b/sci-geosciences/congen/congen-1.6.2-r1.ebuild index 9bbfd8b6ee37..400b0fd64e97 100644 --- a/sci-geosciences/congen/congen-1.6.2-r1.ebuild +++ b/sci-geosciences/congen/congen-1.6.2-r1.ebuild @@ -3,8 +3,6 @@ EAPI=6 -inherit ltprune - MY_P=${P/_p/-r} DESCRIPTION="Calculate speeds, equilibrium arguments, node factors of tidal constituents" HOMEPAGE="http://www.flaterco.com/xtide/files.html" @@ -29,5 +27,8 @@ src_configure() { src_install() { default - use static-libs || prune_libtool_files + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi } diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest index 2116144a797d..2297fcd58d32 100644 --- a/sci-geosciences/gnome-maps/Manifest +++ b/sci-geosciences/gnome-maps/Manifest @@ -1,7 +1,3 @@ -DIST gnome-maps-3.36.6.tar.xz 4006804 BLAKE2B 4d7684a13b5bace21e7a9d6b97b9b4b91a6fc5cbdbc98c1a776f157c5b1747b16669602e6167afd254d4fe72f8c4d7c9ac27c22089efd07839a6f35bf68b1c31 SHA512 bd72ede45edf851fdbd815278838c34b42145fcccb18bd33ff5e732238797eadc0fe4e0279072c0dd9bfd7b5d88329d8e537ceb3072e186fbc213d63cdef1e72 -DIST gnome-maps-40.0.tar.xz 3540952 BLAKE2B c41a79ce5966a3dac903caa7b98651b7734d8a55b37de5e330e34dd0db0f146a6ca247c82a8d0f07ec5f55b1efaf40d6f86d4fc35ff750f09a565c0edcde6702 SHA512 6ace3c43b1578b278e39fd27dabe9ab62a4ae80ecf1fb42fe3b8e3e208d43e6fd3325b4c61c6de7c05fcc3321178d556d8fafe0e6d2c7c0a924248b9832fa25e DIST gnome-maps-40.1.tar.xz 3543432 BLAKE2B adfffdcf6e3730414ebdf1da0727ee3c20d02b7e1c57f13070d5a08d9895d24f91ad452efac1465e881912f93fe4417cb255ff62324920ae73d482183d50cdbc SHA512 319d819737f6b370cd5344d4483e06781e362930610dbc4745641a208e71f753bf894693009690a6fe04bceac75ab5aa7788ae2511425cd0bd2b9229a5d0111c -EBUILD gnome-maps-3.36.6.ebuild 1395 BLAKE2B 9fbc0e4599e1c6471f704eb742c50264a07c61e1f125c2ba48ac9c026489ff9194db57a97d9dc15e88e42555f55e1d60f66c52d1fba4969f709e15ac432d727d SHA512 abf9ea43d5a4dcb4b2549ff99b30e6f3ec243b617631c68024bf5ecc4d773ccf38fa32ab311418665f20586386b2564ac875503c2e3c4fa0e097d674c84b1e7c -EBUILD gnome-maps-40.0.ebuild 1489 BLAKE2B 941c151bfc2d1bd975db5dbc5eef7957b2a8cd767d9aacb56c6980123f230d055093b52787067ffe94ce7f4b3e93190249507b80e0b3ef8451d5ed639f7abe0e SHA512 f11ae943a1f93b14eec7baefa23401974659e2c3e33e63cd02779981afddfedcebd0b9c0b0e6ff124186a49a512331ff7c14b4ea1fdb2109011c9e7e377f7f13 -EBUILD gnome-maps-40.1.ebuild 1489 BLAKE2B 941c151bfc2d1bd975db5dbc5eef7957b2a8cd767d9aacb56c6980123f230d055093b52787067ffe94ce7f4b3e93190249507b80e0b3ef8451d5ed639f7abe0e SHA512 f11ae943a1f93b14eec7baefa23401974659e2c3e33e63cd02779981afddfedcebd0b9c0b0e6ff124186a49a512331ff7c14b4ea1fdb2109011c9e7e377f7f13 +EBUILD gnome-maps-40.1.ebuild 1487 BLAKE2B 455f501a0654cdae1c74a92391c3cde774d7ea6f9ce8f208700b820d40911fe17a44e49f279a47a123f97fbc645f78cb6e28c47e691f4c0eb07fdabd39143443 SHA512 e3210f34b4ca43f83436b2ee7896be63f95e87d862d79dc7351f7003b8c3335c42f68e37848b529e57c6ed8d71db206fffa073923ce6fe66c8321ef1acb68579 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild deleted file mode 100644 index 1f388bc0f3f1..000000000000 --- a/sci-geosciences/gnome-maps/gnome-maps-3.36.6.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="A map application for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Maps" - -LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 x86" - -# Pure introspection dependencies found by grepping imports.gi in ${S} -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - x11-libs/pango[introspection] - >=dev-libs/gjs-1.50.0 - >=dev-libs/gobject-introspection-0.10.1:= - >=x11-libs/gtk+-3.22:3[introspection] - >=app-misc/geoclue-0.12.99:2.0[introspection] - >=dev-libs/libgee-0.16:0.8[introspection] - >=dev-libs/folks-0.10:= - >=sci-geosciences/geocode-glib-3.15.2[introspection] - >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] - dev-libs/libxml2:2 - >=net-libs/rest-0.7.90:0.7[introspection] - - app-crypt/libsecret[introspection] - dev-libs/libgweather[introspection] - media-libs/clutter-gtk:1.0[introspection] - media-libs/clutter:1.0[introspection] - net-libs/gnome-online-accounts[introspection] - net-libs/libgfbgraph[introspection] - net-libs/libsoup:2.4[introspection] - net-libs/webkit-gtk:4[introspection] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postinst() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sci-geosciences/gnome-maps/gnome-maps-40.0.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.0.ebuild deleted file mode 100644 index eb37149677c7..000000000000 --- a/sci-geosciences/gnome-maps/gnome-maps-40.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -inherit gnome.org gnome2-utils meson python-any-r1 xdg - -DESCRIPTION="A map application for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Maps" - -LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# Pure introspection dependencies found by grepping imports.gi in ${S} -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - x11-libs/pango[introspection] - >=dev-libs/gjs-1.66.0 - >=dev-libs/gobject-introspection-0.10.1:= - >=x11-libs/gtk+-3.22:3[introspection] - >=app-misc/geoclue-0.12.99:2.0[introspection] - >=gui-libs/libhandy-0.84:1= - >=dev-libs/libgee-0.16:0.8[introspection] - >=dev-libs/folks-0.10:= - >=sci-geosciences/geocode-glib-3.15.2[introspection] - >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] - dev-libs/libxml2:2 - >=net-libs/rest-0.7.90:0.7[introspection] - - app-crypt/libsecret[introspection] - dev-libs/libgweather[introspection] - media-libs/clutter-gtk:1.0[introspection] - media-libs/clutter:1.0[introspection] - net-libs/gnome-online-accounts[introspection] - net-libs/libgfbgraph[introspection] - net-libs/libsoup:2.4[introspection] - net-libs/webkit-gtk:4[introspection] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postinst() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sci-geosciences/gnome-maps/gnome-maps-40.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.1.ebuild index eb37149677c7..0eb8aedae289 100644 --- a/sci-geosciences/gnome-maps/gnome-maps-40.1.ebuild +++ b/sci-geosciences/gnome-maps/gnome-maps-40.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps" LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" # Pure introspection dependencies found by grepping imports.gi in ${S} RDEPEND=" diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest index a70b02eda336..da462d2ad403 100644 --- a/sci-geosciences/gpsbabel/Manifest +++ b/sci-geosciences/gpsbabel/Manifest @@ -8,10 +8,14 @@ AUX gpsbabel-1.5.4-use_system_shapelib.patch 2868 BLAKE2B c21666bc49b5ec6f433ca4 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 EBUILD gpsbabel-1.5.4-r1.ebuild 2547 BLAKE2B c1a046ccf5fc308176ccc880bc33bbe1c345b1bd8ee2f49e2d87e64775e8cb7ee69bce3a71241fef85f65e28a5698210457f82c8acf16cfa1aefa67de2627c40 SHA512 e98bafe27f2793784270526bba6994e5aff39c3f8589edee4720524cba5b6695873471b439617a3808f5ddcbf27cbe989eb496c7ef2d50638fc4bef12c9d834c -EBUILD gpsbabel-9999.ebuild 2570 BLAKE2B 086fbbd764f882b270898c4a614e18eea590210b2eb2abd9694cfbfbad6733af739bbdcd91387cd9c927583e2f18bbadd8eece57e9386dc8181af78f964155ad SHA512 143b9af289ace00e9bed5d9970176ec174722ec67f082e90017f676652d2fa7cd36e9d20d6e04857e8baf5a0a0ebcf3158bc626bd2c52a867ae764bdbc272216 +EBUILD gpsbabel-1.7.0.ebuild 1787 BLAKE2B df16b3a7b1d6de3a742aa206e30926e6ef77480f8ab17c84b951426fb16bdbca4ef42b55e0cee9d3afcfb0b0fc7557965be668611e347648ea46181c385f16a1 SHA512 d886a8ce1c2b263b5cd3b23a3c01df6ee2017b88abe18d727ff681b7d830f18d95474ad49b99d681fe3ca79248c14a7d98cc111f6dce31f5376684e26f09d371 +EBUILD gpsbabel-9999.ebuild 1787 BLAKE2B df16b3a7b1d6de3a742aa206e30926e6ef77480f8ab17c84b951426fb16bdbca4ef42b55e0cee9d3afcfb0b0fc7557965be668611e347648ea46181c385f16a1 SHA512 d886a8ce1c2b263b5cd3b23a3c01df6ee2017b88abe18d727ff681b7d830f18d95474ad49b99d681fe3ca79248c14a7d98cc111f6dce31f5376684e26f09d371 MISC metadata.xml 351 BLAKE2B 202695326c207a7b3596c8e1f598839897c0214fd242537ec0b50d4a4a7117b7733f9b6f866fcbc9f87fa57daeccde3b2b8c0bf89868324b53e07c96acb4a0e5 SHA512 b6e29834c731b6cb611ec6cb3a9cd38fbd91461aa8d3a3118ba746c40c41d39e3eab92cca689a32f65540869316a7f416cee2cae7d2310368265aa241a181e1c diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch new file mode 100644 index 000000000000..744400906963 --- /dev/null +++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch @@ -0,0 +1,118 @@ +diff --git a/Makefile.in b/Makefile.in +index 5ace8da1..1acadf3e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -104,7 +104,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 \ +@@ -120,7 +120,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) +@@ -153,10 +153,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 +@@ -513,7 +513,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + ggv_bin.h globalsat_sport.h gpx.h src/core/xmlstreamwriter.h \ + src/core/xmltag.h kml.h xmlgeneric.h legacyformat.h lowranceusr.h \ + mynav.h nmea.h osm.h qstarz_bl_1000.h random.h shape.h \ +- shapelib/shapefil.h subrip.h unicsv.h src/core/textstream.h xcsv.h \ ++ subrip.h unicsv.h src/core/textstream.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 \ +@@ -538,7 +538,7 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ + globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ +- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ ++ qstarz_bl_1000.h random.h shape.h subrip.h \ + unicsv.h src/core/textstream.h xcsv.h yahoo.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 \ +@@ -825,7 +825,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ + globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ +- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ ++ qstarz_bl_1000.h random.h shape.h subrip.h \ + unicsv.h src/core/textstream.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 \ +@@ -841,7 +841,7 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + garmin_fit.h geojson.h ggv_bin.h globalsat_sport.h gpx.h \ + src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ + legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ +- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ ++ random.h shape.h subrip.h unicsv.h \ + src/core/textstream.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 \ +@@ -961,10 +961,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 +@@ -1059,7 +1056,7 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \ + src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ + legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ +- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ ++ random.h shape.h subrip.h unicsv.h \ + src/core/textstream.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 \ +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 0ce05af7..09931eff 100644 +--- a/shape.h ++++ b/shape.h +@@ -27,7 +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> // for DBFHandle, SHPAPI_CALL, SHPHandle + + + #if SHAPELIB_ENABLED diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch new file mode 100644 index 000000000000..56c60a553485 --- /dev/null +++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch @@ -0,0 +1,13 @@ +--- a/Makefile.in 2017-01-21 00:32:50.921546762 +0100 ++++ b/Makefile.in 2017-01-21 00:55:45.362728521 +0100 +@@ -278,8 +278,8 @@ + --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 + diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild new file mode 100644 index 000000000000..d49758284666 --- /dev/null +++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils + +MY_PV="${PV//./_}" +MY_P="${PN}_${MY_PV}" + +DESCRIPTION="GPS waypoints, tracks and routes converter" +HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" +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 + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc" + +DEPEND=" + dev-libs/expat + dev-qt/qtcore:5 + sci-libs/shapelib:= + sys-libs/zlib + virtual/libusb:0 +" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/docbook-xml-dtd:4.1.2 + dev-lang/perl + dev-libs/libxslt + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-xmldoc.patch + "${FILESDIR}"/${PN}-1.7.0-use_system_shapelib.patch +) + +S="${WORKDIR}/${PN}-${MY_P}" + +src_prepare() { + default + + # ensure bundled libs are not used + rm -r shapelib zlib || die + # remove prerequisite zlib/zlib.h + sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die + # remove failing test (fixed by f91d28bf) + rm testo.d/arc-project.test || die + + use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}" +} + +src_configure() { + econf \ + $(use_with doc doc "${S}"/doc/manual) \ + QMAKE=$(qt5_get_bindir)/qmake \ + --with-zlib=system +} + +src_compile() { + default + + 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 +} diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild index 5a4fa28eacd7..d49758284666 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -MY_PV=${PV//./_} -inherit autotools desktop qmake-utils +inherit qmake-utils + +MY_PV="${PV//./_}" +MY_P="${PN}_${MY_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" @@ -23,84 +23,56 @@ else S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" fi +LICENSE="GPL-2" SLOT="0" -IUSE="doc +gui" +IUSE="doc" +DEPEND=" + dev-libs/expat + dev-qt/qtcore:5 + sci-libs/shapelib:= + sys-libs/zlib + virtual/libusb:0 +" BDEPEND=" + virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 dev-lang/perl dev-libs/libxslt ) - gui? ( dev-qt/linguist-tools:5 ) " -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}" - -DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} ) +RDEPEND="${DEPEND}" 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 + "${FILESDIR}"/${PN}-1.7.0-xmldoc.patch + "${FILESDIR}"/${PN}-1.7.0-use_system_shapelib.patch ) -RESTRICT="test" # bug 421699 +S="${WORKDIR}/${PN}-${MY_P}" src_prepare() { default - # remove bundled libs and cleanup - rm -r shapelib || die - - if use doc; then - cp "${DISTDIR}/gpsbabel.org-style3.css" . || die - fi + # ensure bundled libs are not used + rm -r shapelib zlib || die + # remove prerequisite zlib/zlib.h + sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die + # remove failing test (fixed by f91d28bf) + rm testo.d/arc-project.test || die - eautoreconf + use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}" } src_configure() { - local myeconfargs=( - $(use_with doc doc doc/manual) - LRELEASE=$(qt5_get_bindir)/lrelease - LUPDATE=$(qt5_get_bindir)/lupdate - QMAKE=$(qt5_get_bindir)/qmake + econf \ + $(use_with doc doc "${S}"/doc/manual) \ + QMAKE=$(qt5_get_bindir)/qmake \ --with-zlib=system - ) - econf "${myeconfargs[@]}" - - if use gui; then - pushd gui > /dev/null || die - $(qt5_get_bindir)/lrelease *.ts || die - eqmake5 - popd > /dev/null - fi } src_compile() { default - if use gui; then - pushd gui > /dev/null || die - emake - popd > /dev/null - fi if use doc; then perl xmldoc/makedoc || die @@ -109,15 +81,7 @@ src_compile() { } src_install() { - use doc && local HTML_DOCS=( ${PN}.html ${PN}.org-style3.css ) + 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 58e94d5b7095..3e6701da5dac 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,8 +1,4 @@ AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc -DIST gpxsee-8.1.tar.gz 7715535 BLAKE2B f71c3e4212747f3084e2a9ed102fcd4b7c701292cfb933b01cfd1965ac41b3d09f1c67c291ca9eac8cdf66fb4c150937fdc1ccb7369d63e65c30155016fe915f SHA512 beb6a5bdae1e20cac3b5a29a398b5e2742ec28b8f2f1239c027d3470a11c354991465895ab81caa1f7c31dbc77f391aef978a1c746efd35214989505980f4654 -DIST gpxsee-8.9.tar.gz 8414586 BLAKE2B 540dfd52688358413c92580e4213873fedf1cc11418c6e199f67f74f6a4f1b2c9879720cf7f5c791fa6099b88fba0486ec5e516fdf090e04c5ce7b5f4fcf1b75 SHA512 262f1eae598f45196f6f9b167ef522f2af05c2481eb6c7873bae07b35e9eb35da6cf7a067bb3bd32922ec991901f53408040ceba967fb913caf079c1358221df DIST gpxsee-9.0.tar.gz 8538085 BLAKE2B 4c8cdabba6082689e98561eccb399bd2e8c4fdce6f229dae2c4a5576e0adbd05380538c906654d7400f5537d370d368193efdb380100cdb79a3805fa9e80f12c SHA512 3eeaaadd48e838dfa56a499ff44cee681f02c6e3e34ec500c70024926af854966f0ddb81b5b88c3f1741350eed3207d864a83daff93009f3f6a72b9fb69357d8 -EBUILD gpxsee-8.1.ebuild 1120 BLAKE2B 53dd31df042597a342e3495385a922664d7fdc5d6ef902be6af26d7fddf6db68df5c466390ed32f2a64231b0ed12de58c1f411f3c3cf36d746def905819230cc SHA512 47d9b1ffac436772f4bde3eadfa6a00419f973b547b3b8483e453db52f5304a0ba5923c5d88c2650182b3157c0dca71c3ccf3306c2e828c170975b48fd02c40e -EBUILD gpxsee-8.9.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d -EBUILD gpxsee-9.0.ebuild 1125 BLAKE2B e62b2c1c8ebd1983d750118349b8384cb23c7a4cafe159c1fe6acc3ccd0efd70eefdc2bb2ddec61d62b661398c86eaffb33a1eceb82f4d52e93d9527042e3d79 SHA512 089e7d6f0ca2f3aec138421512b3d20e363e0e036b46bd1ca71b16228c5dc31821261fde3e78c1175ac5e3818e13b36858239b22d33503e91c581f4736705dbd +EBUILD gpxsee-9.0.ebuild 1123 BLAKE2B f32b467d0e4aa630c0ffb326f181b6e28400a34b1b2697500adb75e10baeba68e16e5dd557796aa72053a8bcc690aa78cd0b3a46b824f777adbcc36a2932b8cb SHA512 cf30a13427c56dcfa0e5272409ae1842c3f34a26ac7d12ed6b25c279f37a2d05090fe7dcedd0f765f6099796e9fb9173ae2a9019ead895b250ebff42618f57cb MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4 diff --git a/sci-geosciences/gpxsee/gpxsee-8.1.ebuild b/sci-geosciences/gpxsee/gpxsee-8.1.ebuild deleted file mode 100644 index c374500b383b..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-8.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="cs da de en eo es fi fr hu it 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}" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -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() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sci-geosciences/gpxsee/gpxsee-8.9.ebuild b/sci-geosciences/gpxsee/gpxsee-8.9.ebuild deleted file mode 100644 index 950a8b5cfcfa..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-8.9.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="cs da de en eo es fi fr hu it 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}" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -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() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sci-geosciences/gpxsee/gpxsee-9.0.ebuild b/sci-geosciences/gpxsee/gpxsee-9.0.ebuild index 6f4915f07d57..911d42be0201 100644 --- a/sci-geosciences/gpxsee/gpxsee-9.0.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-9.0.ebuild @@ -14,7 +14,7 @@ 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" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-qt/qtwidgets:5 dev-qt/qtgui:5 diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index cfc3c17f3a56..4531a480c8ad 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,5 +1,6 @@ AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c +AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690477c2997c36fb5e3261ae64d1d3445b3fb4a241a39c504591b07af121e92f1ef9f9efb3ade01e82974f8955a SHA512 1dc95cddca38ea5e8200176a92bb412f4a3295eae18e770a6db3aa0d8cfbf11116dce1c9970bd03d78ee69d23254d2e85637f0a00208aff7aa428e52d631121b DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65 -EBUILD grass-7.8.5.ebuild 6941 BLAKE2B fb4f2f5cfa068cc90b45f94fd5ddc19415a66b7fce9f34b5b3c6d71002de226e192f4740e140e9444a616e8498bf4b616e3718448e21fd1d85df2d73cb42a9b7 SHA512 80397ff07c02942ddb2d7ffe2ade1ba88c6baa5563ceddf20d707cb522c2703c6615acd83e29581735f3d8e989436c2e1672be68d4e680032be38f9a9132b130 +EBUILD grass-7.8.5.ebuild 6993 BLAKE2B a772460a6bc1ce8c2b50bd68dafb4b98c0771bab4ed72e99f685064081f7f9e1edb3abfc9fb308579e864f12beb282383029e89455ab73e4c235ebdc5ec81117 SHA512 cf69543c0883fe7d93bedb72280d04ca8055c6659bc84a6016a86c58c273487aba68948c84b6bc5ff3c84223c375d5ac4c32f7ca53dd175c2e19ded5c2a223b6 EBUILD grass-9999.ebuild 6869 BLAKE2B a70777bdbcfa1bd020d7f64a6dbcd74194075c18a9bc753fa0cfaf7113c9a1fe8f087e6f3a7ec0ab77d6eca08eac0ce5bad401e95686baec0c3bd0c28618bda9 SHA512 20ff6e8b55ba0090f4beb9750ce67ed3746f443568397a636f4c82dac2eb705dfa73b3541c00ba6b232a7f609a891ef3424fa291cb104e59384d3cdc553346de MISC metadata.xml 1088 BLAKE2B 4a9d470738d4860ae6e841976ba21974a18c97759c61cc4677d9707c8fb2220f998999368247ed1b19bfc45d7c53624d0ffec9c4aefad951e270f07c43fdbe4f SHA512 0ba4c779c3c0f3ed226fbf7c53e291341513c78e4a5d9ef228cab5436dacfa686cf8fad28aa3143f5036603fcccaf538b5607f48a86138be42af4aead4d147bf diff --git a/sci-geosciences/grass/files/grass-7.8.5-bool.patch b/sci-geosciences/grass/files/grass-7.8.5-bool.patch new file mode 100644 index 000000000000..fddcb9f6df88 --- /dev/null +++ b/sci-geosciences/grass/files/grass-7.8.5-bool.patch @@ -0,0 +1,164 @@ +diff --git a/include/gis.h b/include/gis.h +index 46bb06c52f..333651b938 100644 +--- a/include/gis.h ++++ b/include/gis.h +@@ -23,6 +23,8 @@ + /* System include files */ + #include <stdio.h> + #include <stdarg.h> ++#include <stdbool.h> ++ + + /* Grass and local include files */ + #include <grass/config.h> +@@ -51,13 +53,14 @@ static const char *GRASS_copyright __attribute__ ((unused)) + #define G_gisinit(pgm) G__gisinit(GIS_H_VERSION, (pgm)) + #define G_no_gisinit() G__no_gisinit(GIS_H_VERSION) + +-/* Define TRUE and FALSE for boolean comparisons */ ++/* For boolean values and comparisons use the C99 type 'bool' with values 'true' */ ++/* and 'false' For historical reasons 'TRUE' and 'FALSE' are still valid. */ + #ifndef TRUE +-#define TRUE 1 ++#define TRUE true + #endif + + #ifndef FALSE +-#define FALSE 0 ++#define FALSE false + #endif + + #if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || (__APPLE__ && __LP64__) +diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h +index 89a25de3bf..978894ea74 100644 +--- a/lib/lidar/lidar.h ++++ b/lib/lidar/lidar.h +@@ -62,9 +62,6 @@ + /* INTERPOLATOR */ + #define P_BILINEAR 1 + #define P_BICUBIC 0 +- /* Boolean definitions */ +-#define TRUE 1 +-#define FALSE 0 + + /*----------------------------------------------------------------------------------------------------------*/ + /*STRUCTS DECLARATION */ +diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h +index 9c1dab4e81..2512fedaa2 100644 +--- a/raster/r.param.scale/param.h ++++ b/raster/r.param.scale/param.h +@@ -18,8 +18,6 @@ + /* 'blank' edge around raster. */ + #define MAX_WSIZE 499 /* Maximum dimensions of window. */ + /* Some useful labels. */ +-#define TRUE 1 +-#define FALSE 0 + + #define RAD2DEG M_R2D + #define DEG2RAD M_D2R +diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h +index 33164f43cb..47028e7444 100644 +--- a/raster/r.surf.idw/main.h ++++ b/raster/r.surf.idw/main.h +@@ -1,8 +1,6 @@ + #include <grass/raster.h> + + #define SHORT short +-#define TRUE 1 +-#define FALSE 0 + + #define MELEMENT struct Melement + MELEMENT { +diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c +index fb3b79882f..ae3ec3933a 100644 +--- a/raster3d/r3.showdspf/Ball.c ++++ b/raster3d/r3.showdspf/Ball.c +@@ -7,8 +7,6 @@ + #include "Ball.h" + #include "BallMath.h" + #include <stdio.h> +-#define TRUE 1 +-#define FALSE 0 + + HMatrix mId = { {1, 0, 0, 0} + , {0, 1, 0, 0} +diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c +index 589f243a8d..b48236b33f 100644 +--- a/raster3d/r3.showdspf/togif.c ++++ b/raster3d/r3.showdspf/togif.c +@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b, + * + *****************************************************************************/ + +-#define TRUE 1 +-#define FALSE 0 +- + + /************************** BumpPixel() ********************************/ + /* +diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c +index 1ad97396fa..584af5d8ba 100644 +--- a/vector/v.hull/chull.c ++++ b/vector/v.hull/chull.c +@@ -29,10 +29,6 @@ + + #include "globals.h" + +-/*Define Boolean type */ +-typedef enum +-{ BFALSE, BTRUE } bool; +- + /* Define vertex indices. */ + #define X 0 + #define Y 1 +@@ -76,10 +72,10 @@ struct tFaceStructure + }; + + /* Define flags */ +-#define ONHULL BTRUE +-#define REMOVED BTRUE +-#define VISIBLE BTRUE +-#define PROCESSED BTRUE ++#define ONHULL true ++#define REMOVED true ++#define VISIBLE true ++#define PROCESSED true + + /* Global variable definitions */ + tVertex vertices = NULL; +@@ -436,7 +432,7 @@ bool AddOne(tVertex p) + tFace f; + tEdge e, temp; + long int vol; +- bool vis = BFALSE; ++ bool vis = false; + + + /* Mark faces visible from p. */ +@@ -446,7 +442,7 @@ bool AddOne(tVertex p) + + if (vol < 0) { + f->visible = VISIBLE; +- vis = BTRUE; ++ vis = true; + } + f = f->next; + } while (f != faces); +@@ -454,7 +450,7 @@ bool AddOne(tVertex p) + /* If no faces are visible from p, then p is inside the hull. */ + if (!vis) { + p->onhull = !ONHULL; +- return BFALSE; ++ return false; + } + + /* Mark edges in interior of visible region for deletion. +@@ -470,7 +466,7 @@ bool AddOne(tVertex p) + e->newface = MakeConeFace(e, p); + e = temp; + } while (e != edges); +- return BTRUE; ++ return true; + } + + /*--------------------------------------------------------------------- diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild index eb00d1ab6a89..755437aec9cf 100644 --- a/sci-geosciences/grass/grass-7.8.5.ebuild +++ b/sci-geosciences/grass/grass-7.8.5.ebuild @@ -82,6 +82,8 @@ S="${WORKDIR}/${MY_P}" PATCHES=( # bug 746590 "${FILESDIR}/${PN}-7.8-flock.patch" + # bug 792801 + "${FILESDIR}/${PN}-7.8.5-bool.patch" ) pkg_setup() { diff --git a/sci-geosciences/gshhs-data/Manifest b/sci-geosciences/gshhs-data/Manifest index 15fab44f80bd..a65c605e76ea 100644 --- a/sci-geosciences/gshhs-data/Manifest +++ b/sci-geosciences/gshhs-data/Manifest @@ -1,3 +1,3 @@ DIST gshhs+wdbii_2.2.0.zip 114563504 BLAKE2B db631f4670eb99dd42ad22feae5c4f9aa776a105fb5373ee6ae33fd96f4eb6078b169efe038fb8c8434ef4b5016768a1ab21b2af20d4067f361d0305a060e300 SHA512 fa7011a0008cd81e551ff89dc9b3c51f165824cb15926069eaba0eb42b126d51be4874ce515fde3746217138b093f392d02bf4a1db25cd894ad5bd43cf6ae9d0 -EBUILD gshhs-data-2.2.0.ebuild 611 BLAKE2B e44513b8e6ced63786d732c4cf85c7de54f6aae34babae266d1cb65612702bf6631fb94d222f31556439dade1e2b8fe1864e99eba02e9882e1f400fae0df2266 SHA512 e742def9bbade94930c9b43d5a3f9175c452f808ba2c1a0fc700ce3496cd2ca83a60f905a79ee4c6dcd5e71be48036293bb77c7eb6daa88abdd79d28ce5a182d +EBUILD gshhs-data-2.2.0.ebuild 568 BLAKE2B d675ef598792b60967d86a1b18a635208574c31670730f324bf3c6d5a54f2109e64cdbb73c02b6da82291fff66101cfefb4a0a52f09bbd5a66153dce2449064d SHA512 af9ec70bde6b51f1707e59af78f79bfa49e463b41462a931b7cb8d5558fe6ec942fe9f96dd9a1b9a38a05a57aa6a3d0dc803016512d04f10f6fac01be6407418 MISC metadata.xml 792 BLAKE2B 386af871abe7a142f708d291cce70826f1347bf84c3dcdcbcfd5e6778f13e63929ac64d54c9725c5ebf3d9c32d71240a850a50e4df3b010d2bd7f7f600db6a7a SHA512 d1fc22ba6fddd7ec3e586b6334ec106f64fac8c05901052a41b2474f1bcdae31f629533e2e9f5577b3f4084f1abf92be39c1fd8385b10ef93e5cd483ddcdb4c3 diff --git a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild index 3465400d19bd..f4ec0dab6349 100644 --- a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild +++ b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,15 +6,11 @@ EAPI=5 DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs data" HOMEPAGE="https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html" SRC_URI="https://www.ngdc.noaa.gov/mgg/shorelines/data/gshhg/oldversions/version${PV}/gshhs+wdbii_${PV}.zip" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" -S="${WORKDIR}" src_install() { dodoc gshhs/README.TXT diff --git a/sci-geosciences/gtk-g-rays2/Manifest b/sci-geosciences/gtk-g-rays2/Manifest index da23c1614409..f6a15fefe209 100644 --- a/sci-geosciences/gtk-g-rays2/Manifest +++ b/sci-geosciences/gtk-g-rays2/Manifest @@ -1,3 +1,3 @@ DIST gtk-g-rays2-2.05.tar.xz 898216 BLAKE2B aeba28398ba4be7dcbbfdae48dbf87ab4f6e9e9401981e4626187ccccc352793e39fee5518ece2197207c260b50b76cbfd59cad716fecb12e789a7577b4f1db7 SHA512 673d6e756f1a827e1c0de5384f3228e69a00a56588b81528202e80f5d2067213fd9fdb5af22028fcce0c4ea9e4d1b708accdd5777628ded351e3f2b6f2f57e41 -EBUILD gtk-g-rays2-2.05.ebuild 863 BLAKE2B 8e0c268965f3427de19617fc7fcc75b6def9f7d457aa6d81ec463ecaa659fb723b2caeb42488c29224f70cc1ae4f717de21919ea78a29fb3cc288a7371b9289f SHA512 ea7d89ae618c29494ce8f83d98eaa2ebb21e42d6cdb9c546c320a88e95a4625ed1824a3d005fa6e42cbb2a54e9d8a3c9bcc6271d58f5fe8ba08d7358ff302f53 +EBUILD gtk-g-rays2-2.05.ebuild 767 BLAKE2B e49286df90eb47511a3eac42c7032db28bd4969423ac6d4f97d69f701f7256ade2019610fa4eeafb9fb4357d5c54ed8965890307e74bfed85429db340eac5555 SHA512 5aa91684377f437d5f077dec14a0e32ea8115fc8ef9b1c89ff1a338bffb6ad7c25e877439c6da1ad21f0c05f38af69f0ed167dfb2b50afc27c2ecc68c3b7881f MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225 diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild index 00bc08d3f4cb..cc7fe5207ea4 100644 --- a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild +++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit autotools gnome2 @@ -12,33 +12,26 @@ SRC_URI="http://www.zen35309.zen.co.uk/gps/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND=" - dev-libs/glib:2 dev-libs/dbus-glib + dev-libs/glib:2 dev-libs/libgudev + net-wireless/bluez x11-libs/cairo x11-libs/gtk+:3 - virtual/freedesktop-icon-theme - net-wireless/bluez -" -DEPEND="${RDEPEND} - virtual/pkgconfig + virtual/freedesktop-icon-theme" +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/gettext -" - -DOCS="README AUTHORS ChangeLog" + virtual/pkgconfig" src_prepare() { + default + # werror is bad idea sed -i -e 's:-Werror::g' configure.ac || die # we run this ourselves sed -i -e '/gtk-update-icon-cache/d' Makefile.am || die eautoreconf } - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" -} diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest index 02c9d06bfb8b..ca55eda3fbb1 100644 --- a/sci-geosciences/liblas/Manifest +++ b/sci-geosciences/liblas/Manifest @@ -4,7 +4,8 @@ AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae49 AUX liblas-1.8.1-boost-1.73.patch 1448 BLAKE2B adddc5aacf2961fbfdcc3a8eb82cf197e861ced0a027672ff1de5c70255e7a27d582143f63e1ed3b6e100838c08667787e01a39f4b74ae9ec17dd31ce50e66a9 SHA512 e4a71a3a229c075b4657e8ccca44682b29545ceafe5e2cfb4cdcf096f1813765219cf784c036964affd14a877ae0da95c96ed83a1ad96669634dbf67468cc237 AUX liblas-1.8.1-fix-debug.patch 600 BLAKE2B 6e8f94881f49058bb835e9978640721db4ef7a2b3e5b5a6780455146896d03ed49dcb952cdcb68c85cb47411f3abdd1a84e31200e49a50f5bdcc888464f6d791 SHA512 6e0cbce9451c0496b04da852c7b113c5a3d0b060a15675290c92b85d8c03cd59216e7fbda5d1bfe6c2a157c7777fa9f0d380034df709b20a318432ee756a4f56 AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6 +AUX liblas-1.8.1-gcc11.patch 1332 BLAKE2B 1efbee0111a2368aa3820b1a6fb34b77c1bd1231fe381a892e0e2930089b101114f6b0b756cedc1a9c1858b094955227494ed1246df71b91b18be981065601a2 SHA512 588b65702580a851822f02068b9343d901c5794920f97120617c35cc2b4eb9ed71ee8c34351301a8a78b51bc36794e51414595e3ddfe5077c1371c873c3d99e8 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-r3.ebuild 1393 BLAKE2B c66c7b17584d630539ed3f0c6e7f0e1d531fc2c4a2f16374779a97d281be3131c9f3544674f1c93591468589cacb42ebe60623b38fe11bbfc61f8e4ca9b5c14b SHA512 bdd272b2c3ae0753d48b61b0cca6df414530174f13ee964e4affc02728d58fd69dc5cee0f6122e0619a1b9635193e48363729175567e905649c1fbf7c5a1f0d4 +EBUILD liblas-1.8.1-r3.ebuild 1438 BLAKE2B ec12536642855ad304225d27c0b706e460183cdac0838edc9e56c4cd6992ac8f1e8b1cd28d538e916a9052885d47675f20b7e60c58bf97f50a5eca5f894730a8 SHA512 dc6738de079055c0f3a0a852ba159a9e894d403f4173b0bddb18286847a9d8b3886ff2ff4b9c5853f1e9a54b3741e213b7c86b73e60674c0cda602849c5cbe7f MISC metadata.xml 376 BLAKE2B 7e5aa05cd4b685c24db98a22655379d25294b99a9f25570f6ad8e91722ee6e09dd560cfc5af03efc2a467c82beb1120288b144fea35e7d09eab93cd154ed9039 SHA512 7f745f6aaec1b9233539d9cd868100daf1fc5dbde3aae27ee7ccfee681f0a2fa13f427921c1685bdac48f7937a60d9fa0f8db11af26e5af6a65522ea4fb64375 diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch b/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch new file mode 100644 index 000000000000..b279eb40f4cd --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch @@ -0,0 +1,34 @@ +https://github.com/libLAS/libLAS/commit/8c4985384453a2df7254f05688b83706723bad7b.patch +https://bugs.gentoo.org/789732 + +From 8c4985384453a2df7254f05688b83706723bad7b Mon Sep 17 00:00:00 2001 +From: FX Coudert <fxcoudert@gmail.com> +Date: Wed, 4 Oct 2017 11:51:23 +0200 +Subject: [PATCH] fix pointer comparison + +--- + src/gt_citation.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gt_citation.cpp b/src/gt_citation.cpp +index 65fce31a..8d3966bc 100644 +--- a/src/gt_citation.cpp ++++ b/src/gt_citation.cpp +@@ -155,7 +155,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID) + if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ') + p1 --; + p2 = p1 - 1; +- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) ++ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) + p2--; + if(p2 != p1 - 1) + p1 = p2; +@@ -198,7 +198,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID) + if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ') + p1 --; + char* p2 = p1 - 1; +- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) ++ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) + p2--; + if(p2 != p1 - 1) + p1 = p2; diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild index 0714f93b9b95..575896dad15f 100644 --- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild +++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}"/${P}-CVE-2018-20540-fixup.patch # bug 698846 "${FILESDIR}"/${P}-fix-debug.patch # bug 668778 "${FILESDIR}"/${P}-boost-1.73.patch # bug 722878 + "${FILESDIR}"/${P}-gcc11.patch # bug 789732 ) src_prepare() { diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 20f8ee72509a..69e83be3d582 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -6,7 +6,7 @@ DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29e DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d EBUILD qgis-3.16.2-r1.ebuild 5422 BLAKE2B 08016f4e7aef7c891b6c1a2cf62cc24ae272ffb1d4d39e1c4d410cf850fc82c382671fe926a96cc824f48c81e13aa92d6f74ce20915b05b3d852d987e0b19611 SHA512 f41ff50dc785c000172d98c28d8b0ca07f11bde4bf2eba4d8617fa5cd6bd1316a22be59c9d446d4e0b32f41d0a466f87bb354eb76940ab21b827ff07716d19bd -EBUILD qgis-3.16.4.ebuild 5424 BLAKE2B 46cf1042b7cc1ca2abc4f4f63a97693c69ce4e24b21fa6b23f7b89921e96e3bee61ab4d7e460090d414d51cc094633b1448b342eed51503dd89a0ff6545daabb SHA512 81c27d40889910dc13b3a43f0df25815c6607ea26fe88228b9a6f3a35943d6dbddc66ff8b1b55f4c72acd6fe488f50e72444bd7650635c8b01eb195ca7a1b4be +EBUILD qgis-3.16.4.ebuild 5422 BLAKE2B 08016f4e7aef7c891b6c1a2cf62cc24ae272ffb1d4d39e1c4d410cf850fc82c382671fe926a96cc824f48c81e13aa92d6f74ce20915b05b3d852d987e0b19611 SHA512 f41ff50dc785c000172d98c28d8b0ca07f11bde4bf2eba4d8617fa5cd6bd1316a22be59c9d446d4e0b32f41d0a466f87bb354eb76940ab21b827ff07716d19bd EBUILD qgis-3.18.3.ebuild 5424 BLAKE2B 46cf1042b7cc1ca2abc4f4f63a97693c69ce4e24b21fa6b23f7b89921e96e3bee61ab4d7e460090d414d51cc094633b1448b342eed51503dd89a0ff6545daabb SHA512 81c27d40889910dc13b3a43f0df25815c6607ea26fe88228b9a6f3a35943d6dbddc66ff8b1b55f4c72acd6fe488f50e72444bd7650635c8b01eb195ca7a1b4be EBUILD qgis-9999.ebuild 5291 BLAKE2B ef7ffc42579d042311ce7cc9fbc00eaf6e1fb414fc3362ed35a83d9d618b31e352719ae8f90799647fcf029ff6f81ef45946d3d051d98b7959155155be3185e7 SHA512 2c8c3f83215f97e5b1c965f35a6a54c8dda0bdde56bb2120c11f506f754babc7b9905105e7ebb0f1ec1525fec412613107b9c8855e8829a012bd72e4a95b9a84 MISC metadata.xml 1482 BLAKE2B 87925de85329041a784559b99dc67fd0c787afe25ec6238c19a4200dcabdc3edd45e327605e9178d9c3242ac41be92aa7c048a32c96d72e10af8a32e9461f549 SHA512 22ce6a29e4ddba67939f639e2b7dbf0a0632b3844a599bd4e6300b59f63bd11a447c19a530810fd172ca84a6009a65523445ff8000a2312ebe483c5591b3533f diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild index 80d2d3168813..eb880dfdcb7b 100644 --- a/sci-geosciences/qgis/qgis-3.16.4.ebuild +++ b/sci-geosciences/qgis/qgis-3.16.4.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then 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" + KEYWORDS="amd64 x86" fi inherit cmake desktop python-single-r1 qmake-utils xdg diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index 3330651a8ac0..2c3d4bc27f01 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,4 +1,6 @@ AUX qmapshack-1.15.2-no-hacks-kthxbye.patch 1369 BLAKE2B 01a896d00a15553dbf027d957ebb813f8f211f00e885e80f0cebf34f314fbfab5de0bd601a6a82297ac3ef746d5f2a91903b26cae692c00156409deff6df13cd SHA512 86319948c6f3c7f9e32a19ab88c2de9cd8acc858a7c8c7f02f612d5fb343cae5dbf36f27266e09481cfe5024c91b8e6985b84d83828cb275d0ac27e6deebecee DIST qmapshack-1.15.2.tar.gz 46899954 BLAKE2B b7121331039d8fedf6c44ef591e5f7a637787201bed1763bad026f866060d60a756f18858e76d95ea2420a3183f36147f2c72d151f377e8f2bc9108832266ff4 SHA512 536ba1c2fb3516560307c18eb76ef2b86fecaa1bc0fa4bcef25c8eb2e6c6dee5c3a9a81d6a9d05a147234df7c703937fd9e841696316c350694b0494705f885c +DIST qmapshack-1.16.0.tar.gz 54233332 BLAKE2B 8507018e65072856455e500aae59db146f68b7a1cf5eb2311ee3526044f8fafcec0034ac4f7a473c95ac71bcad8eb057bfc6724f3c80caff51aadba9e16fc412 SHA512 768fe7331d2bc2f2bbadd8c9296012e718f52863c4dfc29f000a5417ccf83297791333be9a20b9d49dcc7b92a779184503e8315b1f7ca258efc9f539ef7262f4 EBUILD qmapshack-1.15.2-r2.ebuild 1282 BLAKE2B c149bdc91387d706c25c341088ac5663a7a536247a9d7662c2b29b5a621e4bfe3fa331ee045b7397a6c45a66a72f4a02225fd91c5d07eb05fb7f4d2265c2d293 SHA512 b4161a42a97ae5c6c285d4c381462753cd17cd79fe6b72e023a871405531de4964a9c1aedf985d08839f4637b61720bbb88c148881c3056318c434904a170ba3 +EBUILD qmapshack-1.16.0.ebuild 967 BLAKE2B ebbc04bc31566ff3ae3e371adb779a009317e9cdb8a3b2d339bc879f4b49502d10966a6dd1011a951bb9380587e4a6b18a7a31621a4a731f2854d7928d2a1d27 SHA512 f2d7d31759d6fcbef1cb252d21f86799d32951b3b4ccc540b8d80901dac953cbec805ccabd4a9b3340dd95b4fcb02ed62489b183ae84dbf1adf4485df3257fbd MISC metadata.xml 831 BLAKE2B 92b3728e320927f7988568ad8b0c7a7b56dc06e8d354e26960f7002652f0a34b6223631179da2d9213f531d135757f17c68589309a0e1736194231a3567df821 SHA512 d69f75e5c21d93c8f0569c8f7429b14f8c9972dead06ebc5bfedaf280c376029ddf4d5f68904472986a5b6f57d9e6a6ef2bdba1edbe440e21d3eca1c65072ba6 diff --git a/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild new file mode 100644 index 000000000000..49979017d07e --- /dev/null +++ b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +DESCRIPTION="GPS mapping utility" +HOMEPAGE="https://github.com/Maproom/qmapshack/wiki" +SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-libs/quazip:0= + dev-qt/designer:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5[widgets] + dev-qt/qthelp:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtwebengine:5[widgets] + >=sci-geosciences/routino-3.1.1 + sci-libs/alglib + sci-libs/gdal + >=sci-libs/proj-8:= +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +S="${WORKDIR}"/${PN}-V_${PV} + +src_prepare() { + cmake_src_prepare + xdg_src_prepare +} + +src_install() { + docompress -x /usr/share/doc/${PF}/html + cmake_src_install + mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed" +} diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest index 810fbf1cf110..c2ce7f614108 100644 --- a/sci-geosciences/routino/Manifest +++ b/sci-geosciences/routino/Manifest @@ -1,6 +1,4 @@ AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3db8417bd8bcc62c8d15a5ed2f43ae8b55e56870ca037b98de2c424f258d139dff11c0128ac60940f09ace6 SHA512 52cbd47e68b25a7c735d32a4bb51436ea45867cdb9f86bc3a55304674b80d33dcc41f845527659db345e118f2f56036a2265a98a177744b4cb1029c7a18e202e -DIST routino-3.3.2.tgz 2542029 BLAKE2B e74af857ef29d4ee4a08d8a2913180dfca747001f4afd59ad20a9ed355e654dc86d26fb1afb5486ece30ddf6b7cba7b60c52feae30af14086f2b4d5259451125 SHA512 5341a2ec063192754d641a4543260f4b3b3d84a7a9bfe745fca2082cdcc8bb7220bf37ed58aacf9e65eba4555432a6bdbb9747153a383dfff72e2aca01c66070 DIST routino-3.3.3.tgz 2564198 BLAKE2B 0476e4afb2279c6a93b3d5192a1be580b0ee20fe07b5101c7d590bd3b74873e0205549c2fa621c6444eea0dd0cf0545c9fc054454e04f434d3e57ed750b1df3d SHA512 b037f6ef38b3abef4639d639c3564b42adc742d225108905d0cacb790e4a07593245c537b5550c43874cd6083f37b710b7aec02a0b0669c927804cf30ce34386 -EBUILD routino-3.3.2.ebuild 1632 BLAKE2B 6daeac8ab82c7e148db3e0ac8737f93b48a45a62cfe4e5fbae7d247fee256defdc45ebf1e3e225e28749988cebc2ca793b3f203f120f4148facff34c41b37945 SHA512 1ae54bb4307df0a0330ab1bd19b9929315085ad81dd46b67b7ac90406e17d3e9d9197736ca341803ced53268c4137194e902cf79e75dab1c359da9aa19936fda -EBUILD routino-3.3.3.ebuild 1641 BLAKE2B ab2bc3136f58dd31d3133105481cb41aa7a39e8f0b2358bdbe38db8f269051708049a471f4b925c6abe0591752d20ff2a9ee287d0db7df4ef03c4a1a59871cfc SHA512 7a17238445009ebd2737beb716873f77662c07e761754caf32002d3e67454553fa7777c1a905700973ce1c24b6ab60530d2f5c9ad974b42a1a418e767a784655 +EBUILD routino-3.3.3.ebuild 1639 BLAKE2B a61ed5e54c86fe1572fbc8a297bc41026d7d7cba695741694b029ba89c6c057f8cacd50ef462a0ca83fb98799f8c547c9a5ca95b0e3576824199790883272a98 SHA512 605d10dc66d11ed09e913f4b1774193661648eb538f2a9f5f7117021f27872033b191e7b5faa3c10675b9daffff47818a4658d3c5ee8bf09d934962da36eeb62 MISC metadata.xml 893 BLAKE2B cdfadafcae0c3898788652b567a8145efb0f98aa819df589d32c49ead219222691b19361b90c8bc5153fef1659d3c2d7e6933a21fcb86db9dfa37ab774d8d2b5 SHA512 84bd42eadbfae10a8762f0d8e28d410d2bf6c69a02e38cf870a846b5f7431130116658e22de5b2411cca0965e027d2f5c71e02bcf6b5ce1e1a804f1c235f60ff diff --git a/sci-geosciences/routino/routino-3.3.2.ebuild b/sci-geosciences/routino/routino-3.3.2.ebuild deleted file mode 100644 index 85bcfcaf76bd..000000000000 --- a/sci-geosciences/routino/routino-3.3.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit toolchain-funcs distutils-r1 - -DESCRIPTION="Routing application based on openstreetmap data" -HOMEPAGE="https://routino.org/" -SRC_URI="https://routino.org/download/${P}.tgz" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="python test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -DEPEND=" - python? ( - ${PYTHON_DEPS} - dev-lang/swig - ) -" -RDEPEND="python? ( ${PYTHON_DEPS} )" - -PATCHES=( "${FILESDIR}"/${P}.patch ) - -src_prepare() { - default - - sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \ - -e "s@CC=gcc@CC=$(tc-getCC)@" \ - -e "s@LD=gcc@LD=$(tc-getCC)@" \ - Makefile.conf || die "failed sed" -} - -src_compile() { - emake -j1 - rm README.txt || die "rm README.txt failed" - mv doc/README.txt . || die "mv doc/README.txt . failed" - if use python; then - pushd python > /dev/null - python_compile() { - rm -f build/.timestamp || die - emake PYTHON=${EPYTHON} - } - python_foreach_impl python_compile - popd > /dev/null - fi -} - -src_test() { - emake test -# if use python; then -# pushd python > /dev/null -# python_test() { -# echo "######## ${EPYTHON} ########" -# emake PYTHON=${EPYTHON} test -# } -# python_foreach_impl python_test -# popd > /dev/null -# fi -} - -src_install() { - default - if use python; then - pushd python > /dev/null - python_install() { - esetup.py install - python_optimize - } - python_foreach_impl python_install - newdoc README.txt README_python.txt - popd > /dev/null - fi - -} diff --git a/sci-geosciences/routino/routino-3.3.3.ebuild b/sci-geosciences/routino/routino-3.3.3.ebuild index 7a46ac85f347..0688afc16cc9 100644 --- a/sci-geosciences/routino/routino-3.3.3.ebuild +++ b/sci-geosciences/routino/routino-3.3.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://routino.org/download/${P}.tgz" LICENSE="AGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |