diff options
Diffstat (limited to 'sci-geosciences')
70 files changed, 1668 insertions, 949 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex 2e2981197d2a..3cadb3b643e7 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest index 0ca448711467..b1859086aece 100644 --- a/sci-geosciences/bt747/Manifest +++ b/sci-geosciences/bt747/Manifest @@ -1,5 +1,6 @@ +AUX bt747-2.1.7-source-target.patch 1978 BLAKE2B 723a9946b1213ceb4b8a3e7d70726b3faef31e444b25ffee240dd394e74d1de6c64de093a8f75d820cf8306bb81c03c03da2846a6f101a5ba2ca22e72ad7d53f SHA512 bb14e15ecd406f4f0ce8f58641835a0b8a2f86e99737e5665ebbf23e57e19ecfc34d37a88151eb7d4da6663216e4fbd3cfbbf9880ae1d8aec358c2783f2a470c AUX jchart2d-3.2.patch 490 BLAKE2B c676f77a4d7db06a61b445c85ad551aa1510820599e43e8d98d9803788f829da80485e2e3dfdd0e20c4a57c48acc8a5d2fbad7564930cd849c4adc3c1d615669 SHA512 75f9d1d9cc3cd5c6ce4f99dc6c68b97f4566fd5841d04f5d21fcc44294a8bb6c8046599180564ed9d0e6760bc1bf16a44ae817b07952303fcbd6c1b3ef774641 DIST BT747_2.1.7_full.zip 9649645 BLAKE2B ec714f90395875c26679ace3ea732effff977dcdf3f7003f6282cd3ac87935956b5fc829a60e98acd8533d7b6fc482bc9c7ee9348f3972b5cf59db5476009730 SHA512 362533ccbf6b9252d6d7e09497a75038b0776e76a2c2f73f05e2abc0c521d0a640d0ae9e7d5d40da1d14850838a2924f17622d91535e90b900a5ae97b66f6b3d DIST bt747.gif 5903 BLAKE2B ae5516dc716ab147b261ea43c0bbb480ae8ab6f3523147fb9fe980e5c53142ac0021448eee3fc7958467a3cd1a38d989f7894112e5a2d5361300e8644b96df00 SHA512 55c3bbc9ec5fe12261b2604980c7b5d4416afa3ec73f7834c62d3ebbdf4580b247c1feb2ac112f876e7110a8aabe652da39d2181f01661435ba465671a631252 -EBUILD bt747-2.1.7-r3.ebuild 1723 BLAKE2B 5dd339c0b626644448b011d5972a5e5aca1264b3d34a2dd33fd3de66d5c6c3878af400ff8f915465c4d7015f5542acff58644e4c859f71305e9c6123af756e17 SHA512 bc69de391b2bd7cfc675ad73636afe5032542d2b966ffe122426ca0f2289c77cecafea2717fb214be52737a58bb30c8d4637f1ec850e01054e1fee4c3143b5cb +EBUILD bt747-2.1.7-r4.ebuild 2448 BLAKE2B 55ca1faffcbe57ffa2d8dc50554f24c007293ad014083e59f638d3c13fd957d1bd45110f2597063d1c7fdd27ee097c89e2004ec3b18cae75994ad0c5b2ed5a7e SHA512 3f311602190800fb803a5840e2f44990024db3801cdde0d240d33a8b83e2cc8e518972ac061b78a9252885005a4b0cbd3c3f75bfa77ee6ee2532100461d7450e MISC metadata.xml 939 BLAKE2B 09e8faea8d375dc63be360cf1d28db08e511a4a76b024b4902decd7065e11661b6b2ab35fde78aa2e118cf8c5d83661c8911aae24bed4578150529bc81d180e0 SHA512 fdf33fb97c25281d4409578979dad4f0549a225df9ab1f2bddda1a30d90b7004b0963a2649ff37a3475d3b5b29f80bb99603b0a96a2852c171a75186d3a6ba59 diff --git a/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild index 4d6823b6b5da..b5b2ecc0515f 100644 --- a/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild +++ b/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit desktop java-pkg-2 java-ant-2 +inherit desktop java-pkg-2 DESCRIPTION="MTK GPS Datalogger Device Control" HOMEPAGE="https://www.bt747.org" @@ -13,9 +13,10 @@ S="${WORKDIR}" LICENSE="GPL-3" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" -BDEPEND="app-arch/unzip:0" +BDEPEND="app-arch/unzip:0 + >=dev-java/ant-1.10.14-r3:0" CDEPEND=" dev-java/commons-imaging:0 dev-java/jcalendar:1.2 @@ -26,23 +27,28 @@ CDEPEND=" dev-java/swingx:1.6 dev-java/swingx-ws:bt747 " + +# Java 11 because of compile error with 1.8 +# /var/tmp/portage/sci-geosciences/bt747-2.1.7-r3/work/build.xml:1478: +# java.lang.NoSuchMethodError: java.nio.CharBuffer.flip()Ljava/nio/CharBuffer; +DEPEND="${CDEPEND} + >=virtual/jdk-11:* +" RDEPEND="${CDEPEND} dev-libs/glib:2[dbus] >=virtual/jre-1.8:* " -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:* -" -EANT_BUILD_TARGET="dist.j2se" -EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo" -EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747" -JAVA_ANT_REWRITE_CLASSPATH="yes" +DOCS=( ChangeLog.txt ) +PATCHES=( + "${FILESDIR}/bt747-2.1.7-source-target.patch" + # Fix for newer jchart2d. + "${FILESDIR}/jchart2d-3.2.patch" +) src_prepare() { + default #780585 java-pkg-2_src_prepare - # Fix for newer jchart2d. - eapply "${FILESDIR}/jchart2d-3.2.patch" # Remove all the bundled stuff. rm -rv dist/ lib/ || die @@ -50,11 +56,31 @@ src_prepare() { # GraphicsUtilities moved in later SwingX versions. sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \ src_j2se/net/sf/bt747/j2se/app/list/FileListCellRenderer.java || die + + # EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo" + cat > build.properties <<-EOF || die + skip.proguard=yes + svn=true + svnversion=true + build.current.revision=Gentoo + ant.build.javac.source=$(java-pkg_get-source) + ant.build.javac.target=$(java-pkg_get-target) + jcalendar.jar=$(java-pkg_getjars jcalendar-1.2) + jchart.jar=$(java-pkg_getjars jchart2d) + jopt-simple.jar=$(java-pkg_getjars jopt-simple) + rxtxcomm.jar=$(java-pkg_getjars rxtx-2) + sanselan.jar=$(java-pkg_getjars commons-imaging) + swing-layout.jar=$(java-pkg_getjars swing-layout-1) + swingx.jar=$(java-pkg_getjars swingx-1.6) + swingx-ws.jar=$(java-pkg_getjars swingx-ws-bt747) + EOF } -src_install() { - dodoc {ChangeLog,README}.txt +src_compile() { + eant dist.j2se +} +src_install() { java-pkg_dojar dist/*.jar java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \ --java-args="-Xmx192m" diff --git a/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch b/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch new file mode 100644 index 000000000000..aa9c46751371 --- /dev/null +++ b/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch @@ -0,0 +1,33 @@ +Hardcoded javac options prevent configuration. +In order to allow using -Dant.build.javac.source +and -Dant.build.javac.target we remove them. + +--- a/build.xml ++++ b/build.xml +@@ -411,7 +411,7 @@ + <delete dir="${j2sebuild.dir}" /> + <mkdir dir="${j2sebuild.dir}" /> + +- <javac verbose="no" srcdir="${src_j2se.dir}" destdir="${j2sebuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="j2seclasspath" encoding="iso-8859-15" target="1.5" source="1.5"> ++ <javac verbose="no" srcdir="${src_j2se.dir}" destdir="${j2sebuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="j2seclasspath" encoding="iso-8859-15"> + <include name="bt747/j2se_view/BT747Main.java" /> + <include name="bt747/j2se_view/BT747cmd.java" /> + <include name="de/k621/avr/gps/converter/NMEAConverter.java" /> +@@ -442,7 +442,7 @@ + <delete dir="${wababuild.dir}" /> + <mkdir dir="${wababuild.dir}" /> + +- <javac verbose="no" srcdir="${src_waba.dir}" destdir="${wababuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="wabaclasspath" encoding="iso-8859-15" target="1.5" source="1.5"> ++ <javac verbose="no" srcdir="${src_waba.dir}" destdir="${wababuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="wabaclasspath" encoding="iso-8859-15"> + <include name="BT747.java" /> + <compilerarg line="-Xlint:unchecked" /> + </javac> +@@ -971,7 +971,7 @@ + <include name="${src_j2se.dir}/**/resources/*" if="is.lib" /> + </fileset> + </delete> +- <javac verbose="no" srcdir="${rxtxsrc.dir}" destdir="${rxtxbuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="${build.classpath}" encoding="iso-8859-15" target="1.5" source="1.5"> ++ <javac verbose="no" srcdir="${rxtxsrc.dir}" destdir="${rxtxbuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="${build.classpath}" encoding="iso-8859-15"> + <include name="**/*.java" /> + </javac> + <copy todir="${rxtxbuild.dir}"> diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest index 36cef92f9ada..3b9b973aca87 100644 --- a/sci-geosciences/folium/Manifest +++ b/sci-geosciences/folium/Manifest @@ -1,6 +1,8 @@ AUX folium-0.15.1-gentoo.patch 281 BLAKE2B 1a2642e75865fbd0d03bbab2da133c1e205bec1f43fc7ac39c54ddfab330c4acc10da0d81be68a81d3da9937fd3e613f6c0f776b9fdb231c20fc7f66129cece2 SHA512 174145f6db6136c400f1ad0012f928bc042e683d5d564a67f1e2e0adfdb985fa0fb5cd05f04a355af3578dac727f0c06db5a815741ce58e684c46dc9891b1920 DIST folium-0.15.1.tar.gz 8400799 BLAKE2B c01c4029882aed5c1390be05a358c6c9e321e1562573bb1ae7246b462bc9183c21ba7631ca6b9a0e51311375f90f06bac5651c28505fa0d73c65942267ab2ce4 SHA512 fdc0b7bb0c864337b10d92e60090382d67d29e9158bb92c22ae53e749612d88427db95d34990c8895a04017ca1a5870330c6d9da3abb94e19ff6141b94f503c0 DIST folium-0.16.0.tar.gz 8403284 BLAKE2B 443d8fc54ecdad8921d4467623ea4b8f6c22744df79ed25071e7937d38b1204f076432fc99f10ae23ddfebf89d4f7db19101e4aa54ceb1902bdad01af6f3ba2b SHA512 7dbaf3acdc0f5efbee8332bbc33ee002f1af22d53c662d434ace50e091dbaa9dde190d1f5f212be2a9d8abdcd5e5dbce0a916033c672c2327cc8b72f74eb69f4 +DIST folium-0.17.0.tar.gz 8212314 BLAKE2B aac66b49fee5633e6c5d097094cc4ff21d835f87c5017384f2e39236aece1f4820c0dad80b87abcbce30ddb2a3c48332656b0ad07cecdd5b2dbf81c9329eb852 SHA512 2f45237064ea0bd07f95c53ab482bb33bd1786cd431237df23f1d2b9f5f063c43a0f590236b408d257e2567c16444651e9fe1a4ec9c13e6f4934a0330c7d86cc EBUILD folium-0.15.1-r2.ebuild 1285 BLAKE2B 06e2dc98a5c1c9fb94724435c613d93add5368325c5128664439b43d5b03a00e1513dec516ecf8e700401905bd0d0f36c06136048ed86e3b2c84e2685fa37029 SHA512 7800e89530c1b59b64bffbc6fe5ade9aa50699058c62855fd34f20a4d1e7e38d53cecf9af21b971cc8ca7b4591e00f635af2deb6373921280b4f81f30df6c429 EBUILD folium-0.16.0.ebuild 1293 BLAKE2B b3009e0a28eca0ca623008ef04773fe25f472a5ddc3de450d97f454198df350fd3142b84464e26c8a047cf1a06e82796f7c2c21a47df89c097ea751f88475af9 SHA512 474a4f038c90bfee8a1be6d6c88d1879987200a9185875ac25bf302cdebca4a9e81ac226f16fb99bcfa77c38ece5b6a57cdf19e2f47b556d842a87d92e1b85fe +EBUILD folium-0.17.0.ebuild 1293 BLAKE2B b3009e0a28eca0ca623008ef04773fe25f472a5ddc3de450d97f454198df350fd3142b84464e26c8a047cf1a06e82796f7c2c21a47df89c097ea751f88475af9 SHA512 474a4f038c90bfee8a1be6d6c88d1879987200a9185875ac25bf302cdebca4a9e81ac226f16fb99bcfa77c38ece5b6a57cdf19e2f47b556d842a87d92e1b85fe MISC metadata.xml 630 BLAKE2B a22785187ee548da6b47df938a5db21a6778d5bcb22988de11ba54d080dcc03e3702b7f0529dfc4de9fad12973e526af118bbd1b04dddd6f3ad3d7f0163f96e5 SHA512 7ad7009474c3a357a0e4c0b526aa66c96c8b91e39fe3fa3da1dbaf27564d4f15988f0898a13f77d8d93be6567c0533ddf6402279882ca4ea62da96051afe7209 diff --git a/sci-geosciences/folium/folium-0.17.0.ebuild b/sci-geosciences/folium/folium-0.17.0.ebuild new file mode 100644 index 000000000000..6182bf93caf4 --- /dev/null +++ b/sci-geosciences/folium/folium-0.17.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +inherit distutils-r1 + +DESCRIPTION="Python Data, Leaflet.js Maps" +HOMEPAGE="https://github.com/python-visualization/folium" +SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${PN}-0.15.1-gentoo.patch +) + +RDEPEND="sci-geosciences/xyzservices[${PYTHON_USEDEP}] + sci-libs/branca[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/setuptools-scm + test? ( + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +src_prepare() { + rm -r tests/selenium || die # require chromedriver + rm tests/test_folium.py || die # require geopandas + rm tests/test_raster_layers.py || die # require xyzservices + rm tests/plugins/test_time_slider_choropleth.py || die # require geopandas + rm tests/test_repr.py || die # require geckodriver + default +} + +python_test() { + epytest -m 'not web' +} diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest index 1de99f09a177..80950ff36701 100644 --- a/sci-geosciences/geocode-glib/Manifest +++ b/sci-geosciences/geocode-glib/Manifest @@ -1,3 +1,3 @@ DIST geocode-glib-3.26.4.tar.xz 75352 BLAKE2B be783328b2372e1647c3fd6debadaf8313688fe1c993cbc1e084cd9ad8ba8fec0b142a0f579f63085684ef8fafc6e7ec6f54441a085d25d9d5f2eed31a893d1b SHA512 998c2f02a8d3d34a8b6a4b031da2e7c28df27014bcf58f3374fbc0c829fff6257c2622fd9bf331e05b85fbc761c64554fb77ce2d986e0f8b59b17aa486f9f609 -EBUILD geocode-glib-3.26.4-r201.ebuild 1026 BLAKE2B ee339b86ede12198ac4f3dda08f4d825058751a3df60a65e4ca36d1b0561fc3d9caa3cc5df9605fc5e83f6395f20cd4753c7a8fced199c0570b8697dc894f1a4 SHA512 b11da6218fb54f1d99c2bcd5b30c59e70c264906457207c9b3ffeeb41c7d34bbece894764da05bce51b4ceef9a16a14a6fbc03c0dae381cbf75777805604c2bb +EBUILD geocode-glib-3.26.4-r201.ebuild 1020 BLAKE2B 67a140d6695b604a4796e2b9ce408370fbf02ed793a4989a2b8c84a46cd3f9398f6af175b56965b33978b3ae09a7b5e73b6a727a99bde4a33078eda9ca002170 SHA512 6d6c95b9ca4f1b4a41afcee64a04350f0ab1540d2df4f4d529f96e4f388ee042feb38938fbb674dc257dab2900cf147de10538996bb8c0b249a0affd6d56d09b MISC metadata.xml 530 BLAKE2B b1ec0087512fd3f1f73946579481a6734bc6555c1118209a7883bc0ce0e13d9f028c4a7271ec458fc3a1147a2fdaf9692e16d805e09144d2cb729ee77edc1932 SHA512 ecfd5406ec2f8bae406225cf2ae2acfb07cf70ac8b121b2da3c5f814281c9f6a6eda9f06029cc9756e354502d3dc15a7aaf57919d144276ad27d79325bd697a3 diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild index 88a1ebfb3092..12e4b74a4f54 100644 --- a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild +++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib" LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="gtk-doc +introspection test" RESTRICT="!test? ( test )" diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest index 1487ee82b26d..fb424eb4b5e9 100644 --- a/sci-geosciences/gnome-maps/Manifest +++ b/sci-geosciences/gnome-maps/Manifest @@ -1,3 +1,5 @@ DIST gnome-maps-45.5.tar.xz 3141872 BLAKE2B 3064a7ba2e96eaca7c5ad3a66874eb05bde1e675076003f3470ab5bb3bab04525e83e09a2239524247e1963af768d3e36512cbe3bc4dfe05dd951570b4488567 SHA512 cfcf616c331b8feebd79e31585a7f6f0aa05d3cf48713930635585a7d069996ec8c739b6bc1528b649d01c59307a39402d46a27c5e773d1e6b9b6a46362af35b +DIST gnome-maps-46.11.tar.xz 3195792 BLAKE2B 6942a3801e738e981c7b462f23363c92e164c7cea55b650b9ef65fdc623e8bf279c11ef459af2ba91bc077288dff86d54fef9f3bfb1e00832bdffdc2f076f783 SHA512 c34f4535af6db93eca7ed7b7be0778bbfdae53aba1a32ec4882a84d82eeff6d82a365ef4ac18b3f55a829e044d680869827c5b897ddeb12b16a17d08f50f9ba1 EBUILD gnome-maps-45.5.ebuild 1261 BLAKE2B 55ac07cd882f454a6d66038215b8f397a3e0ee346c3fa077328c70d504b003afed0dc96ed70b1c3ce00a163b6194e36a9b8aa1f5652e2f7b073a5138791af199 SHA512 3fd9dd29d285b0be51564310786a8c8d4663d46963f9c029588cfc72bfcdad51e68b3338e2448c4bfc954b812f5a0cd88d37df7df3dd87173d0dfbfae9220dea +EBUILD gnome-maps-46.11.ebuild 1284 BLAKE2B fbd0324966c4f59ac41608e0df171eb21f38fe7b3a1ffeb8db228060e1944f2a6389e052338a6d7fa43d4dea6600c45d802fce3d4619cc41b779500abeb82aae SHA512 b268bc6b786a6aa0903f737085c919785c6a363e83b835ae0df68a871a2becfc2922c3e69e3c1edfa686933ab46f7e4b5f1c1e1a5767305d90f085ddda951ccb MISC metadata.xml 351 BLAKE2B 720552be0df0a6687b1c65211e4532bcdf2f76a1dbc2cfedf801876006bdef781b6e7a3caab9f61a6d5a17fcb73caaa194bb54d356fd903c6ba3d8849c1e8ae5 SHA512 cb4a26c3d4dbcdc7e6ba7cd7136cddf8633002eab39741c4fe5d033bd3154d17d002d475c8f5370aae652ba1b34f952ce1401ea8d71d22ad4ea4aae364fe9645 diff --git a/sci-geosciences/gnome-maps/gnome-maps-46.11.ebuild b/sci-geosciences/gnome-maps/gnome-maps-46.11.ebuild new file mode 100644 index 000000000000..3ce5ef68e79e --- /dev/null +++ b/sci-geosciences/gnome-maps/gnome-maps-46.11.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="A map application for GNOME" +HOMEPAGE="https://apps.gnome.org/Maps/" + +LICENSE="CC0-1.0 GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# Pure introspection dependencies found by grepping imports in ${S} +RDEPEND=" + >=dev-libs/glib-2.66.0:2 + >=dev-libs/gjs-1.69.2 + >=dev-libs/gobject-introspection-0.10.1:= + gui-libs/gtk:4[introspection] + >=app-misc/geoclue-0.12.99:2.0[introspection] + >=gui-libs/libadwaita-1.4_alpha:1[introspection] + >=dev-libs/libgweather-4.2.0:4=[introspection] + >=sci-geosciences/geocode-glib-3.15.2:2[introspection] + dev-libs/libportal:=[introspection] + >=media-libs/libshumate-1.2_alpha:1.0=[introspection] + dev-libs/libxml2:2 + >=net-libs/rest-0.9.1:1.0[introspection] + >=gnome-base/librsvg-2.0 + >=dev-libs/json-glib-1.0 + + app-crypt/libsecret[introspection] + media-libs/graphene[introspection] + net-libs/libsoup:3.0[introspection] + x11-libs/pango[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_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest index 0939a45760d7..3f5f6a666a74 100644 --- a/sci-geosciences/gpsbabel/Manifest +++ b/sci-geosciences/gpsbabel/Manifest @@ -1,12 +1,5 @@ -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-1.8.0-no-automagic-qt5-qt6.patch 1382 BLAKE2B d0fda148f51ff575dfb86ef51db7e2962cbd05a33e1b5e5bc5b57845bb3e9e885b85b7ec81cef7c26e424ff3aed81818edb5c749c0b1fc0d1275f545962f1373 SHA512 4b82fdaea637d2bec322b085b3df33e7c493aeec93e145a3f6b1493884c3dd891e0252f9d4a5ec4f75b482178a65de050062fa18f078523426aee60cae002efd -DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83 -DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911 -DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4 DIST gpsbabel_1_9_0.tar.gz 14514572 BLAKE2B cdea8c74c1a75c4707b071b8a08fe83ce7fd3c6a6fd107c00d8fed958c9674c9f81de548a5cab7f9613a5d9f41834219f93bf7cabbc356047ef07f6667347bfe SHA512 e8591aef8015470471ff7ff6a75ab4a71a584f8de2ac00f3957d06ee76145bf1f53c26a12b8d963f1b96ce09270f54fbd5e96c80eccbeb8466ff94a75b72972d -EBUILD gpsbabel-1.7.0-r1.ebuild 1919 BLAKE2B 83c144e9ca5ba4649378e1857694eb87549344d340c2e09d35ace00eb7359b0b0a63b365e9b29b82c61bc973c1a460522c181a110cb5f58f04bda66c8f475a36 SHA512 551fdfb9e4e7382e1f6b6769673b73768feed8085b40ff46e6c45e98d5799d1d9301ca8d88d1fa4b695c57802e3579fe54381f499a39e6c4fd35149f768c80db -EBUILD gpsbabel-1.8.0-r1.ebuild 2336 BLAKE2B 9eb748c0078e7a03cdfdc6401bd03ca69f29e71d61201455951d833aa36b789ba085e434528fd5d75172c78771e5585096f42b912767c97adb5f884e4f618a7b SHA512 6639407ab52756284775d318a7d740340e42aa0aeb9a1f951cac344c70404a148defb85906ea3fcd892eb2ff7fd88c19ac79dd4da34be2bcfd588ccc79c85785 -EBUILD gpsbabel-1.9.0.ebuild 2164 BLAKE2B c9f80a150a16129fe80637e5552628d5dd2f5ba41ada25500c720081f728137e3eb07a124116a21bfb88ece1746f5cff8df65fdecee64b5cb333a9ed00e2cdd9 SHA512 299ce4f9f654e00a21f0fafff72f883862c5a60be2257e72f78f9696aa530f1a5a273e639ebc2f79f88bd67eb7b992b41a537cce4901b4776e639144e7da5f18 -EBUILD gpsbabel-9999.ebuild 2164 BLAKE2B c9f80a150a16129fe80637e5552628d5dd2f5ba41ada25500c720081f728137e3eb07a124116a21bfb88ece1746f5cff8df65fdecee64b5cb333a9ed00e2cdd9 SHA512 299ce4f9f654e00a21f0fafff72f883862c5a60be2257e72f78f9696aa530f1a5a273e639ebc2f79f88bd67eb7b992b41a537cce4901b4776e639144e7da5f18 +EBUILD gpsbabel-1.9.0.ebuild 2158 BLAKE2B 7ad368350a5d1df38b7432ec397118e6b40af0f0e277de0de166f4a0b3a4a1455eb6151e51b421a0a27b4a832cdff1d95dd893754b1b18e07c9caae286e4cb88 SHA512 f2e87c57bb5462e53b6d1950faa3db5d2150eb5892b80a2bd874301c45d9556021fa357fb92858cef8714657ab5a9e0d29235bc68408fdaab79c30406bf38117 +EBUILD gpsbabel-9999.ebuild 1896 BLAKE2B 69c0e2ac096587bebb9054a83315d8e7337d9cd2f01ba2626564839677beb485fdb931f7800ce6d81bb0a7442433698bee045c538b30999fde7747961e6dca39 SHA512 da7a6632c367847347392c0b769a6e35be97462274d14bdb5a60dbfa15368e5b92c1e596f12b69f63571982b778e8cfd28368038eb7dfb0603503ea6f66fc2b2 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc 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 deleted file mode 100644 index 744400906963..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch +++ /dev/null @@ -1,118 +0,0 @@ -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 deleted file mode 100644 index 56c60a553485..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild deleted file mode 100644 index 36dfe7b2188f..000000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic 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-qt/qtcore:5 - sci-libs/shapelib:= - sys-libs/zlib - virtual/libusb:1 -" -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() { - # -Werror=odr - # https://bugs.gentoo.org/862576 - # Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824 - filter-lto - - 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-1.8.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild deleted file mode 100644 index 5214d81abcd5..000000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_IN_SOURCE_BUILD=1 -inherit cmake desktop flag-o-matic xdg - -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" -else - SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" - S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc qt6" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/docbook-xml-dtd:4.1.2 - dev-lang/perl - dev-libs/libxslt - ) - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) -" - -RDEPEND=" - dev-libs/expat - sci-libs/shapelib:= - sys-libs/zlib:=[minizip] - virtual/libusb:1 - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtserialport:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets,xml] - dev-qt/qtserialport:6 - dev-qt/qtwebchannel:6 - dev-qt/qtwebengine:6[widgets] - dev-qt/qt5compat:6 - ) -" - -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS NEWS README.{contrib,igc,mapconverter,md} gui/README.{contrib,gui} ) - -PATCHES=( - "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" -) - -src_prepare() { - cmake_src_prepare - - # ensure bundled libs are not used - rm -r shapelib zlib || die -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862576 - # Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824 - filter-lto - - local mycmakeargs=( - -DGPSBABEL_WITH_LIBUSB=pkgconfig - -DGPSBABEL_WITH_SHAPELIB=pkgconfig - -DGPSBABEL_WITH_ZLIB=pkgconfig - -DGPSBABEL_MAPPREVIEW=ON - -DGPSBABEL_EMBED_MAP=ON - -DGPSBABEL_EMBED_TRANSLATIONS=ON - -DUSE_QT6="$(usex qt6)" - ) - - cmake_src_configure -} - -cmake_src_compile() { - cmake_build gpsbabel - cmake_build gpsbabelfe - use doc && cmake_build gpsbabel.html -} - -src_install() { - use doc && dodoc gpsbabel.html - einstalldocs - - dobin gpsbabel - dobin gui/GPSBabelFE/gpsbabelfe - insinto /usr/share/${PN}/translations/ - doins gui/gpsbabel*_*.qm - newicon gui/images/appicon.png ${PN}.png - domenu gui/gpsbabel.desktop -} diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild index 5b61f9f33ebe..56e727b1bd61 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git" else SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64" S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" fi diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild index 5b61f9f33ebe..8f8e29366683 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild @@ -12,61 +12,44 @@ 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 +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git" else SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" fi LICENSE="GPL-2" SLOT="0" -IUSE="doc qt6" +IUSE="doc" BDEPEND=" + dev-qt/qttools:6[linguist] virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 dev-lang/perl dev-libs/libxslt ) - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) " - RDEPEND=" dev-libs/expat + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,network,widgets,xml] + dev-qt/qtserialport:6 + dev-qt/qtwebchannel:6 + dev-qt/qtwebengine:6[widgets] sci-libs/shapelib:= sys-libs/zlib:=[minizip] virtual/libusb:1 - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtserialport:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets,xml] - dev-qt/qtserialport:6 - dev-qt/qtwebchannel:6 - dev-qt/qtwebengine:6[widgets] - dev-qt/qt5compat:6 - ) " - DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui ) -PATCHES=( - "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" -) +PATCHES=( "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" ) src_prepare() { cmake_src_prepare @@ -83,7 +66,7 @@ src_configure() { -DGPSBABEL_MAPPREVIEW=ON -DGPSBABEL_EMBED_MAP=ON -DGPSBABEL_EMBED_TRANSLATIONS=ON - -DUSE_QT6="$(usex qt6)" + -DUSE_QT6=ON ) cmake_src_configure diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index e78c396654da..a4890191bdca 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -1,10 +1,7 @@ AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea -DIST gpsd-3.23.1.tar.xz 3450632 BLAKE2B 5057d2ee4734be169c909fd4b8fbe9b5bd65c99ab3ee7e5cc843ffc3e3a033f29f7a677e7dc0a09bbfba28a9a95336e43e4dda09455d90c7ad5a548848778cbc SHA512 21a14e1d8dfa7bef08560107c333c5ad8381914c68ff47ce091506733623a3e5c1dc79e1af303105aeec96490e17d2f10ba0a359250a58f9101af157baa5479d -DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a04b169b1984bf61ecce6b20e4fdf112ff23c54d7647bcec374eeb285f377833cb303dad3449e4b3a028f07 SHA512 96b1967220ff8837271a8974883081a8254fc3b7f3ab3a111ef49ccfa88d86bc82081cf24d33ef849fb5867d6263bb4ec798972e15095501e1feafdc4c14777d DIST gpsd-3.25.tar.xz 3647488 BLAKE2B 0c6f4eff5d2489e88ef0a35b9c089e30805368d491603e644a917a189c95316750913ec1d393a5a2ae7ebaf9279a4d1f19907333c35652178304c69102262849 SHA512 efc26221deb08ef8f34aed7d56809c1056320700f55d08519f1b44fd0c3c8ffc49672980301970fc096d88a0022d7cf207d329356dd81ca3618b7bedc3b078d6 -EBUILD gpsd-3.23.1-r2.ebuild 6119 BLAKE2B f9624333fbd42a3f1c375f1778380c0415b19434b80df98d57166f388dae4d5608a9b1a941be6858c0aa57ce2903e6b30625766a5cea51ab7201e709f13b62a0 SHA512 4946929dc431a202f462fa3d72157f4da91c0ab27fa1c76406af73c0ae0ae408f5114df41256263ec77803ff31005e87b9563c8b495fdee8ac088697d3f36642 -EBUILD gpsd-3.24.ebuild 6325 BLAKE2B ea92cef7cce12c5d4ecbafb8293c5035eaafc3bc8a6c37ed43eee3f4de1d3a3412c0a57cc9ffbe782cdf77ac1c6a93beeebd3b6264fd6f5810302efd53b55ad0 SHA512 70a34f121b96ceca4d81d2e4081fc1d32ed3e141ae67427f54cbf3ae9048efecc6a4f86d6fbd226c7664a677281b47eace6491d5a6b6aa9522f9fc62084e167f -EBUILD gpsd-3.25.ebuild 6385 BLAKE2B 8734efef57a8fcd80043a92411f13460122d251a5529e9728b8bb4d30ee0588899aecdcd5c358f855f2a1e00da0944ed94cf65e36b3f06284ff8d4495a8aafa3 SHA512 cb943f26603bf5dea6272118bda108eb5c1dc997ff966375ead0d54e1e19b0b19f92922bf0053be3250de86c2c85bb3bf0e5049b19a3ff0d587ef096fd6854b0 -EBUILD gpsd-9999.ebuild 6388 BLAKE2B 16b4828c24b1513c1b502f73f946266d2a517fd67424353beb23d1765f96fbf905c0a051a0bd8181342457cf4b76cf0a01a0ade43f8b6bbdcfb0c050a8fce1de SHA512 69f7b5cb7849290fa20545e9de14e860d2b2ee4fc18a30cfb95b32733b092a8fc55dafbb0ad3fa23ef994e4e4a927804fd8d683f5a9b0b5857e05905a91fcec7 +EBUILD gpsd-3.25-r2.ebuild 6876 BLAKE2B 5a05f66814b3769a730d3f5664111576e1ba4c5b7da0aefc78db37bc7f8df22d174cc286ee5797200d3fddf0a1c591e9ae9137f8b4043d085b590ebff224b350 SHA512 3f4a3d8da7d04d6eebe22002f2d5f404ce28df0ee40831458386efefdb85ef149d25961445a9c66850a8971fa9ab84f80137c0670011e223e12b89eb3af241db +EBUILD gpsd-3.25.ebuild 6387 BLAKE2B 70c809b4536acf564cef0e28c9f16ce170d1730f279c485017a4ebc6f840f59816ceaaa56f9faea7b804a4563a8449e0e02c46cdba092405396b6c2fd80890bb SHA512 c433d934a992ce2d75ea711d86b77d1ca7cdb6e988153dc9939f70c9dbb0766af88d3bd49f49b80ee4ab3cfff3e1efc7a2f6317f3a2bb1aafc3a7435cbb6a947 +EBUILD gpsd-9999.ebuild 6568 BLAKE2B c610a742a24a141be3dc6ed05e4da11dd77f52bbbb9a637df1449b97b40829a00eb70b13aa3a6704305a4a6c3c98fe8d374ce5b01f8399b66cb90df1fbe110fa SHA512 52ead91bf5f007a45d8c809398265c7a2baa4b39a06fa42c35d5413078a8c47a9be81b572dc0081c38a290140e9deec0448c3028088b8ef2740e462e1bdc706a MISC metadata.xml 1029 BLAKE2B a8bd09a148ce75d7e8a390353834e87f05d4a21e4ac31a1264565c37bef7801542eef52955dae03470f7a8d965d7b2ae446014ad5c7b3a251aa3a9ad0bef0e9c SHA512 cad79d8d94442ecfca1cbe03c137e771d02999db08a494801c524edba6a6648a7b948a00c9f3ebf539f99fa58794acd09923bc077cf19ae126a64bfb4d1ff397 diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild deleted file mode 100644 index e2deae1550a1..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_10 ) -SCONS_MIN_VERSION="2.3.0" - -inherit udev distutils-r1 scons-utils systemd toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" - inherit git-r3 -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" -HOMEPAGE="https://gpsd.gitlab.io/gpsd/" - -LICENSE="BSD" -SLOT="0/29" - -GPSD_PROTOCOLS=( - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip - oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq - superstar2 tnt tripmate tsip ublox -) -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X" -REQUIRED_USE="X? ( python ) - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) - gpsd_protocols_isync? ( gpsd_protocols_ublox ) - gpsd_protocols_ublox? ( python ) - gpsd_protocols_greis? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( cxx )" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/gpsd - acct-group/dialout - >=net-misc/pps-tools-0.0.20120407 - bluetooth? ( net-wireless/bluez:= ) - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - ncurses? ( sys-libs/ncurses:= ) - ntp? ( || ( - net-misc/ntp - net-misc/ntpsec - net-misc/chrony - ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) - python? ( ${PYTHON_DEPS} ) - gpsd_protocols_ublox? ( dev-python/pyserial ) - gpsd_protocols_greis? ( dev-python/pyserial ) - usb? ( virtual/libusb:1 ) - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - $(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]') - test? ( app-alternatives/bc )" - -# asciidoctor package is for man page generation -if [[ ${PV} == *9999* ]] ; then - BDEPEND+=" dev-ruby/asciidoctor" -fi - -python_check_deps() { - has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 -} - -src_prepare() { - # Make sure our list matches the source. - local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort - ) ) - - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then - eerror "Detected protocols: ${src_protocols}" - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" - die "please sync ebuild & source" - fi - - # bug #807661 - sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die - - default - - use python && distutils-r1_src_prepare -} - -python_prepare_all() { - python_setup - - # Extract python info out of SConscript so we can use saner distribute - pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; } - local pyprogs=$(pyarray python_progs) - local pybins=$("${PYTHON}" -c "${pyprogs}; \ - print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins") - # Handle conditional tools manually. #666734 - use X && pybins+="+ ['xgps', 'xgpsspeed']" - use gpsd_protocols_ublox && pybins+="+ ['ubxtool']" - use gpsd_protocols_greis && pybins+="+ ['zerk']" - local pysrcs=$(pyarray packet_ffi_extension) - local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types") - - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; } - pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - - # Post 3.19 the clienthelpers were merged into gps.packet - - # TODO: Fix hardcoding https://gpsd.io/ for now for @URL@ - sed \ - -e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \ - -e "s|@URL@|https://gpsd.io/|" \ - -e "s|@DEVMAIL@|$(pyvar devmail)|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - -e "s|@DOWNLOAD@|$(pyvar download)|" \ - -e "s|@IRCCHAN@|$(pyvar ircchan)|" \ - -e "s|@ISSUES@|$(pyvar bugtracker)|" \ - -e "s|@MAILMAN@|$(pyvar mailman)|" \ - -e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \ - -e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \ - -e "s|@WEBSITE@|https://gpsd.io/|" \ - "${S}"/packaging/gpsd-setup.py.in > setup.py || die - distutils-r1_python_prepare_all -} - -src_configure() { - scons_opts=( - prefix="${EPREFIX}/usr" - libdir="\$prefix/$(get_libdir)" - udevdir="$(get_udevdir)" - rundir="/run" - chrpath=False - gpsd_user=gpsd - gpsd_group=dialout - nostrip=True - systemd=$(usex systemd) - unitdir="$(systemd_get_systemunitdir)" - shared=$(usex !static True False) - bluez=$(usex bluetooth) - libgpsmm=$(usex cxx) - clientdebug=$(usex debug) - dbus_export=$(usex dbus) - ipv6=$(usex ipv6) - timing=$(usex latency-timing) - ncurses=$(usex ncurses) - ntpshm=$(usex ntp) - pps=$(usex ntp) - python=$(usex python) - # force a predictable python libdir because lib vs. lib64 usage differs - # from 3.5 to 3.6+ - $(usex python python_libdir="${EPREFIX}"/python-discard "") - qt=$(usex qt5) - shm_export=$(usex shm) - socket_export=$(usex sockets) - usb=$(usex usb) - ) - - if [[ ${PV} != *9999* ]] ; then - scons_opts+=( manbuild=False ) - fi - - use X && scons_opts+=( xgps=1 xgpsspeed=1 ) - use qt5 && scons_opts+=( qt_versioned=5 ) - - # enable specified protocols - local protocol - for protocol in ${GPSD_PROTOCOLS[@]} ; do - scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) ) - done - - # bug #809260 - python_setup -} - -src_compile() { - export CHRPATH= - tc-export CC CXX PKG_CONFIG - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} - escons "${scons_opts[@]}" - - pushd "${P}" || die - ln -sf ../setup.py . || die - use python && distutils-r1_src_compile - popd || die -} - -src_install() { - DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '') - - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd - newinitd "${FILESDIR}"/gpsd.init-2 gpsd - - # Cleanup bad alt copy due to Scons - rm -rf "${D}"/python-discard/gps* - find "${D}"/python-discard/ -type d -delete - # Install correct multi-python copy - pushd "${P}" || die - use python && distutils-r1_src_install - popd || die -} diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.25-r2.ebuild index ea6badcf72b1..615d6bafd6f9 100644 --- a/sci-geosciences/gpsd/gpsd-3.24.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.25-r2.ebuild @@ -1,15 +1,16 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_10 ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) SCONS_MIN_VERSION="2.3.0" inherit distutils-r1 scons-utils systemd toolchain-funcs udev -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" inherit git-r3 else @@ -20,8 +21,8 @@ fi DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" HOMEPAGE="https://gpsd.gitlab.io/gpsd/" -LICENSE="BSD" -SLOT="0/29" +LICENSE="BSD-2" +SLOT="0/30" GPSD_PROTOCOLS=( aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar @@ -29,14 +30,16 @@ GPSD_PROTOCOLS=( rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox ) IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X" -REQUIRED_USE="X? ( python ) +IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm static systemd test udev usb X" +REQUIRED_USE=" + X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( cxx )" + qt5? ( cxx ) +" RESTRICT="!test? ( test )" RDEPEND=" @@ -59,14 +62,16 @@ RDEPEND=" dev-qt/qtnetwork:5 ) python? ( ${PYTHON_DEPS} ) - gpsd_protocols_ublox? ( dev-python/pyserial ) - gpsd_protocols_greis? ( dev-python/pyserial ) + gpsd_protocols_ublox? ( dev-python/pyserial[${PYTHON_USEDEP}] ) + gpsd_protocols_greis? ( dev-python/pyserial[${PYTHON_USEDEP}] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig $(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]') + python? ( ${DISTUTILS_DEPS} ) test? ( app-alternatives/bc )" +RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )" # asciidoctor package is for man page generation if [[ ${PV} == *9999* ]] ; then @@ -74,13 +79,14 @@ if [[ ${PV} == *9999* ]] ; then fi python_check_deps() { - has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 + python_has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 } src_prepare() { # Make sure our list matches the source. local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort + sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' \ + "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort ) ) if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then @@ -165,7 +171,7 @@ src_configure() { $(usex python python_libdir="${EPREFIX}"/python-discard "") qt=$(usex qt5) shm_export=$(usex shm) - socket_export=$(usex sockets) + socket_export=True # Required, see bug #900891 usb=$(usex usb) ) @@ -207,18 +213,32 @@ python_test() { :; } +python_install() { + while read -d '' -r file ; do + grep -q "#!/usr/bin/env python" "${file}" && python_doscript "${file}" + done < <(find "${T}"/scripts -type f -print0) + + distutils-r1_python_install +} + src_install() { - DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '') + DESTDIR="${D}" escons install "${scons_opts[@]}" $(usev udev udev-install) newconfd "${FILESDIR}"/gpsd.conf-2 gpsd newinitd "${FILESDIR}"/gpsd.init-2 gpsd # Cleanup bad alt copy due to Scons - rm -rf "${D}"/python-discard/gps* + rm -rf "${D}"/python-discard/gps* find "${D}"/python-discard/ -type d -delete # Install correct multi-python copy pushd "${P}" || die - use python && distutils-r1_src_install + if use python ; then + mkdir -p "${T}/scripts" || die + grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs cp -t "${T}/scripts" + assert "Moving Python scripts failed" + + distutils-r1_src_install + fi popd || die } diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild index c617497e8672..93bbf3abe0f0 100644 --- a/sci-geosciences/gpsd/gpsd-3.25.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild @@ -20,7 +20,7 @@ fi DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" HOMEPAGE="https://gpsd.gitlab.io/gpsd/" -LICENSE="BSD" +LICENSE="BSD-2" SLOT="0/30" GPSD_PROTOCOLS=( diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index 5e2024d52363..9a4ff1315e67 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -4,7 +4,8 @@ EAPI=8 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) SCONS_MIN_VERSION="2.3.0" inherit distutils-r1 scons-utils systemd toolchain-funcs udev @@ -20,23 +21,19 @@ fi DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" HOMEPAGE="https://gpsd.gitlab.io/gpsd/" -LICENSE="BSD" +LICENSE="BSD-2" SLOT="0/30" GPSD_PROTOCOLS=( aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock greis isync itrax navcom nmea2000 oceanserver oncore - rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox + gpsclock greis isync itrax navcom nmea2000 oncore + sirf skytraq superstar2 tnt tripmate tsip ) IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm +sockets static systemd test udev usb X" +IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp qt5 selinux +shm static systemd test udev usb X" REQUIRED_USE=" - X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) - gpsd_protocols_isync? ( gpsd_protocols_ublox ) - gpsd_protocols_ublox? ( python ) - gpsd_protocols_greis? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) + ${PYTHON_REQUIRED_USE} qt5? ( cxx ) " RESTRICT="!test? ( test )" @@ -60,14 +57,14 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) - python? ( ${PYTHON_DEPS} ) - gpsd_protocols_ublox? ( dev-python/pyserial ) - gpsd_protocols_greis? ( dev-python/pyserial ) + ${PYTHON_DEPS} + dev-python/pyserial[${PYTHON_USEDEP}] usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig $(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]') + ${DISTUTILS_DEPS} test? ( app-alternatives/bc )" RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )" @@ -77,13 +74,14 @@ if [[ ${PV} == *9999* ]] ; then fi python_check_deps() { - has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 + python_has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 } src_prepare() { # Make sure our list matches the source. local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort + sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' \ + "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort ) ) if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then @@ -97,7 +95,7 @@ src_prepare() { default - use python && distutils-r1_src_prepare + distutils-r1_src_prepare } python_prepare_all() { @@ -113,7 +111,7 @@ python_prepare_all() { print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins") # Handle conditional tools manually. #666734 use X && pybins+="+ ['xgps', 'xgpsspeed']" - use gpsd_protocols_ublox && pybins+="+ ['ubxtool']" + pybins+="+ ['ubxtool']" use gpsd_protocols_greis && pybins+="+ ['zerk']" local pysrcs=$(pyarray packet_ffi_extension) local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types") @@ -137,6 +135,12 @@ python_prepare_all() { -e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \ -e "s|@WEBSITE@|https://gpsd.io/|" \ "${S}"/packaging/gpsd-setup.py.in > setup.py || die + + if [[ "${PV}" == *9999* ]]; then + # Distutils doesn't like the tilde + sed -i s/~dev/-dev/ setup.py || die + fi + distutils-r1_python_prepare_all } @@ -162,13 +166,12 @@ src_configure() { ncurses=$(usex ncurses) ntpshm=$(usex ntp) pps=$(usex ntp) - python=$(usex python) # force a predictable python libdir because lib vs. lib64 usage differs # from 3.5 to 3.6+ - $(usex python python_libdir="${EPREFIX}"/python-discard "") + python_libdir="${EPREFIX}"/python-discard qt=$(usex qt5) shm_export=$(usex shm) - socket_export=$(usex sockets) + socket_export=True # Required, see bug #900891 usb=$(usex usb) ) @@ -195,9 +198,9 @@ src_compile() { export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} escons "${scons_opts[@]}" - pushd "${P}" || die + pushd "${PN}"-* || die ln -sf ../setup.py . || die - use python && distutils-r1_src_compile + distutils-r1_src_compile popd || die } @@ -210,6 +213,14 @@ python_test() { :; } +python_install() { + while read -d '' -r file ; do + grep -q "#!/usr/bin/env python" "${file}" && python_doscript "${file}" + done < <(find "${T}"/scripts -type f -print0) + + distutils-r1_python_install +} + src_install() { DESTDIR="${D}" escons install "${scons_opts[@]}" $(usev udev udev-install) @@ -219,9 +230,13 @@ src_install() { # Cleanup bad alt copy due to Scons rm -rf "${D}"/python-discard/gps* find "${D}"/python-discard/ -type d -delete + # Install correct multi-python copy - pushd "${P}" || die - use python && distutils-r1_src_install + pushd "${PN}"-* || die + mkdir -p "${T}/scripts" || die + grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs cp -t "${T}/scripts" + assert "Moving Python scripts failed" + distutils-r1_src_install popd || die } diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index 40b41cdc479d..45b95efd5006 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,8 +1,8 @@ AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc -DIST gpxsee-13.14.tar.gz 5552553 BLAKE2B 693af0d57fc923b7ccaeace7c52f76bba4749dee9bae4f7593dc350cfe4c89bf2212a32fa47a52d39cde2f91fcc53675867b7be6b9241daef615eda388a8cf53 SHA512 af21cfa160bfdf21f3537da254e0f079063b827a4fe008245e9b67d50735480a82138d1a5aad119fb73397ca2d53b98c2dfb83b3419f32c3339876050c5f4816 -DIST gpxsee-13.18.tar.gz 5577442 BLAKE2B ef4429cb80822883e97c5f6ca74ca701ec3197651a8f2aec660b1591846167876b4ed4ceb4d79f45ae357c7f2df56a5b109204243c7f8b166b60d2ca5ef2705d SHA512 e4a94b9274a618e530b08b25677236fa34843ce289f8520ab8ea8c2c952f9e1cd25802e44f3d5ede0758af897cc51e72065f5178a6c7fc22eb41ba3fea7a1fc6 -DIST gpxsee-13.19.tar.gz 5613645 BLAKE2B 24f79bc88d8ca469b463abf8a8d25d013448aa2eec112dac90f8780de5efff8afcfd3bcc008ebe6efc9de4d3728a1cd29290924423205beaecb41d6f0708f477 SHA512 0d9ee02dc75e55d757fb2461eca979d02a809cbf0cc310bcdeacddaa4c6eb0d8bca7707175915c42f298e279b088defe05e36f02618b560caf3cd0f40e149922 -EBUILD gpxsee-13.14.ebuild 1247 BLAKE2B 3f767810656b44960c45f26e54e4fab0c20ce914f8d8cc7e1cc63035e34c47dbb68dc806d8b9a973a04d696da22e6a9af8696033192fe9c1cda164d22daa184f SHA512 af8853f1bb9291964f7e54e037f9930ec03e2c2379532aab520ce2e5ecb4cb1699ee1d744b417d2c1ea7747adb116813c2ae411fbea47606c1a5e88fc8c6197b -EBUILD gpxsee-13.18.ebuild 1516 BLAKE2B fee78110a609facead46ce994c1deefd31a386a567113baef9587cdbcbfbdda809b4c12df41e5e696e5cea18989f67af974ab0c295b24ad5ef1d1501ceac4c81 SHA512 ae318269aa26b278ce16bdf6b585f1b35c7e28bdc8d43f6bc13c688e4fa88de338d9f68da1e92991d8b5fc436683852de08ddae24289de1aa177a18789a59f77 -EBUILD gpxsee-13.19.ebuild 1516 BLAKE2B fee78110a609facead46ce994c1deefd31a386a567113baef9587cdbcbfbdda809b4c12df41e5e696e5cea18989f67af974ab0c295b24ad5ef1d1501ceac4c81 SHA512 ae318269aa26b278ce16bdf6b585f1b35c7e28bdc8d43f6bc13c688e4fa88de338d9f68da1e92991d8b5fc436683852de08ddae24289de1aa177a18789a59f77 +DIST gpxsee-13.22.tar.gz 5634011 BLAKE2B b708ea4a81679109ce4e67302e336e070a508799ba8bbcf67121b617390e3808e2a054170e57a112c734fa7d22698f71da5f902ec704fda0f0fcf2818495b29f SHA512 0a12304c608ee86ebdd226a3179fde538ac0f64d5300ede4a032be373059ccbe1dcbcb6db76326c9988620b9fd41dd0f36e8e922b305a16fd27e87a56385fcba +DIST gpxsee-13.24.tar.gz 5638074 BLAKE2B 036d5b6c03f137149ea4f4d41ecf46df184e78ca523a2c1a9e48bb2d3ea3352264bd24b30e3169c1f2bba917971eadae87d2dea1ac9c9b9667490ea94499db27 SHA512 8d33c204b184d0ecbe260bf384cf90103efea7ebdaa9c1f647e1f7bdd6376a1db55bf73ca1b153699a5a878aa8815b0e2aeb75f67448c7390ccaf7d8ed8f207a +DIST gpxsee-13.26.tar.gz 5638599 BLAKE2B 9d13d3455d0ea59e4f03daa89e3668a634e6f1a5fd5c129e6d031920fddc238303c52aaae04776a51655e221c7facba4c63d7f5ede1c144cb32202427c52c26c SHA512 9a56930fb3f7cdf95d2ca6e4daebb16e5f670bc715489ed02e51e3b4b5e08ec397524de219c5e7142910c826cda60a46c3dd467572769e60239b667aa306d59e +EBUILD gpxsee-13.22.ebuild 1513 BLAKE2B f5262b4edabfdb6b1e92a4626c2c06d583d7203be056a104f8c98461fc2927f728584daef4bc87c38993a0f011233ad7fab9116409a6df411079e20a63d1e7ff SHA512 586dbcdcb1465ff66a20d88ae235dfe651b5a7ad15ae4454cad1be356aa15219429f319994358f79889da526f342427f160de73ec8bf19773a121832905e81b4 +EBUILD gpxsee-13.24.ebuild 1516 BLAKE2B fee78110a609facead46ce994c1deefd31a386a567113baef9587cdbcbfbdda809b4c12df41e5e696e5cea18989f67af974ab0c295b24ad5ef1d1501ceac4c81 SHA512 ae318269aa26b278ce16bdf6b585f1b35c7e28bdc8d43f6bc13c688e4fa88de338d9f68da1e92991d8b5fc436683852de08ddae24289de1aa177a18789a59f77 +EBUILD gpxsee-13.26.ebuild 1516 BLAKE2B fee78110a609facead46ce994c1deefd31a386a567113baef9587cdbcbfbdda809b4c12df41e5e696e5cea18989f67af974ab0c295b24ad5ef1d1501ceac4c81 SHA512 ae318269aa26b278ce16bdf6b585f1b35c7e28bdc8d43f6bc13c688e4fa88de338d9f68da1e92991d8b5fc436683852de08ddae24289de1aa177a18789a59f77 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3 diff --git a/sci-geosciences/gpxsee/gpxsee-13.14.ebuild b/sci-geosciences/gpxsee/gpxsee-13.22.ebuild index 977e4fb382f7..d39d378a564f 100644 --- a/sci-geosciences/gpxsee/gpxsee-13.14.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-13.22.ebuild @@ -13,25 +13,35 @@ DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nme HOMEPAGE="https://www.gpxsee.org/ https://github.com/tumic0/GPXSee" SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_P}" - LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 arm64 ppc64 ~x86" +IUSE="qt6" RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtpositioning:6 + dev-qt/qtserialport:6 + ) + !qt6? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + ) " DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" +BDEPEND=" + qt6? ( dev-qt/qttools:6 ) + !qt6? ( dev-qt/linguist-tools:5 ) +" PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) @@ -48,8 +58,13 @@ src_prepare() { } src_compile() { - $(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" - eqmake5 gpxsee.pro + if use qt6; then + $(qt6_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" + eqmake6 gpxsee.pro + else + $(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" + eqmake5 gpxsee.pro + fi emake } diff --git a/sci-geosciences/gpxsee/gpxsee-13.18.ebuild b/sci-geosciences/gpxsee/gpxsee-13.24.ebuild index 6ed42a42478c..6ed42a42478c 100644 --- a/sci-geosciences/gpxsee/gpxsee-13.18.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-13.24.ebuild diff --git a/sci-geosciences/gpxsee/gpxsee-13.19.ebuild b/sci-geosciences/gpxsee/gpxsee-13.26.ebuild index 6ed42a42478c..6ed42a42478c 100644 --- a/sci-geosciences/gpxsee/gpxsee-13.19.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-13.26.ebuild diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 00af61a15b9d..626eda486a49 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,7 +1,7 @@ AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c -DIST grass-8.3.1.tar.gz 68491177 BLAKE2B 58513c8c273b55831bca764c9e61e54b92c075ea2f4ff3c2f059ebcce98f25694ee03a25bef7a3e1c443165dd9493d3ce469233be3b65596dc28da166c12d174 SHA512 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793 DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0 -EBUILD grass-8.3.1.ebuild 7070 BLAKE2B 24db4f7bc33845d9123e30a2dabd537097efd47066942322454de31b0b99c390524b408079c718a1e686b93d4d43f0426bff334c9e77cfd81222eff172b3656d SHA512 d68bdeb3add17d3f09809ec5c3c3c8e6d5701280a96181e57891db01bcddf188dc961eb8411bd674f6f6e7d7edd315e6c19a26b757bca6b3e60cb4ecb94147c5 -EBUILD grass-8.3.2.ebuild 7070 BLAKE2B 24db4f7bc33845d9123e30a2dabd537097efd47066942322454de31b0b99c390524b408079c718a1e686b93d4d43f0426bff334c9e77cfd81222eff172b3656d SHA512 d68bdeb3add17d3f09809ec5c3c3c8e6d5701280a96181e57891db01bcddf188dc961eb8411bd674f6f6e7d7edd315e6c19a26b757bca6b3e60cb4ecb94147c5 -EBUILD grass-9999.ebuild 7011 BLAKE2B 9d9ae0535426d4d9c9e41e513e0427069bb859861871a305161d2df8c4c4abfbbdf6ec8c0db32000960b867b0edb5a0139785e202b5a786b753f4d51e60f8825 SHA512 3d4c5fa1b50269fee75b96856309daa66adce2c14ff9eb2feda8d09383312d3c00745b307247c52de0934c5f64c3448af5afaf465bf8fa3c58f9118ffbbe47ad -MISC metadata.xml 1209 BLAKE2B d3b487c34e4282b9b60b3ff92eca7d609abca4950793877a17e4f48ac6363e84fea831ed0902206986b0abd601a5bdeaaf7db19db079b32b85641750e3f36442 SHA512 6a65b8141b2ad880368915bf2676e5fa5d42e6fcb710fa8e9b2098613ed6dac356302ac1635ad139d7ea560ec25d83f79d94833e53365f26063cd6ffee3debbc +DIST grass-8.4.0.tar.gz 70245687 BLAKE2B 0f8283d215cc5412abcf4bc984aa94b5ca3de6de0d3d240fb533a4a0d2b335438269524462f3c4ede5ebec5cfc0348246571216dbc16f8658d88db28159bf360 SHA512 c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4 +EBUILD grass-8.3.2-r1.ebuild 7085 BLAKE2B b68b36f7a1495d5c61853d102653ff8ae78c54117a8ce4e277b35c31b3f3705a5b34e4e571ee8ad4603baea65d9e2cb190772954fea757802365d3aa7d10783b SHA512 feee69d50bc31a1dabbf350a6db478313d0e69c53bc7a5ba5f9ee9deec8ad3f0826681bf744f1f843a27fd78342cadee49e5b0e625ced5f67cb77ea0280a6b94 +EBUILD grass-8.4.0.ebuild 7107 BLAKE2B 2036a2438a6811517ebfb8f57822c7595194914615b64bd663cc35b0b1a8ec031bd2f786dff0a34d70ba4fd4e53f9e0a6cf52f017a6a6217ab5361af5c58a276 SHA512 2fe01605c2f842ad58b7ddb3afc3a175d0a1455e68a89f1afefefd211e80b9641045f45985c3fec39112dc8cc9096ee5afc65e4627c2673913a481be366f94ba +EBUILD grass-9999.ebuild 7048 BLAKE2B 269ba74ebbe05764255e18f2632fa873d994dd4d0301650bcf582406e6688c007e63dd9f4d8d63e63142445aa9f50de8d853714199a6ccc08e3c3ece6859087c SHA512 ee8bd2435b5d0f382aa9c8a45e6211cda13051b84e373ad0270afe660ec6e00cde492d14a2b0331af56273e04301246c6318f171a5cad76a260ee0d3bfa7975d +MISC metadata.xml 1316 BLAKE2B 508c5fdf769d6563bb585ccd0a7072675f2725fa0702ca9e3f9b3963bd5379312dda36e37ba2fc58c7a85e03c035484abbe95a2e6651d51ea7fa97e013897355 SHA512 1f58db0827750b585c64c8321d47b4277a8472b1073f0216f06cf211aeea6ad53065634b4003269560282b22679b90d34b077d447f8ae07c16a4dbe905cf9b79 diff --git a/sci-geosciences/grass/grass-8.3.2.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild index 8a3ea23d393d..0871bb02df0d 100644 --- a/sci-geosciences/grass/grass-8.3.2.ebuild +++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" # bug 572440 inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg @@ -39,7 +39,8 @@ fi IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - opengl? ( X )" + opengl? ( X ) + pdal? ( cxx )" RDEPEND=" ${PYTHON_DEPS} diff --git a/sci-geosciences/grass/grass-8.3.1.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild index 8a3ea23d393d..51d356ba10d0 100644 --- a/sci-geosciences/grass/grass-8.3.1.ebuild +++ b/sci-geosciences/grass/grass-8.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" # bug 572440 inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg @@ -14,7 +14,7 @@ HOMEPAGE="https://grass.osgeo.org/" LICENSE="GPL-2" if [[ ${PV} =~ "9999" ]]; then - SLOT="0/8.3" + SLOT="0/8.4" else SLOT="0/$(ver_cut 1-2 ${PV})" fi @@ -36,10 +36,11 @@ else S="${WORKDIR}/${MY_P}" fi -IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd" +IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - opengl? ( X )" + opengl? ( X ) + pdal? ( cxx )" RDEPEND=" ${PYTHON_DEPS} @@ -48,7 +49,6 @@ RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/ply[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] ') sci-libs/gdal:= sys-libs/gdbm:= @@ -76,6 +76,7 @@ RDEPEND=" postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) + svm? ( sci-libs/libsvm:= ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( @@ -207,6 +208,7 @@ src_configure() { $(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config) $(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config) $(use_with geos geos "${EPREFIX}"/usr/bin/geos-config) + $(use_with svm libsvm) $(use_with X x) $(use_with zstd) ) diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index ed68dea0c142..558ef152545b 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" # bug 572440 inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg @@ -36,10 +36,11 @@ else S="${WORKDIR}/${MY_P}" fi -IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd" +IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - opengl? ( X )" + opengl? ( X ) + pdal? ( cxx )" RDEPEND=" ${PYTHON_DEPS} @@ -48,7 +49,6 @@ RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/ply[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] ') sci-libs/gdal:= sys-libs/gdbm:= @@ -76,6 +76,7 @@ RDEPEND=" postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) + svm? ( sci-libs/libsvm:= ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( @@ -202,6 +203,7 @@ src_configure() { $(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config) $(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config) $(use_with geos geos "${EPREFIX}"/usr/bin/geos-config) + $(use_with svm libsvm) $(use_with X x) $(use_with zstd) ) diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml index 4dffe6c5b468..4b90fd219c90 100644 --- a/sci-geosciences/grass/metadata.xml +++ b/sci-geosciences/grass/metadata.xml @@ -22,6 +22,7 @@ <flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag> <flag name="las">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag> <flag name="pdal">Enable support for PDAL for point clouds via <pkg>sci-libs/pdal</pkg></flag> + <flag name="svm">Enable support for the Support Vector Machine library <pkg>sci-libs/libsvm</pkg></flag> </use> <upstream> <remote-id type="github">OSGeo/grass</remote-id> diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest index 6db36698a60d..eba0e24c25e2 100644 --- a/sci-geosciences/josm-bin/Manifest +++ b/sci-geosciences/josm-bin/Manifest @@ -1,7 +1,7 @@ -DIST josm-snapshot-18969.jar 16856669 BLAKE2B 9ef29900ff07fa150eb1d53e4884aae785328c904bf789dfd3b56903694f5fecd0a61c012db11903615b1a5f46bf82bfd3694e3bdf04a713b141cd2b9c2ea80c SHA512 495477d7a8162531557e20098862182ab9be765741ad05cc8d5ff9e101baa64d11783d4c7480bcafc3c3356c9e471ec6b2116a6a10fe76429f690135495db18c -DIST josm-snapshot-19017.jar 16761531 BLAKE2B 8789b5aa4c1de250523d065a8c7d788d26bbc597c5a381065093c547a97ecdfb4386b51aed02ca77747139cbdeff5ad99c04b1e08eba592f18301204003d038e SHA512 6beaa0e10e6682124be9434034ac6610d2ad9c3bd9c8e0f46982e21344f8ac95868d020bb383462984875272291889d0ab3a802349e1cfcdee482a8dd8940c0c -DIST josm-snapshot-19039.jar 16767506 BLAKE2B fe5fe056771c17179bd0480792c0cccb963af792066ab7f72e8bda3cfd414323ea1b37d166ad80d4c5228bf2bf92be83df6e07fb1d59c4af57e41b7aaeb7057f SHA512 316bab3ed4654b46b65c5924a6fe8978da0af505d6287086bfb9a0a0b30486a22c53b9d93934009f49e0b18daf44b7aa34d1651d6cf66a6e9d8e0e3b5020fd57 -EBUILD josm-bin-18969.ebuild 977 BLAKE2B 26d81f3018cdc5752fe74a800b8d019e550f9efde2904f8b34baa681c078e92e067fdbc75cf34717c4226d7856f1398021c7d25c6f434a9a05c02d1d3f454e2b SHA512 457ef947fed42418abc7bc1cdb5220448f8a62a6776a05d6cdd565ce5bb5a9e375df76b08bfd4d4198ee7326d22b9a765039186e32939b93759617b1741b584d -EBUILD josm-bin-19017.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781 -EBUILD josm-bin-19039.ebuild 1194 BLAKE2B 4d3baae83ce1ec9b343eaf3223cfa0f0dc15fb32674a50ca13eac19f64c906d9d3bdcf5f494d2bfd9c985a32db6e23e838d4fd992233040714ddcd7a8b2487b2 SHA512 3824da326ecef5d2a7faad42ba89061dcb5d00f12387b42c3ad46a8647b1a9a23e33c4a7298e5a7b9bea6a46926da96b428af81eb07fcd2525369620361d7a5c +DIST josm-bin-19207.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394 +DIST josm-bin-19207.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0 +DIST josm-snapshot-19160.jar 18236258 BLAKE2B c0650ed766476aca4ff05fc07e1630e8a524f01a3c154233e4fba76db2998a7b18b18618815c6c44c091409f3dd922cbda61ea801974e0103adbfcb7e11bf378 SHA512 a8ba54e729b3699b0a380087ba1986cfd4061380c6fe2554e950751cf4a41803c1c92b480b93b0e17a41aedf789047f67494ef0a2495b9f360963a4f9508137a +DIST josm-snapshot-19207.jar 18348268 BLAKE2B 35d8a35b6f2ba4553784d44c6928b2d179d82fae65a98c71c859fd7bb8ce5a26510cfa784318b83f21c38e944685fec2e83e3138f5c7a6cf47229e505ab80ad3 SHA512 7de9b9f4a70cd3b4788254d4b1ab979df311362671d47ec53d8abf5324b32ecb8577ffc1b7619d51df8f8e901cbd4710bfa25e01cba3d8495fd741e53a7966af +EBUILD josm-bin-19160.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781 +EBUILD josm-bin-19207-r2.ebuild 1970 BLAKE2B f307d08bde4ac65c784720d8d5032180d258b004b16615f74e560dae709bbd0d18195ff27f9d9593fb512c94e770545b01497ee531d150deed694d19d721731e SHA512 2ab7f1d2d07ce04b7230c4e7414da8e5793de3dff58e12650c0057739aba647acdaf030b1280654fa5645b6b027bb542f0c16cd00ea9df145562db9719fa79f7 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a diff --git a/sci-geosciences/josm-bin/josm-bin-18969.ebuild b/sci-geosciences/josm-bin/josm-bin-18969.ebuild deleted file mode 100644 index 17a8c3c1a10f..000000000000 --- a/sci-geosciences/josm-bin/josm-bin-18969.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop java-utils-2 xdg - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="https://josm.openstreetmap.de/" -# PV should be stable here https://josm.openstreetmap.de/wiki/StartupPage -SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar" -S="${WORKDIR}" - -LICENSE="Apache-2.0 GPL-2+ GPL-3" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND=">=virtual/jre-1.8" -BDEPEND="app-arch/unzip" - -src_install() { - java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar - java-pkg_dolauncher ${PN} --jar ${PN}.jar - - local icon_size - for icon_size in 16 32 48; do - newicon -s ${icon_size} -t hicolor \ - images/logo_${icon_size}x${icon_size}x32.png ${PN}.png - newicon -s ${icon_size} -t locolor \ - images/logo_${icon_size}x${icon_size}x8.png ${PN}.png - done - make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience" -} diff --git a/sci-geosciences/josm-bin/josm-bin-19039.ebuild b/sci-geosciences/josm-bin/josm-bin-19039.ebuild deleted file mode 100644 index 6303fb8bbeed..000000000000 --- a/sci-geosciences/josm-bin/josm-bin-19039.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop java-utils-2 xdg - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="https://josm.openstreetmap.de/" -# PV should be stable here https://josm.openstreetmap.de/wiki/StartupPage -SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar" -S="${WORKDIR}" - -LICENSE="Apache-2.0 GPL-2+ GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=virtual/jre-1.8" -BDEPEND="app-arch/unzip" - -src_install() { - java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar - java-pkg_dolauncher ${PN} --jar ${PN}.jar \ - --java_args "\ - --add-exports=java.base/sun.security.action=ALL-UNNAMED \ - --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED \ - --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" - - local icon_size - for icon_size in 16 32 48; do - newicon -s ${icon_size} -t hicolor \ - images/logo_${icon_size}x${icon_size}x32.png ${PN}.png - newicon -s ${icon_size} -t locolor \ - images/logo_${icon_size}x${icon_size}x8.png ${PN}.png - done - make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience" -} diff --git a/sci-geosciences/josm-bin/josm-bin-19017.ebuild b/sci-geosciences/josm-bin/josm-bin-19160.ebuild index 3c2c192c743d..3c2c192c743d 100644 --- a/sci-geosciences/josm-bin/josm-bin-19017.ebuild +++ b/sci-geosciences/josm-bin/josm-bin-19160.ebuild diff --git a/sci-geosciences/josm-bin/josm-bin-19207-r2.ebuild b/sci-geosciences/josm-bin/josm-bin-19207-r2.ebuild new file mode 100644 index 000000000000..eaa3dcd4cde6 --- /dev/null +++ b/sci-geosciences/josm-bin/josm-bin-19207-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop java-utils-2 xdg + +DESCRIPTION="Java-based editor for the OpenStreetMap project" +HOMEPAGE="https://josm.openstreetmap.de/" +# PV should be stable here https://josm.openstreetmap.de/wiki/StartupPage +SRC_URI=" + https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar + https://josm.openstreetmap.de/export/${PV}/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop -> ${P}.desktop + https://josm.openstreetmap.de/export/${PV}/josm/trunk/native/linux/tested/usr/share/mime/packages/josm.xml \ + -> ${P}.mime.xml +" +S="${WORKDIR}" + +LICENSE="Apache-2.0 GPL-2+ GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-1.8" +BDEPEND="app-arch/unzip" + +src_unpack() { + default + + cp "${DISTDIR}/${P}.desktop" "org.openstreetmap.${PN}.desktop" || die +} + +src_prepare() { + default + + sed -i -e 's/^Exec=josm/Exec=josm-bin/' "org.openstreetmap.${PN}.desktop" || die + sed -i -e 's/^Icon=org.openstreetmap.josm/Icon=org.openstreetmap.josm-bin/' "org.openstreetmap.${PN}.desktop" || die +} + +src_install() { + java-pkg_newjar "${DISTDIR}/josm-snapshot-${PV}.jar" ${PN}.jar + java-pkg_dolauncher ${PN} --jar ${PN}.jar \ + --java_args "\ + --add-exports=java.base/sun.security.action=ALL-UNNAMED \ + --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED \ + --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" + + local icon_size + for icon_size in 16 32 48; do + newicon -s ${icon_size} -t hicolor \ + images/logo_${icon_size}x${icon_size}x32.png "org.openstreetmap.${PN}.png" + newicon -s ${icon_size} -t locolor \ + images/logo_${icon_size}x${icon_size}x8.png "org.openstreetmap.${PN}.png" + done + newicon -s scalable images/logo.svg "org.openstreetmap.${PN}.svg" + domenu "${WORKDIR}/org.openstreetmap.${PN}.desktop" + insinto /usr/share/mime/packages + newins "${DISTDIR}/${P}.mime.xml" "${PN}.xml" +} diff --git a/sci-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest index 4d8b965d2967..af5771b2ca17 100644 --- a/sci-geosciences/laszip/Manifest +++ b/sci-geosciences/laszip/Manifest @@ -1,6 +1,3 @@ -DIST laszip-src-3.4.1.tar.bz2 151530 BLAKE2B 17647e458a43165d21cf3ad6fa141f5ae5d82d27d73e4e2d4098bbb72db4826f495e86e15c6985c29eb532ba2677f1c9fe1674e1d8219b451f5b0f26cba1b2e0 SHA512 3aaace2b38b61403b965ca29c8902d757d781dd5ec6aa55eb5779164a66bd340a3be9af17dfe625e77a7ffcc54579610d3ebdbfce54c42ae8ba47dbd22c8c1e7 DIST laszip-src-3.4.3.tar.bz2 153819 BLAKE2B f23d0410ea474c50e858353ef06d9d006e091615e1a8cd26c070de81d2e12770ca64aa3281dd1348ebd372776cd951039d3fa3a60f487d0cb85dda0b19b17f4b SHA512 32635d0918201b1eb141b70bf946f06a40ef9a05d1b51429c90375382e9064e2c500574926a49ae2f6fef44c3a94329b1c305a3945f9bed2a3a92c9d63d37d74 -EBUILD laszip-3.4.1-r1.ebuild 583 BLAKE2B 7b15552928385488fd10507ad7f8936dcbcd4c178981afc6a703c60e556a713851d26480e41a2a60d13155dcf16d7780d1160f0fcc953778368929ce3eaca5f1 SHA512 a4b5db26abfd8dae9ff1b8045f00d2cb87f5ad090dd054d77aef71c49a9828dbec2f55ce7e0780d9939a9ea467235de95c4cb3f5daea45b6a0a6c3a48217e696 -EBUILD laszip-3.4.1.ebuild 581 BLAKE2B 0301e628c12c90e57356f4e2d8606d0ea2b4061c6b94ff1a86706c07e9f0fdf3220bdde36be6cef535f55464dfc6537e2202b147342281832d8928254c0a579c SHA512 73877b911fe5d664f6c2a2c36475a3d222519d3327678ccb1d9faf1ddb4886b1000a58d71b0a0bec773f0bb409977e8b0aa34b565805c77471dcd8f064783998 -EBUILD laszip-3.4.3.ebuild 438 BLAKE2B ca43f0b6f020d652540acad92f24504f06b588ebe1ace1a529e2d3159751ba85d9537cc9196461e80aafbce34aab9595d837f429cc43b04243ccd1e8aa0c9b79 SHA512 05d0713861127aa73e5e204847ac8cc94e15742e1d14b9e0508e5393654e8b79310b31d33032cb662c3afd34a8a40faa6f8f1ff12bf31e1cb6e54edfaca35a7c +EBUILD laszip-3.4.3.ebuild 436 BLAKE2B d91f9fbd446388a38f22cb3d8da77e96c0da1ea1bf07976978e8bb27d739f386e036805ff1ff1f4dee91d83b4f06751a815f34469b2dbf78ff41d8b1177918f6 SHA512 36bf892e0f2e2ad09ed978845a0e46235c67760775fe41e9d9e7bfb9149ab1a11f54a80ed494ec22644b87c133fbb18f4eec8820613810c2a9e39a7b3e845f78 MISC metadata.xml 348 BLAKE2B ed0e51225825d709f9058ebe57b8c4f7922d7ab075d7df44873fd6a84a7612c5490ae842bbab3a03fc4e1b0fd63cff18d2fe908a4df5826c3ab8d254e533bbc6 SHA512 1fd420bcfde5ba8f0929d79d88c9a977ff121b1ebce0c9f059257a8ce744a3605367b6e9d91698d2afe5d4c964488a2a5bf37a0997ac9670a28aaacae9a69002 diff --git a/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild b/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild deleted file mode 100644 index d41ac8eef3fb..000000000000 --- a/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format" -HOMEPAGE="https://laszip.org/" -SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV}.tar.bz2" - -SLOT="0" -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -S="${WORKDIR}/${PN}-src-${PV}" - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862582 - # Fixed in newer version. - filter-lto - - cmake_src_configure -} diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild deleted file mode 100644 index fd0926e96b21..000000000000 --- a/sci-geosciences/laszip/laszip-3.4.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format" -HOMEPAGE="https://laszip.org/" -SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV}.tar.bz2" - -SLOT="0" -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" - -S="${WORKDIR}/${PN}-src-${PV}" - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862582 - # Fixed in newer version. - filter-lto - - cmake_src_configure -} diff --git a/sci-geosciences/laszip/laszip-3.4.3.ebuild b/sci-geosciences/laszip/laszip-3.4.3.ebuild index e82c9094b483..70998812675f 100644 --- a/sci-geosciences/laszip/laszip-3.4.3.ebuild +++ b/sci-geosciences/laszip/laszip-3.4.3.ebuild @@ -12,4 +12,4 @@ S="${WORKDIR}/${PN}-src-${PV}" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" diff --git a/sci-geosciences/librttopo/Manifest b/sci-geosciences/librttopo/Manifest index 9fe4bccd6f86..963ccd9d945a 100644 --- a/sci-geosciences/librttopo/Manifest +++ b/sci-geosciences/librttopo/Manifest @@ -1,3 +1,3 @@ DIST librttopo-1.1.0.tar.gz 301077 BLAKE2B 4d296593b5f50712952f54cf5bde540d32293dd7d401fe26325201df202caf7b7841eee0cf65cdbd2fd1789cb050d6fe532af60f76105ae0288c0beb1adca2f2 SHA512 624c2aeff16737d0bec28f8b38427351a3af20658a077d280a1b2422697419394f36832db9459bf25c7d699bc002eaec499dcbd65bca7d2b3f8b92e78650dea3 -EBUILD librttopo-1.1.0.ebuild 584 BLAKE2B 46c0ba5c168e55c92a2fd85641a5def8fd8b680c65af836fa96ef038065d00771f7becdb52e181e446de8d876f825c0bab95cf5e8ce72051136d739e7273c839 SHA512 351ff8832fa13f9e446c6607112c8635881c7ade6a035ee91230d7b713345c1a25f74e502387b8b8e980a2367c0d39e988ccf65bc533bc39ce57b086e4f213d4 +EBUILD librttopo-1.1.0.ebuild 583 BLAKE2B 106be74b4ab4a9a83fca7ffd169a5f6ffdcf59d622d9ec33738f0c4e476cfaebeda83ca951f9fa22161f0cdfd21048e945342c17da323c58103786d6a393119b SHA512 84ae7b3e36d0429f125ce8c40c9a5c214765bc2ab0d8d3801936fb70e3957704e8a9a470369e4f689db64ebcee80680e678333d2031edddb999a46d7cbb68997 MISC metadata.xml 270 BLAKE2B d671fe6a94e536276e72466a25e98a1e0bc835584f788b10653270c10b976da801bdb6bad177fc69d359c1e588d08101dc4f01792f14f04432ba7b6e234787a7 SHA512 e54914ee9c11010802a2bb5b4c998c82c53e93085d12dd59c6c5ec570de962ec8938e1e1a5ad6640fe8047c3d3eedea8c367881dd07a5648e95863af32e888f9 diff --git a/sci-geosciences/librttopo/librttopo-1.1.0.ebuild b/sci-geosciences/librttopo/librttopo-1.1.0.ebuild index 6d2203aaf4cd..3b0d006d1082 100644 --- a/sci-geosciences/librttopo/librttopo-1.1.0.ebuild +++ b/sci-geosciences/librttopo/librttopo-1.1.0.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/librttopo" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" RDEPEND="sci-libs/geos" DEPEND="${RDEPEND}" diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest index bab06b26431f..e7db9bc9d6bb 100644 --- a/sci-geosciences/mapserver/Manifest +++ b/sci-geosciences/mapserver/Manifest @@ -1,3 +1,3 @@ -DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1 -EBUILD mapserver-8.0.1.ebuild 4940 BLAKE2B 51f02e80b40a9b1ae677d45a6da1d90a68f2ba8bd82027565a302be26315aec3d5a845d0aa0678095561786e32a9c07072ac090eeab9f1572969f20c80ced54a SHA512 8908f0f4ceb4f0140e76b7d2a50c36792e8995cb9e1776ada5cd8b5cc4e0a9507ae520fc289df138381d01db532f391fa240f520fe36e2655f74d5d02c2f1b38 +DIST mapserver-8.0.2.tar.gz 2957172 BLAKE2B fe9587afb9b805858478faa3a0a558283db6a29e0b131a605c9e2a2f20f8b8addaa8f2170997468db83164add5887bb521219a868404e88e47e907253c17c9cc SHA512 fbd0a77ba67429bd42a3450335b7a600f21e5565f620c6a1a195a0a4fb37e4091dbddc531d623765008d780ab6094da5bd3f29d3e0ec44465c6ac155ada71752 +EBUILD mapserver-8.0.2.ebuild 5545 BLAKE2B 82b8166d6e51ca625271d080140abc58f3083814d8b8f9544ce9fdc9ef2d73b317cbfbc77feb4bb0d2c9e605c3beeadf90d84abbd8578cbcfc7ea2e7337146af SHA512 56cc2843fc791b8c34665577fcf6a0ce948493a95d486b2cfde63eab8236419a0754e927dbf059523646be6a39e098937383c14b6e78664768c24f016f716b7a MISC metadata.xml 497 BLAKE2B b0517aa597d42116849e9f7ecdbf2cb2b479f5c57c7f0fe413dab870555abe82ac5dc07c624cabf769bfd2332300f2860e40cfd1ed375bafa109a347b670232b SHA512 3d58797fb05f9c45359e9ac2302a2432e9b61d300f1c01b27ef562da860311e777b7675b0f162eb2c490cdea0440c9f7b9a3323a89feef01589385ec30a5b64d diff --git a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild b/sci-geosciences/mapserver/mapserver-8.0.2.ebuild index 060fae52b9e2..91d7c76780a7 100644 --- a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild +++ b/sci-geosciences/mapserver/mapserver-8.0.2.ebuild @@ -1,25 +1,27 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) +JAVA_PKG_WANT_SOURCE="11" +JAVA_PKG_WANT_TARGET="11" WEBAPP_MANUAL_SLOT=yes WEBAPP_OPTIONAL=yes -inherit cmake depend.apache perl-functions python-r1 webapp +inherit cmake depend.apache java-pkg-opt-2 perl-functions python-r1 webapp DESCRIPTION="Development environment for building spatially enabled webapps" HOMEPAGE="https://mapserver.org/" SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz" LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk" -KEYWORDS="~amd64 ~x86" SLOT="0" +KEYWORDS="~amd64 ~x86" # NOTE: opengl removed for now as no support for it in upstream CMake -IUSE="apache bidi cairo geos mysql oracle perl postgis python" +IUSE="apache bidi cairo geos java mysql oracle perl postgis python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -71,6 +73,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig + java? ( + virtual/jdk + >=dev-lang/swig-4.0 + ) perl? ( >=dev-lang/swig-4.0 ) python? ( >=dev-lang/swig-4.0 @@ -83,6 +89,10 @@ want_apache2 apache pkg_setup() { use apache && webapp_pkg_setup use perl && perl_set_version + + if use java ; then + QA_SONAME="usr/$(get_libdir)/libjavamapscript.so" + fi } src_prepare() { @@ -97,6 +107,7 @@ _generate_cmake_args() { local args=( "-DCMAKE_SKIP_RPATH=ON" "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" + "-DCMAKE_INSTALL_SYSCONFDIR=/usr/share/${PN}" "-DWITH_CAIRO=OFF" "-DWITH_FCGI=OFF" "-DWITH_FRIBIDI=OFF" @@ -116,6 +127,10 @@ _generate_cmake_args() { } src_configure() { + if use java; then + export JAVA_HOME="$(java-config -g JAVA_HOME)" + fi + # NOTE: We could make this based on _generate_cmake_args, but # then we wouldn't be as-explicit about what is enabled/not, # and reliant on defaults not changing. @@ -123,6 +138,7 @@ src_configure() { local mycmakeargs=( "-DCMAKE_SKIP_RPATH=ON" "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" + "-DCMAKE_INSTALL_SYSCONFDIR=/usr/share/${PN}" "-DWITH_CLIENT_WMS=ON" "-DWITH_CLIENT_WFS=ON" "-DWITH_CURL=ON" @@ -141,6 +157,7 @@ src_configure() { "-DWITH_CAIRO=$(usex cairo ON OFF)" "-DWITH_FCGI=$(usex apache ON OFF)" "-DWITH_GEOS=$(usex geos ON OFF)" + "-DWITH_JAVA=$(usex java ON OFF)" "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)" "-DWITH_MYSQL=$(usex mysql ON OFF)" "-DWITH_FRIBIDI=$(usex bidi ON OFF)" @@ -183,6 +200,8 @@ src_install() { if use python ; then python_foreach_impl cmake_src_install python_foreach_impl python_optimize + remove_egg_info() { rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die; } + python_foreach_impl remove_egg_info fi # Install this last because this build is the most "fully-featured" @@ -193,6 +212,10 @@ src_install() { dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv webapp_src_install fi + + if use java ; then + java-pkg_dojar "${BUILD_DIR}"/mapscript/java/mapscript.jar + fi } pkg_postinst() { diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest index ebac8cfa69c8..2140f3325cfd 100644 --- a/sci-geosciences/osm-gps-map/Manifest +++ b/sci-geosciences/osm-gps-map/Manifest @@ -2,4 +2,4 @@ AUX osm-gps-map-1.1.0-gtk-doc-module.patch 392 BLAKE2B 73bdfd92240b7e96b05a3cf1c AUX osm-gps-map-1.1.0-no-maintainer-mode.patch 1048 BLAKE2B bd95f60bf9ba525e7bb9ffbc46a4003a4f00a19e156ba2a288aa0aff0a72fc2d5363004ef3e91aeb6d3c2caea43f710cf77dc76d61b26834be359558baae7af6 SHA512 e6cd05ca74d77851b4b40ec167bad20f1b06840378ef93f4f961fcf795212d5f0f5ae4198bd345143e0eb0418c4bfd9e59d62b69936ae68cccb24fb84d9f87fa DIST osm-gps-map-1.2.0.tar.gz 466817 BLAKE2B 727c5969b1ca1c681a6629cc0d35f5124e99de7116267e3135dc5dd926df4431b16045df3e1441eb1f7a68252b3bb451c26585b9907f16aec7800b9531631eaa SHA512 7d19a3f2afcaab6dd5d2fcf62a552f4f4481d494a8ce6a88f3db94d0037ade0679d1618107859c63cdc0cf72eb8c9380b435a4c3d9af68cd3f2595cc66bba747 EBUILD osm-gps-map-1.2.0.ebuild 927 BLAKE2B acdb65f185c41f2e6d43db66304640cd7da908655c8f21929c4d67ca66885b02fab8d2956d8add8f594d82664b77a4a5606476e486e33c25ceb08b4c08872d57 SHA512 e96ce414f0652a1c4f7898257d1c43ed89ea47a5412518fdafc1a759eae25d2fb40388ba17bec0cb908f61241ddecf7ae0328c51ec79afed4b96c7f187a97577 -MISC metadata.xml 328 BLAKE2B 44e8606a488dd6ec51cc32435e190db51291a5777ce18665adb42b8adc73309165d62a55b41491ce7f866dc295defc54cef6d482da6178b1568d5e7a178be86b SHA512 f6ab0806342f23e1770ba196718e838628bf6d7c8cf1e8c80f52d57585a01676a59f0e69d6891e3b07e7a092ee2eec998f7bcd98feec38e8553c08481dee5e13 +MISC metadata.xml 250 BLAKE2B 92a3ebd95cbac75a43e405c19f008bb38b6c9f175a66d87c36c164cc4ceb4acdf513723e6a103c2c32b24b32535d21a0234a739111da038390810d823e3d8367 SHA512 81c8a9108c6b8258db4a0ce02886554f9c57c9074cc82aeb279b12945fc48f2dabfcc53e9dd78201187b58be08db1db6a6c4ab47c235c2070fb4c8448bba6aee diff --git a/sci-geosciences/osm-gps-map/metadata.xml b/sci-geosciences/osm-gps-map/metadata.xml index 357b2be6f0cc..60c42deff2f0 100644 --- a/sci-geosciences/osm-gps-map/metadata.xml +++ b/sci-geosciences/osm-gps-map/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">nzjrs/osm-gps-map</remote-id> </upstream> diff --git a/sci-geosciences/owntracks-recorder/Manifest b/sci-geosciences/owntracks-recorder/Manifest index 691aa796961f..4120f4226028 100644 --- a/sci-geosciences/owntracks-recorder/Manifest +++ b/sci-geosciences/owntracks-recorder/Manifest @@ -1,4 +1,4 @@ AUX ot-recorder.initd 284 BLAKE2B 8aced95bce377b0c7802faa22084b417bf01ba1e8da6c1bb9793635eb6811a576ddae69b3fa192f95b99b38c1222e4544c836f3fab674c30b5655b29e79786bb SHA512 32e50a4267403fc17365b9a6f651636aaafa475448654d63522cd61a1d8b35581304e692202d2edd48c31c5cdb7d95af4bd3910fd0e08e9b3415b47c6e93d453 -DIST owntracks-recorder-0.9.7.tar.gz 4492791 BLAKE2B 008a75c52e381345b8a5d7fb8e1da808a66c6f94b367ef6bf937737e45ea7022cac4cfcf4632ffd8d87b682121b0ef59b007515d20cc163a8d3532a937c4d156 SHA512 e68e61ffeec864c46355e21e08656097a8b9828152fcf897da29ecbc8035f9a8d038580f230d6ab0f4d48289072545c7fb20f03d25bf8c3266af425db8bb4a65 -EBUILD owntracks-recorder-0.9.7.ebuild 2211 BLAKE2B 3a66b292a6d9029caf7df7984426045471fa8a21a69169d72d78bf6bc8ce130eb26486cd364d2dac07339d6f51487412f96bc4e0a24de202749c5d687e05c7f6 SHA512 9fed1136195353cf9c23344f5f392891160f3b952b1384f9003ec0568fe124d0bd5e05a2492317ed0d2de5a01fcf2605991dc2a665529eaf408ec5b3a08afeaf +DIST owntracks-recorder-0.9.8.tar.gz 4494495 BLAKE2B 9660419a6970040d6d629b9e6732a7f3311552797aa206d8fdd907dc5efa7e85f22249df0d7a79406d3e087b28fde939a8d8a41edc5235227424659dc752adb4 SHA512 0cf8ba002d95309ae3a51ed2c4c3f55b1aff6a53774c747853946a78344b5c30ce3041d034178ba5e0b52d580f9a51ff6d953fd71b08ec3953f22d772d0fa5bb +EBUILD owntracks-recorder-0.9.8.ebuild 2210 BLAKE2B 8c60a0e319fa3c7147d817c72312863292dd69a229b2adbb3c1f1f589f01dc0ba3743afb0e2294791402e44f7ada8d25db2ee58e3f8f1ca32e8f7437e76b67d5 SHA512 650c96505f8869b3aae9a02835f21ea5c9a52adece84a72e63b95ac26e3091ed759cdd3cba4f16597e15ed372df9701fe313fc9de76e63024bb6e39705824a63 MISC metadata.xml 946 BLAKE2B 1594712b2be05b7bd278766f3d9513fce7f95020f82ce001b4eda30fbb964da850bb7d0f233ffe8afb612856e067ed6c18945caaa0331a77ce18054e7c37f75a SHA512 0c103e05a62f95e6ad1ed9dc03c6bef4a34606b2c2d13c236cec15a2234de80e2e2a58f227de76f183d561384c08b87b350548975f2deba48ebe075d995b7a85 diff --git a/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.7.ebuild b/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.8.ebuild index 07e05344ddb2..e06c599341c4 100644 --- a/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.7.ebuild +++ b/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.8.ebuild @@ -11,6 +11,7 @@ MY_PN="ot-recorder" DESCRIPTION="Stores and accesses location data published by the OwnTracks apps" HOMEPAGE="https://owntracks.org" SRC_URI="https://github.com/${PN/-//}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P#*-}" LICENSE="GPL-2+ MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64" @@ -45,8 +46,6 @@ BDEPEND=" virtual/pkgconfig " -S="${WORKDIR}/${P#*-}" - pkg_setup() { use lua && lua-single_pkg_setup } diff --git a/sci-geosciences/pymap3d/Manifest b/sci-geosciences/pymap3d/Manifest index aabc79f0e70d..ddc0d9de53ab 100644 --- a/sci-geosciences/pymap3d/Manifest +++ b/sci-geosciences/pymap3d/Manifest @@ -1,3 +1,5 @@ DIST pymap3d-2.9.1.tar.gz 47889 BLAKE2B 5f070a8155719215f6a2b7a8a2585fdf855b47ff610ea86511e4e270eecd3d1c866aadf125f2f2a847f059678fe10e75c61e7c6edeaca78f62dfac43beacaa54 SHA512 ea294d5d9f9ae2b949f281c64023cd2bf4b3667ad9c76e794ac242ae833d70ed45a5a422561aede1d734108c3accbf5fda2aaadb00d27885754a8244e4fc4cb3 +DIST pymap3d-3.0.1.tar.gz 50752 BLAKE2B 98e522d92e8f4e42e59822e31340600c5f59f01576e7459425da2f38bdd74016b514ec2dbec56c39e960c1ee17b7b7271672824435f6ef5b3b96a239dce9722e SHA512 841fccae3c88f699ae19f5f4bd7d755c2065fd6e5b76f6aceb4933b6a093d34bc7b16ca88178c94f571c1a0248ca18265cdb5e580bf420314609768c871aea50 EBUILD pymap3d-2.9.1-r1.ebuild 600 BLAKE2B 5f1c5b171b4ed3f1cdb0883d2c515563aced2a8c8999965ed80daeb9ed8df9058290208621f452030713bd39e604011831f95fa5a891d9428c56c1e8cdde3948 SHA512 52413fe3791c1374eec8277bcdd9bc1748a0ae904320a99ef6150bb0aa193e5460b655f147e86cbbfc06a5851639f4b71399d94ae0cd605cce6b901aec123aba +EBUILD pymap3d-3.0.1.ebuild 601 BLAKE2B f91f333acece153504f310bdefafb942995773f020ab98359d9e064f102f882e763e72c44cb0b5ea396605d434871d9097edd4092b072b68db1ef3058bf5a8ec SHA512 47346da35b3d77ae836db5fd1182baf456e0a51f2b4af4dc75111a5a5027619dddc0536dd3a78bd362e72a6941b48d0deec628cdad0c63f373f48060e8043a18 MISC metadata.xml 334 BLAKE2B d06c1317ed24d6974cccd6d0107ad90ecae154c9f1b4828f6617d9e551083ff01c4228db08fccdd9d4e068e3b502c278223e55c026414aa74cd9c9fd8fe51e8d SHA512 d42097045fa3edccc57f895f4fd147461c09dee4b16b780366f0c5ab8938f441a33f3921b4478df3457ff100643a4a50527b86668cbe36dbad4eb5a60b77ac1b diff --git a/sci-geosciences/pymap3d/pymap3d-3.0.1.ebuild b/sci-geosciences/pymap3d/pymap3d-3.0.1.ebuild new file mode 100644 index 000000000000..245a3ba6f72a --- /dev/null +++ b/sci-geosciences/pymap3d/pymap3d-3.0.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Python 3-D coordinate conversions" +HOMEPAGE="https://github.com/geospace-code/pymap3d" +SRC_URI="https://github.com/geospace-code/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="test? ( + dev-python/xarray + dev-python/pyproj +)" + +distutils_enable_tests pytest + +src_prepare() { + rm src/pymap3d/tests/test_eci.py || die + default +} diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 36abf96a2b3e..e3565da5a63b 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,9 +1,14 @@ AUX qgis-3.28.10-protobuf-23.patch 1017 BLAKE2B 03ed23af23f00bd47ff74c043cfb5e14e379b9ec8bcd98acb2627662305d5e8966c310b8c6df247397571966ec5eb2e591d127ccf267c69ee9aa999046b948ae SHA512 e16633f60bba9a68a6b5d23ef756790d63a063a8ea973b54f4abe961b65bdd2d8c7e208a770af6b8e81626e6e31ad2b48ec009a9ce2782130f610532c506a770 AUX qgis-3.28.9-exiv2-0.28.patch 1399 BLAKE2B 37cf1dbeea654a037bc3248024252fac6837454ec97cd7729edcfb2f442cd4a8dedb4f7d6f8796113a4dc801f9498559da686503f01a6b9b4d22fc59e1179ec9 SHA512 c0dae878ef315110cba4a4bef8c1f2eba297f5db1cc34b03dfe336392ec4deb93fbd8c60f65345d359064322e2197ffa23aa23428e9e5e4fbd953e3611f259fc +AUX qgis-3.36.3-qt6-Fix-broken-test.patch 1091 BLAKE2B 5fc073355b71e4cc932c3a3f722af28e4f55f71829a74b7a751022c5434fe2ef088c47307fc9a34c4a60ea8fb967a71a6f631607147e2cf20282b8bcd5a6841b SHA512 8963408c5468f26ede039b82f95db766ca85a8458dd083604f19ec45d5a7bd3bcd6295b83104639570dbb8b4c69d90c2ba04a94d49df5689d056249497a3b01a +AUX qgis-3.36.3-qt6.patch 1523 BLAKE2B 2a79e10ea3cbccb75e2af8b59c717668c379159897c508ce5b9a471df0f4ff45a9f9e5511b5fbd7655c0e9137339ebbada1fcba18b65ce2998f3338eecbd55d5 SHA512 f108a26274acb8c7e871aa6dd214897873f31e521f9bc0811404b13d7025a8414c0f50e066afa281d23c085bf8bd846e60e75919f859b4e0456b330ea7728645 +AUX qgis-3.36.3-testReportDir.patch 651 BLAKE2B 04dcbad99cfd7156f284284cd165b39231de5ee29d45cd132d5afef7ceaa6197920385ffaf2f339c0ab943e2af2ceb5d5a232d3c5f9f753df7621d4d9ef9e18b SHA512 faf701cd2f83c966826933fbb9f8abbfdd3cce4278a6c9ace55641ce31fc7e8d282872aff7e7ea5a8e31f7590d94b53b608b0344daff3107f095914ebbcb0fe8 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56 -DIST qgis-3.36.1.tar.bz2 171472398 BLAKE2B 1bcd657d1bb715566975ec5aa5bff5a6f282b025c578370d1112a53d00865e18828343ec644f7bb9cff24922e50070c361cae93246f067df4566a4cbd629349b SHA512 e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273 +DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff +DIST qgis-3.38.3.tar.bz2 175959255 BLAKE2B 7fdc310cb8464bcc1b2168b14b661a41941c2ec22b5075f5c40796b15feeb8becec44e38905c6c970c94584b71e6d6798d0c072870f0f10555441db9399fa597 SHA512 ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d -EBUILD qgis-3.28.10.ebuild 11506 BLAKE2B c97b36829915ca90307b1881ae39945684ad6445bc7bef95c5e64215e9430fea6b6dc4aa286dd36b769fd92ed1d6fa657b335442c1e5fb44fad2ff76fb77cfc5 SHA512 40de0aa4183f1155081e1bf23fecb8e25c200eeb308a4a0b954899e0241ae01395142ccd501dea42bbd3b45255790dbcecc0bce384d909e457ce4ef1886f878d -EBUILD qgis-3.36.1.ebuild 11610 BLAKE2B bb4403eb004708735365e084cda82208c186922cef1f7f6f88a581bd04b06f9a52df12dd1db4ae7dbd4d0d03c5613d101878cf9f7ea10f2e65c2c19f391d41ab SHA512 09a86a2269682a93e8e6135c89a3a225fc1f2278f6f5d3ef0cd66f7b05716da8601350f920721773c63ca8c51875ec546b7e8a369feab0a24d946f94dc66acb6 -EBUILD qgis-9999.ebuild 11543 BLAKE2B 5613ec395a70295b6e00769de78b8cf7ee1ed7fd1dffe12f0d1dc99a37d29666f1eb30827d6174c305229fbdefbea5af97ece43d6c51eb6a271666dda2342fa9 SHA512 aeb591fb9beac201212b70995c2554de055db0af33400697086fbd8953a49624daedb0d9e1e3c73c064d1c07af23fa971ef43f3f02ec0a783149c4c9eb8346b4 -MISC metadata.xml 1603 BLAKE2B 8a9c8ba3036516fada20eb636dd22f45149188389e0926261d87ea8294c1fe6531ab819945977e535a16958d94a9dbbcc181f6b4ccc42e87ea66f46f9f542e7a SHA512 36d44b25022b5f96be7376efbb932d9f3d4fe90290929d88b2f2f5e1fcfab92b720bfbb3a73031bfec8e3ad95e37e22b3951cec5f045d75adf6e0cdcd3d57425 +EBUILD qgis-3.28.10.ebuild 11501 BLAKE2B de9db2760f0c4527f6dfd668b0b52006820b0a128ef6b0e3f5c0feee06152e831c54f4d8e271a4741280950e5b1da075fa687b6996593c9e1656c1b6090f8d5c SHA512 a42e3e061ee52f7433d70e37bbfe0a13753090e2630bdf68fa7d4bc8bbfb21ec2e5a7f2b1ea0d8f05a6ae22a5b2ed87b81747266f6f2a249a5f5d81cfe119727 +EBUILD qgis-3.38.0-r1.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e +EBUILD qgis-3.38.3.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e +EBUILD qgis-9999.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e +MISC metadata.xml 1696 BLAKE2B 21bdfb035c471861aea5ab8c4ce2e632bcb6dafa0bd3cd0733a3533288c4a6a8f2e5e313a39db8757f11f204d15ca73b3d9b779f3156e7682293db58d24ec20b SHA512 189003c5dec06dd14c57bff372b656dfa5e5febc942ef418782d31f80eeab0d93c7e44bc850719543f5de6b1e08a3e2b2c1596b964d58c942e35441f913b43c3 diff --git a/sci-geosciences/qgis/files/qgis-3.36.3-qt6-Fix-broken-test.patch b/sci-geosciences/qgis/files/qgis-3.36.3-qt6-Fix-broken-test.patch new file mode 100644 index 000000000000..0c4050271b10 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.36.3-qt6-Fix-broken-test.patch @@ -0,0 +1,29 @@ +From 3f87b7af8baff33e2ed31c60a32da30a5291a346 Mon Sep 17 00:00:00 2001 +From: Nyall Dawson <nyall.dawson@gmail.com> +Date: Mon, 29 Apr 2024 09:16:22 +1000 +Subject: [PATCH] Fix broken test + +This test was broken and not actually testing the QgsGeometry +operator, and breaks compilation under qt 6.7 +--- + tests/src/core/geometry/testqgsgeometry.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/src/core/geometry/testqgsgeometry.cpp b/tests/src/core/geometry/testqgsgeometry.cpp +index 5cbb5b6b8c01..18e410c7a9af 100644 +--- a/tests/src/core/geometry/testqgsgeometry.cpp ++++ b/tests/src/core/geometry/testqgsgeometry.cpp +@@ -1710,11 +1710,11 @@ void TestQgsGeometry::dataStream() + QCOMPARE( geom.constGet()->asWkt(), resultGeometry.constGet()->asWkt() ); + + //also test with geometry without data +- std::unique_ptr<QgsGeometry> emptyGeom( new QgsGeometry() ); ++ QgsGeometry emptyGeom; + + QByteArray ba2; + QDataStream ds2( &ba2, QIODevice::ReadWrite ); +- ds2 << emptyGeom.get(); ++ ds2 << emptyGeom; + + ds2.device()->seek( 0 ); + ds2 >> resultGeometry; diff --git a/sci-geosciences/qgis/files/qgis-3.36.3-qt6.patch b/sci-geosciences/qgis/files/qgis-3.36.3-qt6.patch new file mode 100644 index 000000000000..295c01b480fa --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.36.3-qt6.patch @@ -0,0 +1,42 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> +Subject: [PATCH] Build against Qt6 + +diff --git a/external/qspatialite/CMakeLists.txt b/external/qspatialite/CMakeLists.txt +index 33536da..61c7370 100644 +--- a/external/qspatialite/CMakeLists.txt ++++ b/external/qspatialite/CMakeLists.txt +@@ -7,11 +7,19 @@ add_definitions(-DQT_SHARED) + + include_directories(SYSTEM + ${SQLITE3_INCLUDE_DIR} +- ${Qt5Sql_PRIVATE_INCLUDE_DIRS} + ) ++if (BUILD_WITH_QT6) ++ include_directories(SYSTEM ${Qt6Sql_PRIVATE_INCLUDE_DIRS}) ++else() ++ include_directories(SYSTEM ${Qt5Sql_PRIVATE_INCLUDE_DIRS}) ++endif() + + set(QSQLSPATIALITE_SRC qsql_spatialite.cpp smain.cpp) +-QT5_WRAP_CPP(QSQLSPATIALITE_SRC qsql_spatialite.h smain.h) ++if (BUILD_WITH_QT6) ++ QT6_WRAP_CPP(QSQLSPATIALITE_SRC qsql_spatialite.h smain.h) ++else() ++ QT5_WRAP_CPP(QSQLSPATIALITE_SRC qsql_spatialite.h smain.h) ++endif() + + add_library(qsqlspatialite SHARED ${QSQLSPATIALITE_SRC}) + target_link_libraries(qsqlspatialite +diff --git a/external/qspatialite/qsql_spatialite.cpp b/external/qspatialite/qsql_spatialite.cpp +index 0e8f15a..9e30004 100644 +--- a/external/qspatialite/qsql_spatialite.cpp ++++ b/external/qspatialite/qsql_spatialite.cpp +@@ -632,7 +632,7 @@ bool QSpatiaLiteDriver::open( const QString &db, const QString &, const QString + bool openReadOnlyOption = false; + bool openUriOption = false; + +- const auto opts = conOpts.splitRef( QLatin1Char( ';' ) ); ++ const auto opts = conOpts.split( u';' ); + for ( auto option : opts ) + { + option = option.trimmed(); diff --git a/sci-geosciences/qgis/files/qgis-3.36.3-testReportDir.patch b/sci-geosciences/qgis/files/qgis-3.36.3-testReportDir.patch new file mode 100644 index 000000000000..c8abe302104a --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.36.3-testReportDir.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/qgsrenderchecker.cpp b/src/core/qgsrenderchecker.cpp +index c75985a..4696f18 100644 +--- a/src/core/qgsrenderchecker.cpp ++++ b/src/core/qgsrenderchecker.cpp +@@ -54,7 +54,7 @@ QgsRenderChecker::QgsRenderChecker() + QDir QgsRenderChecker::testReportDir() + { + if ( qgetenv( "QGIS_CONTINUOUS_INTEGRATION_RUN" ) == QStringLiteral( "true" ) ) +- return QDir( QDir( "/root/QGIS" ).filePath( QStringLiteral( "qgis_test_report" ) ) ); ++ return QDir( QDir( qgetenv( "CMAKE_SOURCE_DIR" ) ).filePath( QStringLiteral( "qgis_test_report" ) ) ); + else + return QDir( QDir::temp().filePath( QStringLiteral( "qgis_test_report" ) ) ); + } diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index 6a7c8a916f27..8116d12198d2 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -24,6 +24,7 @@ <flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag> <flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag> <flag name="serial">Enable support for serial GPS using <pkg>dev-qt/qtserialport</pkg></flag> + <flag name="webengine">Enable webengine support using <pkg>dev-qt/qtwebengine</pkg></flag> </use> <upstream> <remote-id type="github">qgis/QGIS</remote-id> diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild index 6b2233260c1e..bff6a620ed00 100644 --- a/sci-geosciences/qgis/qgis-3.28.10.ebuild +++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild @@ -16,7 +16,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" fi inherit cmake flag-o-matic python-single-r1 virtualx xdg diff --git a/sci-geosciences/qgis/qgis-3.36.1.ebuild b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild index f0cc12843e19..0284f8d105e8 100644 --- a/sci-geosciences/qgis/qgis-3.36.1.ebuild +++ b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild @@ -16,7 +16,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" fi inherit cmake flag-o-matic python-single-r1 virtualx xdg @@ -25,49 +25,40 @@ HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) - test? ( postgres ) " +# test? ( postgres ) # Disabling test suite because upstream disallow running from install path RESTRICT="!test? ( test )" -# At some point the dependency on qwtpolar should be -# replaced with a dependency on qwt[polar]. Currently -# it does not build with qwt-6.2[polar] though. COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] + app-crypt/qca:2[qt6,ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= - dev-libs/qtkeychain[qt5(+)] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 + dev-libs/qtkeychain[qt6] + dev-qt/qttools:6[designer] + dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] + dev-qt/qtmultimedia:6 + dev-qt/qtpositioning:6 + dev-qt/qtserialport:6 + dev-qt/qtsvg:6 + dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( dev-qt/qt3d:5 ) + >=x11-libs/qscintilla-2.10.1:=[qt6] + >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] + 3d? ( dev-qt/qt3d:6 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) @@ -79,7 +70,6 @@ COMMON_DEPEND=" sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} @@ -91,47 +81,65 @@ COMMON_DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/owslib[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] ') ) - qml? ( dev-qt/qtdeclarative:5 ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) " DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 + test? ( + python? ( + app-text/qpdf + app-text/poppler[cairo,utils] + ) + ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 + dev-qt/qttools:6[linguist] app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( - $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - dev-python/nose2[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ') + python? ( + $(python_gen_cond_dep ' + dev-python/PyQt6[${PYTHON_USEDEP},testlib] + dev-python/nose2[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ') + ) ) " +PATCHES=( + # "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch" + "${FILESDIR}/${PN}-3.36.3-qt6.patch" + "${FILESDIR}/${PN}-3.36.3-testReportDir.patch" +) + src_prepare() { cmake_src_prepare # Tests want to be run inside a git repo if [[ ${PV} != *9999* ]]; then if use test; then + git config --global --add safe.directory "${S}" || die git init -q || die - git config user.email "larry@gentoo.org" || die - git config user.name "Larry the Cow" || die + git config --local gc.auto 0 || die + git config --local user.email "larry@gentoo.org" || die + git config --local user.name "Larry the Cow" || die git add . || die + git commit -m "init" || die fi fi @@ -150,11 +158,14 @@ src_configure() { -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 - -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml + + # -DQWT_INCLUDE_DIR=/usr/include/qwt6 + # -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so + # -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml + -DPEDANTIC=OFF -DUSE_CCACHE=OFF + -DBUILD_WITH_QT6=ON -DWITH_ANALYSIS=ON -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON @@ -168,7 +179,8 @@ src_configure() { $(cmake_use_find_package netcdf NetCDF) -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) + -DWITH_QWTPOLAR=ON + -DWITH_QTWEBENGINE=$(usex webengine) -DWITH_PDAL=$(usex pdal) -DWITH_POSTGRESQL=$(usex postgres) -DWITH_BINDINGS=$(usex python) @@ -193,7 +205,7 @@ src_configure() { GRASSDIR=/usr/$(get_libdir)/${grassdir} - einfo "Supported versions: ${supported_grass_versions[@]}" + einfo "Supported versions: ${supported_grass_versions[*]}" einfo "Found GRASS version: ${v[0]}*" local known_grass_version @@ -229,25 +241,192 @@ src_configure() { CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 - cmake_src_configure } src_test() { - local myctestargs=( - # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 - -E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_core_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimitedTextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)' + addwrite "/proc/self/mem" + addwrite "/proc/self/task/" + addwrite "/dev/fuse" + + local -x CMAKE_SKIP_TESTS=( + PyQgsAFSProvider$ + PyQgsAnnotation$ + PyQgsAuthenticationSystem$ + PyQgsAuxiliaryStorage$ + PyQgsBlockingNetworkRequest$ + PyQgsBlockingProcess$ + PyQgsCodeEditor$ + PyQgsDataItemProviderRegistry$ + PyQgsDelimitedTextProvider$ + PyQgsEditWidgets$ + PyQgsElevationProfileCanvas$ + PyQgsEmbeddedSymbolRenderer$ + PyQgsExternalStorageAwsS3$ + PyQgsExternalStorageWebDav$ + PyQgsFileDownloader$ + PyQgsFloatingWidget$ + PyQgsGeometryTest$ + PyQgsGoogleMapsGeocoder$ + PyQgsGroupLayer$ + PyQgsLayerDefinition$ + PyQgsLayoutHtml$ + PyQgsLayoutLegend$ + PyQgsLayoutMap$ + PyQgsLineSymbolLayers$ + PyQgsMapBoxGlStyleConverter$ + PyQgsMapLayerComboBox$ + PyQgsMapLayerProxyModel$ + PyQgsMemoryProvider$ + PyQgsNetworkAccessManager$ + PyQgsOGRProvider$ + PyQgsOGRProviderGpkg$ + PyQgsPainting$ + PyQgsPalLabelingCanvas$ + PyQgsPalLabelingLayout$ + PyQgsPalLabelingPlacement$ + PyQgsPlot$ + PyQgsPointCloudAttributeByRampRenderer$ + PyQgsPointCloudClassifiedRenderer$ + PyQgsPointCloudRgbRenderer$ + PyQgsProcessExecutablePt1$ + PyQgsProcessExecutablePt2$ + PyQgsProcessingAlgRunner$ + PyQgsProcessingInPlace$ + PyQgsProcessingPackageLayersAlgorithm$ + PyQgsProcessingParameters$ + PyQgsProject$ + PyQgsPythonProvider$ + PyQgsRasterFileWriter$ + PyQgsRasterLayer$ + PyQgsRasterLayerRenderer$ + PyQgsSelectiveMasking$ + PyQgsSettings$ + PyQgsSettingsEntry$ + PyQgsShapefileProvider$ + PyQgsSpatialiteProvider$ + PyQgsStyleModel$ + PyQgsSvgCache$ + PyQgsSymbolLayerReadSld$ + PyQgsTextRenderer$ + PyQgsVectorFileWriter$ + PyQgsVectorLayerCache$ + PyQgsVectorLayerEditBuffer$ + PyQgsVectorLayerEditUtils$ + PyQgsVectorLayerProfileGenerator$ + PyQgsWFSProvider$ + TestQgsRandomMarkerSymbolLayer$ + qgis_sip_uptodate$ + test_3d_3drendering$ + test_3d_layout3dmap$ + test_3d_mesh3drendering$ + test_3d_pointcloud3drendering$ + test_3d_tessellator$ + test_analysis_gcptransformer$ + test_app_advanceddigitizing$ + test_authmethod_authoauth2method$ + test_core_mapdevicepixelratio$ + test_core_ogcutils$ + test_core_openclutils$ + test_core_vectortilelayer$ + test_gui_dockwidget$ + test_gui_ogrprovidergui$ + + PyQgsDocCoverage$ + PyQgsSipCoverage$ + ) + + CMAKE_SKIP_TESTS+=( + test_core_blendmodes$ + test_core_callout$ + test_core_compositionconverter$ + test_core_dataitem$ + test_core_expression$ + test_core_gdalutils$ + test_core_labelingengine$ + test_core_layoutmap$ + test_core_layoutmapoverview$ + test_core_layoutpicture$ + test_core_linefillsymbol$ + test_core_maprendererjob$ + test_core_maprotation$ + test_core_meshlayer$ + test_core_meshlayerrenderer$ + test_core_networkaccessmanager$ + test_core_pointcloudlayerexporter$ + test_core_project$ + test_core_rastercontourrenderer$ + test_core_rasterlayer$ + test_core_simplemarker$ + test_core_tiledownloadmanager$ + test_gui_processinggui$ + test_gui_filedownloader$ + test_gui_newdatabasetablewidget$ + test_gui_queryresultwidget$ + test_analysis_processingalgspt2$ + test_analysis_meshcontours$ + test_analysis_triangulation$ + test_analysis_processing$ + test_provider_wcsprovider$ + test_app_maptoolcircularstring$ + test_app_vertextool$ + ) + + if ! use netcdf; then + CMAKE_SKIP_TESTS+=( + test_core_gdalprovider$ + ) + fi + + if ! use hdf5; then + CMAKE_SKIP_TESTS+=( + test_gui_meshlayerpropertiesdialog$ + test_app_maptooleditmesh$ + ) + fi + + if ! use python || ! use postgres; then + CMAKE_SKIP_TESTS+=( + ProcessingGrassAlgorithmsRasterTestPt2$ + ProcessingCheckValidityAlgorithmTest$ + ProcessingGdalAlgorithmsGeneralTest$ + ProcessingGdalAlgorithmsRasterTest$ + ProcessingGdalAlgorithmsVectorTest$ + ProcessingGeneralTest$ + ProcessingGenericAlgorithmsTest$ + ProcessingGrassAlgorithmsImageryTest$ + ProcessingGrassAlgorithmsRasterTestPt1$ + ProcessingGrassAlgorithmsVectorTest$ + ProcessingGuiTest$ + ProcessingModelerTest$ + ProcessingParametersTest$ + ProcessingProjectProviderTest$ + ProcessingQgisAlgorithmsTestPt1$ + ProcessingQgisAlgorithmsTestPt2$ + ProcessingQgisAlgorithmsTestPt3$ + ProcessingQgisAlgorithmsTestPt4$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingScriptUtilsTest$ + ProcessingToolsTest$ + ) + fi + local myctestargs=( --output-on-failure + -j1 ) - virtx cmake_src_test -j1 + xdg_environment_reset + + local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true" + virtx cmake_src_test } src_install() { + if use test; then + git config --global --add safe.directory "${S}" || die + fi cmake_src_install insinto /usr/share/mime/packages @@ -256,7 +435,7 @@ src_install() { if use examples; then docinto examples dodoc -r "${WORKDIR}"/qgis_sample_data/. - docompress -x /usr/share/doc/${PF}/examples + docompress -x "/usr/share/doc/${PF}/examples" fi if use python; then diff --git a/sci-geosciences/qgis/qgis-3.38.3.ebuild b/sci-geosciences/qgis/qgis-3.38.3.ebuild new file mode 100644 index 000000000000..0284f8d105e8 --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.38.3.ebuild @@ -0,0 +1,464 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite" + +# We only package the LTS releases right now +# We could package more but would ideally only stabilise the LTS ones +# at least. + +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" +fi +inherit cmake flag-o-matic python-single-r1 virtualx xdg + +DESCRIPTION="User friendly Geographic Information System" +HOMEPAGE="https://www.qgis.org/" + +LICENSE="GPL-2+ GPL-3+" +SLOT="0" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + mapserver? ( python ) +" +# test? ( postgres ) + +# Disabling test suite because upstream disallow running from install path +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + app-crypt/qca:2[qt6,ssl] + >=dev-db/spatialite-4.2.0 + dev-db/sqlite:3 + dev-libs/expat + dev-libs/libzip:= + dev-libs/protobuf:= + dev-libs/qtkeychain[qt6] + dev-qt/qttools:6[designer] + dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] + dev-qt/qtmultimedia:6 + dev-qt/qtpositioning:6 + dev-qt/qtserialport:6 + dev-qt/qtsvg:6 + dev-vcs/git + media-gfx/exiv2:= + >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] + sci-libs/geos + sci-libs/libspatialindex:= + >=sci-libs/proj-4.9.3:= + sys-libs/zlib + >=x11-libs/qscintilla-2.10.1:=[qt6] + >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] + 3d? ( dev-qt/qt3d:6 ) + georeferencer? ( sci-libs/gsl:= ) + grass? ( sci-geosciences/grass:= ) + hdf5? ( sci-libs/hdf5:= ) + mapserver? ( dev-libs/fcgi ) + netcdf? ( sci-libs/netcdf:= ) + opencl? ( virtual/opencl ) + oracle? ( + dev-db/oracle-instantclient:= + sci-libs/gdal:=[oracle] + ) + pdal? ( sci-libs/pdal:= ) + postgres? ( dev-db/postgresql:= ) + python? ( + ${PYTHON_DEPS} + >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/owslib[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] + ') + ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) +" +DEPEND="${COMMON_DEPEND} + test? ( + python? ( + app-text/qpdf + app-text/poppler[cairo,utils] + ) + ) +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" +BDEPEND="${PYTHON_DEPS} + dev-qt/qttools:6[linguist] + app-alternatives/yacc + app-alternatives/lex + doc? ( app-text/doxygen ) + test? ( + python? ( + $(python_gen_cond_dep ' + dev-python/PyQt6[${PYTHON_USEDEP},testlib] + dev-python/nose2[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ') + ) + ) +" + +PATCHES=( + # "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch" + "${FILESDIR}/${PN}-3.36.3-qt6.patch" + "${FILESDIR}/${PN}-3.36.3-testReportDir.patch" +) + +src_prepare() { + cmake_src_prepare + # Tests want to be run inside a git repo + if [[ ${PV} != *9999* ]]; then + if use test; then + git config --global --add safe.directory "${S}" || die + git init -q || die + git config --local gc.auto 0 || die + git config --local user.email "larry@gentoo.org" || die + git config --local user.name "Larry the Cow" || die + git add . || die + + git commit -m "init" || die + fi + fi +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862660 + # https://github.com/qgis/QGIS/issues/56859 + # + # Do not trust with LTO either + append-flags -fno-strict-aliasing + filter-lto + + 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 + # -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml + + -DPEDANTIC=OFF + -DUSE_CCACHE=OFF + -DBUILD_WITH_QT6=ON + -DWITH_ANALYSIS=ON + -DWITH_APIDOC=$(usex doc) + -DWITH_GUI=ON + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=$(usex test) + -DWITH_3D=$(usex 3d) + -DWITH_GSL=$(usex georeferencer) + $(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=ON + -DWITH_QTWEBENGINE=$(usex webengine) + -DWITH_PDAL=$(usex pdal) + -DWITH_POSTGRESQL=$(usex postgres) + -DWITH_BINDINGS=$(usex python) + -DWITH_CUSTOM_WIDGETS=$(usex python) + -DWITH_QUICK=$(usex qml) + -DWITH_QTWEBKIT=OFF + -DWITH_DRACO=OFF + ) + + # We list all supported versions *by upstream for this version* + # here, even if we're not allowing it (e.g. bugs for now), so + # we enable/disable all the right versions. This is so qgis doesn't + # try to automatically use a version the build system knows about. + local supported_grass_versions=( 7 8 ) + if use grass; then + # We can do this because we have a := dep on grass & + # it changes subslot (ABI) when major versions change, so + # the logic here doesn't end up becoming stale. + readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)" + readarray -d'.' -t v <<<"${f[2]}" + grassdir="grass${v[0]}${v[1]}" + + GRASSDIR=/usr/$(get_libdir)/${grassdir} + + einfo "Supported versions: ${supported_grass_versions[*]}" + einfo "Found GRASS version: ${v[0]}*" + + local known_grass_version + # GRASS isn't slotted (in Gentoo, anyway) so we pick + # the best version we can to build against, and disable the others. + for known_grass_version in "${supported_grass_versions[@]}" ; do + case "${known_grass_version}" in + "${v[0]}") + einfo "GRASS version ${known_grass_version} is supported. Enabling." + mycmakeargs+=( + "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}" + "-DWITH_GRASS${known_grass_version}=ON" + ) + ;; + *) + einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling." + mycmakeargs+=( + "-DWITH_GRASS${known_grass_version}=OFF" + ) + ;; + esac + done + else + local known_grass_version + for known_grass_version in "${supported_grass_versions[@]}" ; do + mycmakeargs+=( + "-DWITH_GRASS${known_grass_version}=OFF" + ) + done + fi + + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + + CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging + + cmake_src_configure +} + +src_test() { + addwrite "/proc/self/mem" + addwrite "/proc/self/task/" + addwrite "/dev/fuse" + + local -x CMAKE_SKIP_TESTS=( + PyQgsAFSProvider$ + PyQgsAnnotation$ + PyQgsAuthenticationSystem$ + PyQgsAuxiliaryStorage$ + PyQgsBlockingNetworkRequest$ + PyQgsBlockingProcess$ + PyQgsCodeEditor$ + PyQgsDataItemProviderRegistry$ + PyQgsDelimitedTextProvider$ + PyQgsEditWidgets$ + PyQgsElevationProfileCanvas$ + PyQgsEmbeddedSymbolRenderer$ + PyQgsExternalStorageAwsS3$ + PyQgsExternalStorageWebDav$ + PyQgsFileDownloader$ + PyQgsFloatingWidget$ + PyQgsGeometryTest$ + PyQgsGoogleMapsGeocoder$ + PyQgsGroupLayer$ + PyQgsLayerDefinition$ + PyQgsLayoutHtml$ + PyQgsLayoutLegend$ + PyQgsLayoutMap$ + PyQgsLineSymbolLayers$ + PyQgsMapBoxGlStyleConverter$ + PyQgsMapLayerComboBox$ + PyQgsMapLayerProxyModel$ + PyQgsMemoryProvider$ + PyQgsNetworkAccessManager$ + PyQgsOGRProvider$ + PyQgsOGRProviderGpkg$ + PyQgsPainting$ + PyQgsPalLabelingCanvas$ + PyQgsPalLabelingLayout$ + PyQgsPalLabelingPlacement$ + PyQgsPlot$ + PyQgsPointCloudAttributeByRampRenderer$ + PyQgsPointCloudClassifiedRenderer$ + PyQgsPointCloudRgbRenderer$ + PyQgsProcessExecutablePt1$ + PyQgsProcessExecutablePt2$ + PyQgsProcessingAlgRunner$ + PyQgsProcessingInPlace$ + PyQgsProcessingPackageLayersAlgorithm$ + PyQgsProcessingParameters$ + PyQgsProject$ + PyQgsPythonProvider$ + PyQgsRasterFileWriter$ + PyQgsRasterLayer$ + PyQgsRasterLayerRenderer$ + PyQgsSelectiveMasking$ + PyQgsSettings$ + PyQgsSettingsEntry$ + PyQgsShapefileProvider$ + PyQgsSpatialiteProvider$ + PyQgsStyleModel$ + PyQgsSvgCache$ + PyQgsSymbolLayerReadSld$ + PyQgsTextRenderer$ + PyQgsVectorFileWriter$ + PyQgsVectorLayerCache$ + PyQgsVectorLayerEditBuffer$ + PyQgsVectorLayerEditUtils$ + PyQgsVectorLayerProfileGenerator$ + PyQgsWFSProvider$ + TestQgsRandomMarkerSymbolLayer$ + qgis_sip_uptodate$ + test_3d_3drendering$ + test_3d_layout3dmap$ + test_3d_mesh3drendering$ + test_3d_pointcloud3drendering$ + test_3d_tessellator$ + test_analysis_gcptransformer$ + test_app_advanceddigitizing$ + test_authmethod_authoauth2method$ + test_core_mapdevicepixelratio$ + test_core_ogcutils$ + test_core_openclutils$ + test_core_vectortilelayer$ + test_gui_dockwidget$ + test_gui_ogrprovidergui$ + + PyQgsDocCoverage$ + PyQgsSipCoverage$ + ) + + CMAKE_SKIP_TESTS+=( + test_core_blendmodes$ + test_core_callout$ + test_core_compositionconverter$ + test_core_dataitem$ + test_core_expression$ + test_core_gdalutils$ + test_core_labelingengine$ + test_core_layoutmap$ + test_core_layoutmapoverview$ + test_core_layoutpicture$ + test_core_linefillsymbol$ + test_core_maprendererjob$ + test_core_maprotation$ + test_core_meshlayer$ + test_core_meshlayerrenderer$ + test_core_networkaccessmanager$ + test_core_pointcloudlayerexporter$ + test_core_project$ + test_core_rastercontourrenderer$ + test_core_rasterlayer$ + test_core_simplemarker$ + test_core_tiledownloadmanager$ + test_gui_processinggui$ + test_gui_filedownloader$ + test_gui_newdatabasetablewidget$ + test_gui_queryresultwidget$ + test_analysis_processingalgspt2$ + test_analysis_meshcontours$ + test_analysis_triangulation$ + test_analysis_processing$ + test_provider_wcsprovider$ + test_app_maptoolcircularstring$ + test_app_vertextool$ + ) + + if ! use netcdf; then + CMAKE_SKIP_TESTS+=( + test_core_gdalprovider$ + ) + fi + + if ! use hdf5; then + CMAKE_SKIP_TESTS+=( + test_gui_meshlayerpropertiesdialog$ + test_app_maptooleditmesh$ + ) + fi + + if ! use python || ! use postgres; then + CMAKE_SKIP_TESTS+=( + ProcessingGrassAlgorithmsRasterTestPt2$ + ProcessingCheckValidityAlgorithmTest$ + ProcessingGdalAlgorithmsGeneralTest$ + ProcessingGdalAlgorithmsRasterTest$ + ProcessingGdalAlgorithmsVectorTest$ + ProcessingGeneralTest$ + ProcessingGenericAlgorithmsTest$ + ProcessingGrassAlgorithmsImageryTest$ + ProcessingGrassAlgorithmsRasterTestPt1$ + ProcessingGrassAlgorithmsVectorTest$ + ProcessingGuiTest$ + ProcessingModelerTest$ + ProcessingParametersTest$ + ProcessingProjectProviderTest$ + ProcessingQgisAlgorithmsTestPt1$ + ProcessingQgisAlgorithmsTestPt2$ + ProcessingQgisAlgorithmsTestPt3$ + ProcessingQgisAlgorithmsTestPt4$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingScriptUtilsTest$ + ProcessingToolsTest$ + ) + fi + + local myctestargs=( + --output-on-failure + -j1 + ) + + xdg_environment_reset + + local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true" + virtx cmake_src_test +} + +src_install() { + if use test; then + git config --global --add safe.directory "${S}" || die + fi + 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/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 1c5971b726cc..0284f8d105e8 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -16,7 +16,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" fi inherit cmake flag-o-matic python-single-r1 virtualx xdg @@ -25,49 +25,40 @@ HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) - test? ( postgres ) " +# test? ( postgres ) # Disabling test suite because upstream disallow running from install path RESTRICT="!test? ( test )" -# At some point the dependency on qwtpolar should be -# replaced with a dependency on qwt[polar]. Currently -# it does not build with qwt-6.2[polar] though. COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] + app-crypt/qca:2[qt6,ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= - dev-libs/qtkeychain[qt5(+)] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 + dev-libs/qtkeychain[qt6] + dev-qt/qttools:6[designer] + dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] + dev-qt/qtmultimedia:6 + dev-qt/qtpositioning:6 + dev-qt/qtserialport:6 + dev-qt/qtsvg:6 + dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( dev-qt/qt3d:5 ) + >=x11-libs/qscintilla-2.10.1:=[qt6] + >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] + 3d? ( dev-qt/qt3d:6 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) @@ -79,7 +70,6 @@ COMMON_DEPEND=" sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} @@ -91,47 +81,65 @@ COMMON_DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/owslib[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] ') ) - qml? ( dev-qt/qtdeclarative:5 ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) " DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 + test? ( + python? ( + app-text/qpdf + app-text/poppler[cairo,utils] + ) + ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 + dev-qt/qttools:6[linguist] app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( - $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - dev-python/nose2[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ') + python? ( + $(python_gen_cond_dep ' + dev-python/PyQt6[${PYTHON_USEDEP},testlib] + dev-python/nose2[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ') + ) ) " +PATCHES=( + # "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch" + "${FILESDIR}/${PN}-3.36.3-qt6.patch" + "${FILESDIR}/${PN}-3.36.3-testReportDir.patch" +) + src_prepare() { cmake_src_prepare # Tests want to be run inside a git repo if [[ ${PV} != *9999* ]]; then if use test; then + git config --global --add safe.directory "${S}" || die git init -q || die - git config user.email "larry@gentoo.org" || die - git config user.name "Larry the Cow" || die + git config --local gc.auto 0 || die + git config --local user.email "larry@gentoo.org" || die + git config --local user.name "Larry the Cow" || die git add . || die + git commit -m "init" || die fi fi @@ -150,11 +158,14 @@ src_configure() { -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 - -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml + + # -DQWT_INCLUDE_DIR=/usr/include/qwt6 + # -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so + # -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml + -DPEDANTIC=OFF -DUSE_CCACHE=OFF + -DBUILD_WITH_QT6=ON -DWITH_ANALYSIS=ON -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON @@ -168,7 +179,8 @@ src_configure() { $(cmake_use_find_package netcdf NetCDF) -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) + -DWITH_QWTPOLAR=ON + -DWITH_QTWEBENGINE=$(usex webengine) -DWITH_PDAL=$(usex pdal) -DWITH_POSTGRESQL=$(usex postgres) -DWITH_BINDINGS=$(usex python) @@ -193,7 +205,7 @@ src_configure() { GRASSDIR=/usr/$(get_libdir)/${grassdir} - einfo "Supported versions: ${supported_grass_versions[@]}" + einfo "Supported versions: ${supported_grass_versions[*]}" einfo "Found GRASS version: ${v[0]}*" local known_grass_version @@ -227,25 +239,194 @@ src_configure() { use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 + CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging cmake_src_configure } src_test() { - local myctestargs=( - # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 - -E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_core_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimitedTextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)' + addwrite "/proc/self/mem" + addwrite "/proc/self/task/" + addwrite "/dev/fuse" + + local -x CMAKE_SKIP_TESTS=( + PyQgsAFSProvider$ + PyQgsAnnotation$ + PyQgsAuthenticationSystem$ + PyQgsAuxiliaryStorage$ + PyQgsBlockingNetworkRequest$ + PyQgsBlockingProcess$ + PyQgsCodeEditor$ + PyQgsDataItemProviderRegistry$ + PyQgsDelimitedTextProvider$ + PyQgsEditWidgets$ + PyQgsElevationProfileCanvas$ + PyQgsEmbeddedSymbolRenderer$ + PyQgsExternalStorageAwsS3$ + PyQgsExternalStorageWebDav$ + PyQgsFileDownloader$ + PyQgsFloatingWidget$ + PyQgsGeometryTest$ + PyQgsGoogleMapsGeocoder$ + PyQgsGroupLayer$ + PyQgsLayerDefinition$ + PyQgsLayoutHtml$ + PyQgsLayoutLegend$ + PyQgsLayoutMap$ + PyQgsLineSymbolLayers$ + PyQgsMapBoxGlStyleConverter$ + PyQgsMapLayerComboBox$ + PyQgsMapLayerProxyModel$ + PyQgsMemoryProvider$ + PyQgsNetworkAccessManager$ + PyQgsOGRProvider$ + PyQgsOGRProviderGpkg$ + PyQgsPainting$ + PyQgsPalLabelingCanvas$ + PyQgsPalLabelingLayout$ + PyQgsPalLabelingPlacement$ + PyQgsPlot$ + PyQgsPointCloudAttributeByRampRenderer$ + PyQgsPointCloudClassifiedRenderer$ + PyQgsPointCloudRgbRenderer$ + PyQgsProcessExecutablePt1$ + PyQgsProcessExecutablePt2$ + PyQgsProcessingAlgRunner$ + PyQgsProcessingInPlace$ + PyQgsProcessingPackageLayersAlgorithm$ + PyQgsProcessingParameters$ + PyQgsProject$ + PyQgsPythonProvider$ + PyQgsRasterFileWriter$ + PyQgsRasterLayer$ + PyQgsRasterLayerRenderer$ + PyQgsSelectiveMasking$ + PyQgsSettings$ + PyQgsSettingsEntry$ + PyQgsShapefileProvider$ + PyQgsSpatialiteProvider$ + PyQgsStyleModel$ + PyQgsSvgCache$ + PyQgsSymbolLayerReadSld$ + PyQgsTextRenderer$ + PyQgsVectorFileWriter$ + PyQgsVectorLayerCache$ + PyQgsVectorLayerEditBuffer$ + PyQgsVectorLayerEditUtils$ + PyQgsVectorLayerProfileGenerator$ + PyQgsWFSProvider$ + TestQgsRandomMarkerSymbolLayer$ + qgis_sip_uptodate$ + test_3d_3drendering$ + test_3d_layout3dmap$ + test_3d_mesh3drendering$ + test_3d_pointcloud3drendering$ + test_3d_tessellator$ + test_analysis_gcptransformer$ + test_app_advanceddigitizing$ + test_authmethod_authoauth2method$ + test_core_mapdevicepixelratio$ + test_core_ogcutils$ + test_core_openclutils$ + test_core_vectortilelayer$ + test_gui_dockwidget$ + test_gui_ogrprovidergui$ + + PyQgsDocCoverage$ + PyQgsSipCoverage$ + ) + CMAKE_SKIP_TESTS+=( + test_core_blendmodes$ + test_core_callout$ + test_core_compositionconverter$ + test_core_dataitem$ + test_core_expression$ + test_core_gdalutils$ + test_core_labelingengine$ + test_core_layoutmap$ + test_core_layoutmapoverview$ + test_core_layoutpicture$ + test_core_linefillsymbol$ + test_core_maprendererjob$ + test_core_maprotation$ + test_core_meshlayer$ + test_core_meshlayerrenderer$ + test_core_networkaccessmanager$ + test_core_pointcloudlayerexporter$ + test_core_project$ + test_core_rastercontourrenderer$ + test_core_rasterlayer$ + test_core_simplemarker$ + test_core_tiledownloadmanager$ + test_gui_processinggui$ + test_gui_filedownloader$ + test_gui_newdatabasetablewidget$ + test_gui_queryresultwidget$ + test_analysis_processingalgspt2$ + test_analysis_meshcontours$ + test_analysis_triangulation$ + test_analysis_processing$ + test_provider_wcsprovider$ + test_app_maptoolcircularstring$ + test_app_vertextool$ + ) + + if ! use netcdf; then + CMAKE_SKIP_TESTS+=( + test_core_gdalprovider$ + ) + fi + + if ! use hdf5; then + CMAKE_SKIP_TESTS+=( + test_gui_meshlayerpropertiesdialog$ + test_app_maptooleditmesh$ + ) + fi + + if ! use python || ! use postgres; then + CMAKE_SKIP_TESTS+=( + ProcessingGrassAlgorithmsRasterTestPt2$ + ProcessingCheckValidityAlgorithmTest$ + ProcessingGdalAlgorithmsGeneralTest$ + ProcessingGdalAlgorithmsRasterTest$ + ProcessingGdalAlgorithmsVectorTest$ + ProcessingGeneralTest$ + ProcessingGenericAlgorithmsTest$ + ProcessingGrassAlgorithmsImageryTest$ + ProcessingGrassAlgorithmsRasterTestPt1$ + ProcessingGrassAlgorithmsVectorTest$ + ProcessingGuiTest$ + ProcessingModelerTest$ + ProcessingParametersTest$ + ProcessingProjectProviderTest$ + ProcessingQgisAlgorithmsTestPt1$ + ProcessingQgisAlgorithmsTestPt2$ + ProcessingQgisAlgorithmsTestPt3$ + ProcessingQgisAlgorithmsTestPt4$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingScriptUtilsTest$ + ProcessingToolsTest$ + ) + fi + + local myctestargs=( --output-on-failure + -j1 ) - virtx cmake_src_test -j1 + xdg_environment_reset + + local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true" + virtx cmake_src_test } src_install() { + if use test; then + git config --global --add safe.directory "${S}" || die + fi cmake_src_install insinto /usr/share/mime/packages @@ -254,7 +435,7 @@ src_install() { if use examples; then docinto examples dodoc -r "${WORKDIR}"/qgis_sample_data/. - docompress -x /usr/share/doc/${PF}/examples + docompress -x "/usr/share/doc/${PF}/examples" fi if use python; then diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index a3fbd5d4bf3b..9a40812dacda 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,3 +1,6 @@ +AUX dbus-r1.patch 1778 BLAKE2B 94515e2418d13a72479d4517316c915f11694e2176acdbebbb410fce9dd23a414deceace0b348d0026a9c638889dc08e695b9a448d33b301b57d446119481f9e SHA512 add33ab9744d6552d5500530a88771bb89c09434f8d10573398e63cc3805f5ff0dbb5da19c5bca3d50ffe36dca4ea1ab00dcd755e49df26848d66eed9fcb9d18 DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c +DIST qmapshack-1.17.1_p601.tar.gz 56720740 BLAKE2B 7fd8232e0c5b693d565897dff90ac6c6012918f2739d9cbfa48e7629e3a905609f47b9665d1a7666a131da64739a499a54f9959d275ab4c7f013db0e83d9760a SHA512 9378e1d42a6217cbf169fc67476765f6700886b59518a1c800c5a639b2822e8116cabaac28c147f3a52014bb2393deb1a8e8b7b9c4112f1990361d0376530c80 EBUILD qmapshack-1.17.1.ebuild 974 BLAKE2B 7ad2c6158aca5ad05afa5118ab0d868ac81b1bb4c43c4cb4195f1ca43ef8aa2e201e3eeb11e1072c901a5f19be5d1a338cba1311bfc7b4cadf70580de5deb7d0 SHA512 e73cd171b4db592739fa2c9d8f4b028c97fd2864e781cc30291354d5b88c6b3359286f120babca4d586aeb0a548abc71559906e6ee2cd2f81c2a08bde89db850 +EBUILD qmapshack-1.17.1_p601.ebuild 1254 BLAKE2B 0e02b4708e2e579f9e5f475b1651a39cfc5e4aa45a8acf3a87026f48769767dfd6ca0e0f68f34e4cdfd64da0fb53958046f1e1f8e182309d0c6e206f3c3f57c2 SHA512 9428eac70fac6a005fb78a53126e0cd0f6af332df5581e24c579660353c2d6aad37f287a4a902be4d20b01d28f637bc08ec9cbde333c7e88871101c2e7a9773d MISC metadata.xml 834 BLAKE2B af7dac2c7ce98d1a40e993e51e646fdadb328515d1aa1e3e8c508e30f47ae1bc25e71ddb774b7ab65126f4644e119aa2be1a01c075c783fcd5f5fa2d06f23e75 SHA512 8e6e2d99a1ed77eee5b511901c190b8e9b2dc12e9a83525463cb96db811cda03c4a7dc3bd6fe7bc83dff93bd5d202ac7a66f69f350f7ac0773a6e894e6b64a85 diff --git a/sci-geosciences/qmapshack/files/dbus-r1.patch b/sci-geosciences/qmapshack/files/dbus-r1.patch new file mode 100644 index 000000000000..0ab4294f63ad --- /dev/null +++ b/sci-geosciences/qmapshack/files/dbus-r1.patch @@ -0,0 +1,63 @@ +diff '--color=auto' -ur qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt +--- qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt 2024-09-30 20:02:57.701618381 +0200 ++++ qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt 2024-09-30 20:05:59.159600329 +0200 +@@ -200,9 +200,9 @@ + + if(USE_QT6DBus) + find_package(Qt6DBus REQUIRED) +- if(Qt5DBus_FOUND) ++ if(Qt6DBus_FOUND) + add_definitions(-DHAVE_DBUS) +- endif(Qt5DBus_FOUND) ++ endif(Qt6DBus_FOUND) + endif(USE_QT6DBus) + + # Everything included. Let's finetune the mess a bit more +diff '--color=auto' -ur qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/src/qmapshack/CMakeLists.txt qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/src/qmapshack/CMakeLists.txt +--- qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/src/qmapshack/CMakeLists.txt 2024-09-30 20:02:57.687618460 +0200 ++++ qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/src/qmapshack/CMakeLists.txt 2024-09-30 20:06:51.470306845 +0200 +@@ -368,12 +368,12 @@ + ) + + +-if(Qt5DBus_FOUND) ++if(Qt6DBus_FOUND) + set( SRCS + ${SRCS} + device/CDeviceWatcherLinux.cpp + ) +-endif(Qt5DBus_FOUND) ++endif(Qt6DBus_FOUND) + + + if (APPLE) +@@ -746,12 +746,12 @@ + ) + + +-if(Qt5DBus_FOUND) ++if(Qt6DBus_FOUND) + set( HDRS + ${HDRS} + device/CDeviceWatcherLinux.h + ) +-endif(Qt5DBus_FOUND) ++endif(Qt6DBus_FOUND) + + + if(APPLE) +@@ -977,11 +977,11 @@ + ) + endif(${DEVELOPMENT_VERSION}) + +-if(Qt5DBus_FOUND) ++if(Qt6DBus_FOUND) + set(DBUS_LIB Qt6::DBus) +-else(Qt5DBus_FOUND) ++else(Qt6DBus_FOUND) + set(DBUS_LIB) +-endif(Qt5DBus_FOUND) ++endif(Qt6DBus_FOUND) + + target_link_libraries(${APPLICATION_NAME} + Qt6::Widgets diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild new file mode 100644 index 000000000000..d8473b11f33a --- /dev/null +++ b/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="GPS mapping utility" +HOMEPAGE="https://github.com/Maproom/qmapshack/wiki" +COMMIT="b53959a305587f0a7f2330b99267b3b24abb76f4" +SRC_URI="https://github.com/Maproom/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${COMMIT} +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dbus" + +RDEPEND=" + dev-db/sqlite + >=dev-libs/quazip-1.3:0=[qt6] + dev-qt/qt5compat:6 + dev-qt/qtbase:6[dbus,gui,network,sql,widgets,xml] + dev-qt/qtdeclarative:6 + dev-qt/qttools:6[assistant,widgets] + dev-qt/qtwebengine:6[widgets] + sci-geosciences/routino + sci-libs/alglib + sci-libs/gdal:= + sci-libs/proj:= +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" + +PATCHES=( "${FILESDIR}"/dbus-r1.patch ) + +src_configure() { + local mycmakeargs=( -DUSE_QT6DBus=$(usex dbus) ) + cmake_src_configure +} + +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" + ewarn "An experimental Qt6 port" + ewarn "Translations and the help system are broken" + ewarn "Other bugs to https://github.com/Maproom/qmapshack/issues" +} diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest index 5edf10f6d1c9..8c1938ddc184 100644 --- a/sci-geosciences/routino/Manifest +++ b/sci-geosciences/routino/Manifest @@ -1,5 +1,5 @@ AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3db8417bd8bcc62c8d15a5ed2f43ae8b55e56870ca037b98de2c424f258d139dff11c0128ac60940f09ace6 SHA512 52cbd47e68b25a7c735d32a4bb51436ea45867cdb9f86bc3a55304674b80d33dcc41f845527659db345e118f2f56036a2265a98a177744b4cb1029c7a18e202e DIST routino-3.4.1.tgz 2591859 BLAKE2B cdc2018cb735c190258c9f4ebf09ad14d27923fcc520b3c58fb910e63d93e280bbad345ca1c82b31284827cf914f5da45b8f5a69c9ac1721b3f056dfd9d2e918 SHA512 c9e6dea5c60a265f7a5c7217711d2c880f201d1102740d756e10f731ace785a7afd7b84cdfb8485ee3af58b5a0f1b0e8e273dab1deedd319b27c77d400b30baa -EBUILD routino-3.4.1-r1.ebuild 1654 BLAKE2B 05b762e849cfb74f755d5f633c82e6c75a0a3c370040fcde5c74af4c3550d40f220ab764eafe41b0e7695132afb91486388d5766ed7c64a4685d874a5ac6f8cb SHA512 39846dafd02ec1f9d098da5808afe9eed49ca65dcaca32a5169d8f58fb8b7728cdb037a492275832876d6f947836f47b3d8295e35299e41907d1090dd4a0b905 +EBUILD routino-3.4.1-r1.ebuild 1653 BLAKE2B 5834c74d904cab8a7ff5dc2245048dda2179af55ae4ded545e106505cf37cf7ddc26a9d1970fa1925cb7ea129adc3a180c3f50b00e850be4a7d840e9220d72c0 SHA512 5a782ef5bb27931c6f418d72a3eb7559bfc5f6337034f25a6ea02c03f771ab3584369f786335cf8ead753393d9ebafe71cd2827f998e38348a2f894ef625b9a2 EBUILD routino-3.4.1.ebuild 1653 BLAKE2B c1a46268c91d2c64b3fca5f354aa1946ac36b47e89c8eb386d1cb9ba3767ddc5a89f0ac35d1bd2218f224a3fa5131edf2702ef1b664ec0ddef352c9f3d3e8305 SHA512 fce01fa03ffd7a7785f743f03fae8760f427cefbd32e64b6440f3542fe3c28e93811d5d0b81b34af14e7f25396e9d08e117d0aaa4ebb3bb80945d19a60fa0b92 MISC metadata.xml 894 BLAKE2B e9854b11005fdab70046e42a963c65a4e921f2d05572c4591e0ee581316a8ba3d3a5a0df39cf2aa500b1a89bde29fd1aaa459962abb68fdc71b49abd9681db54 SHA512 1397fb38a051f523925f04ab1d77044f2bbbcb2957a724696b54d6c057d49d67e758ae3d5b3c925fbce95f35e95c8b3a191724021bb82d4aa35ea61bc2c2153a diff --git a/sci-geosciences/routino/routino-3.4.1-r1.ebuild b/sci-geosciences/routino/routino-3.4.1-r1.ebuild index 7796cd37d9f2..53109cdbf056 100644 --- a/sci-geosciences/routino/routino-3.4.1-r1.ebuild +++ b/sci-geosciences/routino/routino-3.4.1-r1.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} )" diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest index 8f3eb1566540..d242befbba15 100644 --- a/sci-geosciences/viking/Manifest +++ b/sci-geosciences/viking/Manifest @@ -1,4 +1,5 @@ +AUX viking-1.10-terraserver.patch 1286 BLAKE2B a10fb99632db730a03b1e34d2f3021ff5ab02905676052b409b25577b7f7e03f90572ddf201b0b6345b80c3704cc30582b266a613144cfb21e30afd7b9a78a88 SHA512 82a868cdd85b1d1886fa4b8e86fef5bf67b283453e5bb160b9fc9b15685727cab558f2b73f61c1a8e63e8bb366cfc0c22abca68865aba9fbc45bb6fc5153ec36 DIST viking-1.10.tar.gz 6014926 BLAKE2B 667a5cd854449f54c6f5969118a445903cafae4e8f046f14b6802f53a76c217cf960dd11876ed237112026f96da2906bb68b2474ba4e72696bd8b8a082cf7189 SHA512 8d0b3b46e139b8c03730140d89e8eaf6f1dbcde504011710d122e5239d11d1115464b087edd531228be199286605df0deb3f4b75fae0222128b0f5098344527e DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee -EBUILD viking-1.10.ebuild 2051 BLAKE2B 51692a09fbfe7343fdbfbe0416882750fef2bed1ac71abc430201205923581ddf18e3fe80c4fb4fed7819432b4baec2dee57316f3aa2e642a096c56e072ef9fc SHA512 f0cecea28b66e0f1b07b832d6561d10299ef815d6ce89d990d161a5318bf64a78851be611f6268a27de7d2529847a27ec766e19982780c910b8b8a1898df2d50 -MISC metadata.xml 734 BLAKE2B 7fd63ec5238ee628cb9f6cb485643fb7f029e83735d3e85b79ea2c27e3c4d50698c6fc1b67d122a4261f0ff0b6271b3001102d07a7495c0ab58d54b7feec94a5 SHA512 a0568859ea1fedda5839ed1d055097687210d938867473e31be9c5331d6d1b1b26305049d5fee9d36e945343cd2dcd08951eb5921d0683a69433b2cd6539c209 +EBUILD viking-1.10.ebuild 2095 BLAKE2B 416d6bb44575e987b9503b66afc8ed294f189511abdfd1488f258bc2f3892de61e0d25aca65a4db833e7f2683fd566ecc1b1e66f9bc9167fbd13b43f7fbaf923 SHA512 a20f3bcbec9687fdba4c83282464c444f6798a85753177fde114bbdb125219fcb07774eda054c3c7eef927f4378d8a9937b28e6c2249087f1abdcc12ae4c009f +MISC metadata.xml 793 BLAKE2B 21b6c3d0751f98fd8d90b260b54b9a3ef004b35f9fbb088dd664f60a72a1618df90464288075043d30754d95ebea1aa6e261ce3a280fda005a029c4dd4dac971 SHA512 9e436dedcc783f3c0c1c678905ec1381f7fe56f50480680448401b4ce06ccaffbc954debd52bb98af8008df468220482f155ee53db071e6b8b5adf1a6d600da5 diff --git a/sci-geosciences/viking/files/viking-1.10-terraserver.patch b/sci-geosciences/viking/files/viking-1.10-terraserver.patch new file mode 100644 index 000000000000..143f80af838e --- /dev/null +++ b/sci-geosciences/viking/files/viking-1.10-terraserver.patch @@ -0,0 +1,31 @@ +From 71e5d6bb1b2f9481788ce7d54d5124f468515852 Mon Sep 17 00:00:00 2001 +From: Rob Norris <rw_norris@hotmail.com> +Date: Thu, 24 Mar 2022 19:26:37 +0000 +Subject: [PATCH] Maintain terraserver code building + +--- + src/terraservermapsource.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/terraservermapsource.c b/src/terraservermapsource.c +index 8d9edfac..0e8cf09a 100644 +--- a/src/terraservermapsource.c ++++ b/src/terraservermapsource.c +@@ -32,7 +32,7 @@ static gboolean _is_mbtiles ( VikMapSource *self ); + + static gchar *_get_uri( VikMapSourceDefault *self, MapCoord *src ); + static gchar *_get_hostname( VikMapSourceDefault *self ); +-static DownloadFileOptions *_get_download_options( VikMapSourceDefault *self ); ++static DownloadFileOptions *_get_download_options( VikMapSourceDefault *self, MapCoord *src ); + + /* FIXME Huge gruik */ + static DownloadFileOptions terraserver_options = { FALSE, FALSE, NULL, 0, NULL, NULL, 0, a_check_map_file, NULL, FALSE, FALSE, NULL }; +@@ -247,7 +247,7 @@ _get_hostname( VikMapSourceDefault *self ) + } + + static DownloadFileOptions * +-_get_download_options( VikMapSourceDefault *self ) ++_get_download_options( VikMapSourceDefault *self, MapCoord *src ) + { + g_return_val_if_fail (TERRASERVER_IS_MAP_SOURCE(self), NULL); + diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml index d113d8a61afa..10d05ec65b71 100644 --- a/sci-geosciences/viking/metadata.xml +++ b/sci-geosciences/viking/metadata.xml @@ -21,5 +21,6 @@ </use> <upstream> <remote-id type="sourceforge">viking</remote-id> + <remote-id type="github">viking-gps/viking</remote-id> </upstream> </pkgmetadata> diff --git a/sci-geosciences/viking/viking-1.10.ebuild b/sci-geosciences/viking/viking-1.10.ebuild index 35fb8f0196c1..67a1e9561987 100644 --- a/sci-geosciences/viking/viking-1.10.ebuild +++ b/sci-geosciences/viking/viking-1.10.ebuild @@ -7,14 +7,15 @@ inherit autotools xdg-utils DESCRIPTION="GPS data editor and analyzer" HOMEPAGE="https://github.com/viking-gps/viking/" -IUSE="doc +exif libexif geoclue gps +magic nls oauth" SRC_URI=" https://github.com/viking-gps/${PN}/archive/${P}.tar.gz doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )" +S="${WORKDIR}/${PN}-${P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" +IUSE="doc +exif libexif geoclue gps +magic nls oauth" COMMONDEPEND=" app-arch/bzip2 @@ -47,7 +48,7 @@ DEPEND="${COMMONDEPEND} sys-devel/gettext " -S="${WORKDIR}/${PN}-${P}" +PATCHES=( "${FILESDIR}/${P}-terraserver.patch" ) src_prepare() { default diff --git a/sci-geosciences/xyzservices/Manifest b/sci-geosciences/xyzservices/Manifest index b18c05eca8f5..cf5d1a728da0 100644 --- a/sci-geosciences/xyzservices/Manifest +++ b/sci-geosciences/xyzservices/Manifest @@ -1,5 +1,7 @@ DIST xyzservices-2023.10.1.tar.gz 1113019 BLAKE2B c239c244c7ffea836acfc2fdba284c2b2b0b8fbd7e915ddcc004f7735898760f8bac626c7f58329d5c5555753dbbfe13731494ef5948ffaf2cd36d1eb28e014d SHA512 5ab57caa160bbf926014da83f81108c7ae6c509831a94d38c2dde73067cb2cd624697902166eb5a0af5f55faef1b8f1d0786db4766f80b1bfe5cad889d9dc627 DIST xyzservices-2024.4.0.tar.gz 1126163 BLAKE2B d725799b668ac0cbdc88fbd8a9f14db70d45b5ca665fe899b4cc57197321b6639590c29f47fb10e420b9f8ccfbfe4b867a9a9c8e090403f0c023c0e69295f5f9 SHA512 1fb991578275914a7b3ef8202dcb049116a423f2b645bbc52717485c76089615f988f9eb592e13399c30b2901630089188c4ed30276c68015a7f12661ac62331 +DIST xyzservices-2024.6.0.tar.gz 1127473 BLAKE2B 0c5f99cd8efb5290f9e84abe824578da2c49075ebba72d48920c22da762e4b1e3225709602325f562669835cab39fe4df3556057c454c263d15dbccdf237c950 SHA512 628e0c50149792515051120e3a300bb6d5338fca8bfd40f4ecd7c8a2e5d0ffa43e5d9affd4c979739d61f5140b3331fb4f15aef061075763957abfed7f77c5d2 EBUILD xyzservices-2023.10.1.ebuild 592 BLAKE2B 57ab00e7446df8d90126563b05983d1be5cc9c8fa3f386a0911b7b13725a05f9762b6ab651b4091fe2853815a328beb8453ef7d9e55c0f57c8de1756184d6988 SHA512 dfffcc0fa5f48edd7ab61d55e975287553ce13b8ab1f560db0c3953af8006202a552b16377c65534b2f4d2f2fd73ca18c097d88c4c84288aa537e3ede522ffe5 EBUILD xyzservices-2024.4.0.ebuild 592 BLAKE2B 57ab00e7446df8d90126563b05983d1be5cc9c8fa3f386a0911b7b13725a05f9762b6ab651b4091fe2853815a328beb8453ef7d9e55c0f57c8de1756184d6988 SHA512 dfffcc0fa5f48edd7ab61d55e975287553ce13b8ab1f560db0c3953af8006202a552b16377c65534b2f4d2f2fd73ca18c097d88c4c84288aa537e3ede522ffe5 +EBUILD xyzservices-2024.6.0.ebuild 592 BLAKE2B 57ab00e7446df8d90126563b05983d1be5cc9c8fa3f386a0911b7b13725a05f9762b6ab651b4091fe2853815a328beb8453ef7d9e55c0f57c8de1756184d6988 SHA512 dfffcc0fa5f48edd7ab61d55e975287553ce13b8ab1f560db0c3953af8006202a552b16377c65534b2f4d2f2fd73ca18c097d88c4c84288aa537e3ede522ffe5 MISC metadata.xml 334 BLAKE2B 125827255982a5609c4692d89b1ffdcbd3f8c8d159b79c96f93a384953b110c391d278c565b58015608329592240c0609540a2aa749f1f7b54fd1975ac43636c SHA512 a1378f8cb8430ba5be57af9d80cb50593ec2c1346c4142170508835230976a9795e110b9e0836f2f3a83793b5af4d93ec1e8ec9d8fe6383402a4265940b0b8b1 diff --git a/sci-geosciences/xyzservices/xyzservices-2024.6.0.ebuild b/sci-geosciences/xyzservices/xyzservices-2024.6.0.ebuild new file mode 100644 index 000000000000..14e1cb70572f --- /dev/null +++ b/sci-geosciences/xyzservices/xyzservices-2024.6.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +inherit distutils-r1 + +DESCRIPTION="Source of XYZ tiles providers" +HOMEPAGE="https://github.com/geopandas/xyzservices" +SRC_URI="https://github.com/geopandas/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="test" + +BDEPEND="dev-python/setuptools-scm" + +# Need mercantile module +# distutils_enable_tests pytest |