diff options
Diffstat (limited to 'sci-geosciences')
396 files changed, 7343 insertions, 8759 deletions
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.52-r2.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.52-r2.ebuild new file mode 100644 index 000000000000..3d5e2a574c37 --- /dev/null +++ b/sci-geosciences/GeographicLib/GeographicLib-1.52-r2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit cmake distutils-r1 + +MY_PN="${PN,,}" + +DESCRIPTION="C++ library for converting geographic coordinate systems" +HOMEPAGE="https://sourceforge.net/projects/geographiclib/" +SRC_URI="https://downloads.sourceforge.net/${MY_PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/19" +KEYWORDS="~amd64 ~arm" +IUSE="doc examples python" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + >=app-text/doxygen-1.8.7 + >=dev-lang/perl-5.26.1-r1 + >=dev-python/sphinx-1.6.3-r2 + >=sys-apps/util-linux-2.31 + ) +" + +distutils_enable_tests setup.py +# there are additional docs in the python dir +distutils_enable_sphinx python/doc + +src_prepare() { + cmake_src_prepare + + if use python; then + pushd "python" || die + distutils-r1_src_prepare + popd || die + fi +} + +src_configure() { + export GEODATAPATH="/usr/share/${MY_PN}" + + local mycmakeargs=( + -DGEOGRAPHICLIB_DOCUMENTATION=$(usex doc ON OFF) + -DGEOGRAPHICLIB_LIB_TYPE="SHARED" + -DGEOGRAPHICLIB_DATA="${GEODATAPATH}" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use python; then + pushd "python" || die + distutils-r1_src_compile + popd || die + fi +} + +src_test() { + cmake_src_test + + if use python; then + pushd "python" || die + distutils-r1_src_test + popd || die + fi +} + +src_install() { + cmake_src_install + + # Remove python things added by the cmake_src_install function + rm -r "${ED}/usr/$(get_libdir)/python" || die + + # If using Python, we re-add these python files for each implementation + if use python; then + pushd "python" || die + distutils-r1_src_install + popd || die + fi + + # TODO: find out if java stuff need something + + # Installs to wrong doc dir for some reason + # Also happens with USE="-doc" + mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die + + if use examples; then + dodoc -r examples + docompress -x "/usr/share/doc/${PF}/examples" + fi + + insinto "/usr/share/maxima/${MY_PN}" + doins -r maxima/. + + find "${D}" -name "*.la" -delete || die +} diff --git a/sci-geosciences/GeographicLib/GeographicLib-2.3.ebuild b/sci-geosciences/GeographicLib/GeographicLib-2.3.ebuild new file mode 100644 index 000000000000..6f409ce2c894 --- /dev/null +++ b/sci-geosciences/GeographicLib/GeographicLib-2.3.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 + +MY_PN="${PN,,}" + +DESCRIPTION="C++ library for converting geographic coordinate systems" +HOMEPAGE="https://sourceforge.net/projects/geographiclib/ https://github.com/geographiclib/geographiclib" +SRC_URI="https://downloads.sourceforge.net/${MY_PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/26" +KEYWORDS="~amd64 ~arm" +IUSE="doc" + +BDEPEND=" + doc? ( + >=app-text/doxygen-1.8.7 + >=dev-lang/perl-5.26.1-r1 + >=dev-python/sphinx-1.6.3-r2 + >=sys-apps/util-linux-2.31 + ) +" + +src_configure() { + export GEODATAPATH="/usr/share/${MY_PN}" + + local mycmakeargs=( + -DBUILD_DOCUMENTATION=$(usex doc) + -DDOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -DEXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" + -DBUILD_SHARED_LIBS=ON + -DGEOGRAPHICLIB_DATA="${GEODATAPATH}" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto "/usr/share/maxima/${MY_PN}" + doins -r maxima/. + + find "${D}" -name "*.la" -delete || die +} diff --git a/sci-geosciences/GeographicLib/Manifest b/sci-geosciences/GeographicLib/Manifest new file mode 100644 index 000000000000..d0412af95773 --- /dev/null +++ b/sci-geosciences/GeographicLib/Manifest @@ -0,0 +1,2 @@ +DIST GeographicLib-1.52.tar.gz 2432658 BLAKE2B 87328de1774ab9aec05355362c9a1760cf62864135b97a3e9cb1382b0ec9825b032f6c67a5e02b762c3009a3876a9cd995e3a49a3ad3c051dcd36446b55d0191 SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859 +DIST GeographicLib-2.3.tar.gz 1701815 BLAKE2B 5695c5edd5b674f26f2fa21a835b155bca4c33177177750670fdf19f95ccb6d37eb13493b754820ccb22c5a05c8dc554da134eef37947a1d261d4ec6f6ebbcbe SHA512 1a1bd0fc2dc3e1372cf22618af3a4340bbc6497f94c64226c97654dfff92a4bf3acf47d91592741fe0c643d401d9721f680bdb4974b8ee258fb09d525fbaec67 diff --git a/sci-geosciences/GeographicLib/metadata.xml b/sci-geosciences/GeographicLib/metadata.xml new file mode 100644 index 000000000000..8dea50ec86fb --- /dev/null +++ b/sci-geosciences/GeographicLib/metadata.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ros@gentoo.org</email> + <name>Gentoo ROS Project</name> + </maintainer> + <maintainer type="project"> + <email>sci-geosciences@gentoo.org</email> + <name>Gentoo Geosciences Project</name> + </maintainer> + <upstream> + <maintainer status="active"> + <email>charles@karney.com</email> + <name>Charles Karney</name> + </maintainer> + <doc lang="en">https://geographiclib.sourceforge.io/html/</doc> + <bugs-to>https://sourceforge.net/p/geographiclib/bugs/</bugs-to> + <remote-id type="sourceforge">geographiclib</remote-id> + <remote-id type="github">geographiclib/geographiclib</remote-id> + </upstream> + <longdescription lang="en"> +GeographicLib is a small set of C++ classes for converting between geographic, UTM, UPS, MGRS, and geocentric coordinates, for gravity (e.g., EGM2008), geoid, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems. + </longdescription> +</pkgmetadata> diff --git a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild deleted file mode 100644 index d55b5a6b4038..000000000000 --- a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="MTK GPS Datalogger Device Control" -HOMEPAGE="https://www.bt747.org" -SRC_URI="mirror://sourceforge/${PN}/Stable/BT747_${PV}_full.zip - https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif" - -LICENSE="GPL-3" -SLOT="1" -KEYWORDS="~amd64 ~x86" - -CDEPEND=" - dev-java/commons-imaging:0 - dev-java/jcalendar:1.2 - dev-java/jchart2d:0 - dev-java/jopt-simple:0 - >=dev-java/rxtx-2.2_pre2:2 - dev-java/swing-layout:1 - dev-java/swingx:1.6 - dev-java/swingx-ws:bt747 -" - -RDEPEND=" - ${CDEPEND} - dev-libs/glib:2[dbus] - >=virtual/jre-1.7 -" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.7 - app-arch/unzip -" - -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-4.4,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747" -JAVA_ANT_REWRITE_CLASSPATH="yes" - -S="${WORKDIR}" - -java_prepare() { - # Fix for newer jchart2d. - epatch "${FILESDIR}/jchart2d-3.2.patch" - - # Remove all the bundled stuff. - rm -rv dist/ lib/ || die - - # 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 - - eapply_user -} - -src_install() { - dodoc {ChangeLog,README}.txt - - java-pkg_dojar dist/*.jar - java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \ - --java-args="-Xmx192m" - - doicon "${DISTDIR}/${PN}.gif" - make_desktop_entry ${PN} BT747 bt747.gif -} diff --git a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild index 33434af2b114..4d6823b6b5da 100644 --- a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild +++ b/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eutils java-pkg-2 java-ant-2 +inherit desktop java-pkg-2 java-ant-2 DESCRIPTION="MTK GPS Datalogger Device Control" HOMEPAGE="https://www.bt747.org" -SRC_URI="mirror://sourceforge/${PN}/Stable/BT747_${PV}_full.zip +SRC_URI="https://downloads.sourceforge.net/project/bt747/Development/BT747_${PV}_full.zip https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif" +S="${WORKDIR}" LICENSE="GPL-3" SLOT="1" KEYWORDS="~amd64 ~x86" +BDEPEND="app-arch/unzip:0" CDEPEND=" dev-java/commons-imaging:0 dev-java/jcalendar:1.2 @@ -24,17 +26,12 @@ CDEPEND=" dev-java/swingx:1.6 dev-java/swingx-ws:bt747 " - -RDEPEND=" - ${CDEPEND} +RDEPEND="${CDEPEND} dev-libs/glib:2[dbus] - >=virtual/jre-1.7 + >=virtual/jre-1.8:* " - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.7 - app-arch/unzip +DEPEND="${CDEPEND} + >=virtual/jdk-1.8:* " EANT_BUILD_TARGET="dist.j2se" @@ -42,11 +39,10 @@ EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.curren 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" -S="${WORKDIR}" - src_prepare() { + java-pkg-2_src_prepare # Fix for newer jchart2d. - epatch "${FILESDIR}/jchart2d-3.2.patch" + eapply "${FILESDIR}/jchart2d-3.2.patch" # Remove all the bundled stuff. rm -rv dist/ lib/ || die @@ -54,8 +50,6 @@ 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 - - eapply_user } src_install() { diff --git a/sci-geosciences/bt747/files/jchart2d-3.2.patch b/sci-geosciences/bt747/files/jchart2d-3.2.patch index 8f81a5a4a59d..c1dfe9fb2851 100644 --- a/sci-geosciences/bt747/files/jchart2d-3.2.patch +++ b/sci-geosciences/bt747/files/jchart2d-3.2.patch @@ -1,5 +1,5 @@ ---- src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java.orig 2010-03-08 22:15:41.000000000 +0000 -+++ src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java 2016-02-10 22:17:02.188118721 +0000 +--- a/src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java ++++ b/src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java @@ -46,9 +46,9 @@ heightAxis.getAxisTitle().setTitle("Height"); speedAxis.getAxisTitle().setTitle("Speed"); diff --git a/sci-geosciences/bt747/metadata.xml b/sci-geosciences/bt747/metadata.xml index 179b0d19f5c9..1bf137137ff3 100644 --- a/sci-geosciences/bt747/metadata.xml +++ b/sci-geosciences/bt747/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> @@ -14,7 +14,7 @@ BT747 is software that can: * Runs on Desktops (Windows, MacOSX, Linux flavors) * Configure MTK Chipset Based Devices and Loggers * Upload AGPS(EPO) data to MTK II Chipset Based Devices and Loggers -</longdescription> + </longdescription> <upstream> <remote-id type="sourceforge">bt747</remote-id> </upstream> diff --git a/sci-geosciences/congen/Manifest b/sci-geosciences/congen/Manifest deleted file mode 100644 index 25ee3be52114..000000000000 --- a/sci-geosciences/congen/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST congen-1.6.2.tar.bz2 293130 BLAKE2B 3879e5e04fe260fc65b1852a6ece347b7ea0dc7c846ca788f448c4b0af4ce7af1efe8e398727da243a76b1bd5a52632f308ec626ac708141a163159fb2065164 SHA512 21cabdf0fba8cfa8e72068db44e6db0288ce932f81f526f04421272550244de9c617dc12d2c162186cbb9f70d9a44aca48b6f132317fc2fa3c47860d2f58bad6 diff --git a/sci-geosciences/congen/congen-1.6.2-r1.ebuild b/sci-geosciences/congen/congen-1.6.2-r1.ebuild deleted file mode 100644 index c01e3e7d2a47..000000000000 --- a/sci-geosciences/congen/congen-1.6.2-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -MY_P=${P/_p/-r} -DESCRIPTION="Calculate speeds, equilibrium arguments, node factors of tidal constituents" -HOMEPAGE="http://www.flaterco.com/xtide/files.html" -SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs" - -DEPEND=">=sci-geosciences/libtcd-2.2.3" -RDEPEND="${DEPEND}" - -MAKEOPTS+=" -j1" - -S=${WORKDIR}/${P%_p*} - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - use static-libs || prune_libtool_files -} diff --git a/sci-geosciences/congen/metadata.xml b/sci-geosciences/congen/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/sci-geosciences/congen/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/sci-geosciences/dcw-gmt/Manifest b/sci-geosciences/dcw-gmt/Manifest new file mode 100644 index 000000000000..d39bab76351e --- /dev/null +++ b/sci-geosciences/dcw-gmt/Manifest @@ -0,0 +1 @@ +DIST dcw-gmt-1.1.4.tar.gz 21117179 BLAKE2B d5aebb5251ddcb82a6df28a9ac0a8e37ad45a8ef48bdf5e777c85f7194af7710e83e7ff3a204a9325d7b9c62ad3e3d41008f106c127a8d710f29a4b9bcb10c13 SHA512 3ea64ce9cc162030b40da859e8617e6c724c3529a57d2e6ae8dc311b4397532d8946aac7f66f49707dc85d046e892faa77bf1293a66c949fdf0473028dc4beeb diff --git a/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild b/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild new file mode 100644 index 000000000000..38d659823262 --- /dev/null +++ b/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Digital Chart of the World for GMT 5 or later" +HOMEPAGE="https://www.soest.hawaii.edu/wessel/dcw/" +SRC_URI="https://www.soest.hawaii.edu/pwessel/dcw/${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="amd64 ~x86" + +src_install() { + dodoc README.TXT ChangeLog + insinto /usr/share/dcw-gmt + doins *.nc dcw-{countries,states}.txt +} diff --git a/sci-geosciences/dcw-gmt/metadata.xml b/sci-geosciences/dcw-gmt/metadata.xml new file mode 100644 index 000000000000..60e3da2bfc2d --- /dev/null +++ b/sci-geosciences/dcw-gmt/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci-geosciences@gentoo.org</email> + <name>Gentoo Geosciences Project</name> + </maintainer> + <longdescription lang="en"> + The Digital Chart of the World (DCW) is a comprehensive 1:1,000,000 + scale vector basemap of the world. The charts were designed to meet + the needs of pilots and air crews in medium-and low-altitude + en route navigation and to support military operational planning, + intelligence briefings, and other needs. DCW-GMT is an enhancement + to DCW in a few ways: (1) it contains more state boundaries, + and (2) the data have been reformatted to save space and are + distributed as a single deflated netCDF-4 file. + </longdescription> +</pkgmetadata> diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest new file mode 100644 index 000000000000..cbb505d32da8 --- /dev/null +++ b/sci-geosciences/folium/Manifest @@ -0,0 +1,2 @@ +DIST folium-0.15.1.tar.gz 8400799 BLAKE2B c01c4029882aed5c1390be05a358c6c9e321e1562573bb1ae7246b462bc9183c21ba7631ca6b9a0e51311375f90f06bac5651c28505fa0d73c65942267ab2ce4 SHA512 fdc0b7bb0c864337b10d92e60090382d67d29e9158bb92c22ae53e749612d88427db95d34990c8895a04017ca1a5870330c6d9da3abb94e19ff6141b94f503c0 +DIST folium-0.16.0.tar.gz 8403284 BLAKE2B 443d8fc54ecdad8921d4467623ea4b8f6c22744df79ed25071e7937d38b1204f076432fc99f10ae23ddfebf89d4f7db19101e4aa54ceb1902bdad01af6f3ba2b SHA512 7dbaf3acdc0f5efbee8332bbc33ee002f1af22d53c662d434ace50e091dbaa9dde190d1f5f212be2a9d8abdcd5e5dbce0a916033c672c2327cc8b72f74eb69f4 diff --git a/sci-geosciences/folium/files/folium-0.15.1-gentoo.patch b/sci-geosciences/folium/files/folium-0.15.1-gentoo.patch new file mode 100644 index 000000000000..852644b1820c --- /dev/null +++ b/sci-geosciences/folium/files/folium-0.15.1-gentoo.patch @@ -0,0 +1,11 @@ +--- a/setup.cfg 2022-11-06 09:51:58.139499881 +0100 ++++ b/setup.cfg 2022-11-06 09:52:15.064237829 +0100 +@@ -1,6 +1,6 @@ + [metadata] +-description-file = README.md +-license_file = LICENSE.txt ++description_file = README.md ++license_files = LICENSE.txt + + [bdist_wheel] + universal = 1 diff --git a/sci-geosciences/folium/folium-0.15.1-r2.ebuild b/sci-geosciences/folium/folium-0.15.1-r2.ebuild new file mode 100644 index 000000000000..43b520782e7b --- /dev/null +++ b/sci-geosciences/folium/folium-0.15.1-r2.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}"/${P}-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/folium/folium-0.16.0.ebuild b/sci-geosciences/folium/folium-0.16.0.ebuild new file mode 100644 index 000000000000..6182bf93caf4 --- /dev/null +++ b/sci-geosciences/folium/folium-0.16.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/folium/metadata.xml b/sci-geosciences/folium/metadata.xml new file mode 100644 index 000000000000..4bcda37c1e92 --- /dev/null +++ b/sci-geosciences/folium/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <longdescription lang="en"> + Python Data, Leaflet.js Maps + folium builds on the data wrangling strengths of the Python ecosystem + and the mapping strengths of the Leaflet.js library. + Manipulate your data in Python, then visualize it in a Leaflet map + via folium. + </longdescription> + <upstream> + <remote-id type="github">python-visualization/folium</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest index 91b2999896a2..90f9bb384226 100644 --- a/sci-geosciences/foxtrotgps/Manifest +++ b/sci-geosciences/foxtrotgps/Manifest @@ -1 +1 @@ -DIST foxtrotgps-1.2.0.tar.xz 1666752 BLAKE2B 35fa2c67376154d4e6e6d5c2fcd5f3584bc246f35d1295b37352e8394313ae1db6c981fb54ee34fcc80d34bf3a9167ec80fa25971df9ef512c2bdc4a37f7d933 SHA512 fdea60bb22b223512ba75651386dcd3c2f7843f18dea8bde85b7498d8909931d44c2d877338c57d3a3b9e46ede9a29e14ecb918182142bce7e8cb5f4e674cb1b +DIST foxtrotgps-1.2.2.tar.xz 1692120 BLAKE2B a8a70948992cd25609189caae3ec4136d056f86c85dc8b6e9610e935f60499f7bd78f083cc3f3e0904ec56eadb492babb7c8016e0270ea3285dadd99b32fcca8 SHA512 57b436221698fd81e58052f847e19999783e8dd1a165b196c80616591f22b36896454a87dd5a3c2c25bdd4654b8110dc0f320f70f0592ed58210fcc0be98f2ff diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch new file mode 100644 index 000000000000..76d0c2d04a6d --- /dev/null +++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/739568 +https://bugs.gentoo.org/806986 +https://bugs.gentoo.org/808883 +https://bugs.gentoo.org/818268 + +From 86989085a3010cb83a094a788cd83a4654c9eb3c Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 18 Aug 2021 20:18:03 +0100 +Subject: [PATCH] Fix some GPS receivers (and fix build with newer gpsd API 12) + +Rebased version of upstream patch: +https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/329 + +See https://github.com/ntpsec/gpsd/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427 +re API change. + +Bug: https://bugs.gentoo.org/808883 +--- + src/gps_functions.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/gps_functions.c b/src/gps_functions.c +index 602b06e..0baea81 100644 +--- a/src/gps_functions.c ++++ b/src/gps_functions.c +@@ -762,8 +762,10 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data) + { + gpsdata->fix.time = (time_t) 0; + } +-#if GPSD_API_MAJOR_VERSION >= 9 +- gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX); ++#if GPSD_API_MAJOR_VERSION >= 12 && defined(STATUS_UNK) ++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_UNK || libgps_gpsdata.fix.mode >= MODE_2D); ++#elif GPSD_API_MAJOR_VERSION >= 10 ++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX || libgps_gpsdata.fix.mode >= MODE_2D); + #else + gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX); + #endif +-- +2.33.1 + diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch new file mode 100644 index 000000000000..5a67f26de561 --- /dev/null +++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch @@ -0,0 +1,24 @@ +diff -ur a/src/callbacks.c b/src/callbacks.c +--- a/src/callbacks.c 2019-07-10 08:35:12.000000000 +0300 ++++ b/src/callbacks.c 2020-10-16 19:29:48.777271945 +0300 +@@ -46,7 +46,7 @@ + static gboolean maximized = FALSE; + + +-GtkWidget *dialog10 = NULL; ++static GtkWidget *dialog10 = NULL; + + + static int local_x = 0; +diff -ur a/src/tracks.c b/src/tracks.c +--- a/src/tracks.c 2019-07-10 08:35:12.000000000 +0300 ++++ b/src/tracks.c 2020-10-16 19:30:12.205982533 +0300 +@@ -30,7 +30,7 @@ + + GSList *loaded_track = NULL; + GtkWidget *window12; +-GtkWidget *dialog10; ++static GtkWidget *dialog10; + + + diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch new file mode 100644 index 000000000000..87e973c47c8f --- /dev/null +++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch @@ -0,0 +1,37 @@ +diff -ur a/src/gps_functions.c b/src/gps_functions.c +--- a/src/gps_functions.c ++++ b/src/gps_functions.c +@@ -753,12 +753,20 @@ + { + gpsdata->satellites_used = libgps_gpsdata.satellites_used; + gpsdata->hdop = libgps_gpsdata.dop.hdop; ++#if GPSD_API_MAJOR_VERSION >= 9 /* API change. gpsd version 3.20 and subsequent. */ ++ gpsdata->fix.time = libgps_gpsdata.fix.time.tv_sec + (libgps_gpsdata.fix.time.tv_nsec*1e-9); ++#else + gpsdata->fix.time = libgps_gpsdata.fix.time; ++#endif + if (isnan(gpsdata->fix.time)) + { + gpsdata->fix.time = (time_t) 0; + } ++#if GPSD_API_MAJOR_VERSION >= 9 ++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX); ++#else + gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX); ++#endif + if (gpsdata->valid) + { + gpsdata->seen_valid = TRUE; +@@ -767,7 +775,11 @@ + gpsdata->fix.longitude = libgps_gpsdata.fix.longitude; + gpsdata->fix.speed = libgps_gpsdata.fix.speed; + gpsdata->fix.heading = libgps_gpsdata.fix.track; ++#if GPSD_API_MAJOR_VERSION >= 9 ++ gpsdata->fix.altitude = libgps_gpsdata.fix.altMSL; ++#else + gpsdata->fix.altitude = libgps_gpsdata.fix.altitude; ++#endif + } + + g_source_remove(watchdog); + diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild new file mode 100644 index 000000000000..e45173eebb13 --- /dev/null +++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome2 + +DESCRIPTION="Easy to use, fast and lightweight mapping application (fork of tangogps)" +HOMEPAGE="https://www.foxtrotgps.org/" +SRC_URI="https://www.foxtrotgps.org/releases/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=" + dev-libs/libxml2:2 + gnome-base/libglade + media-libs/libexif + net-misc/curl + >=sci-geosciences/gpsd-2.90:= + sys-apps/dbus + x11-libs/gtk+:2 +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext +" + +PATCHES=( + "${FILESDIR}/${P}-gpsd-api9.patch" + "${FILESDIR}/${P}-gcc10.patch" + "${FILESDIR}/${P}-fix-some-receivers.patch" +) diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.0.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild index f3c9efbbf8e6..5db8c34ce191 100644 --- a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.0.ebuild +++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit gnome2 @@ -11,18 +11,23 @@ SRC_URI="https://www.foxtrotgps.org/releases/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" RDEPEND=" dev-libs/libxml2:2 - gnome-base/gconf:2 gnome-base/libglade media-libs/libexif net-misc/curl - >=sci-geosciences/gpsd-2.90 + >=sci-geosciences/gpsd-2.90:= sys-apps/dbus x11-libs/gtk+:2 " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/gettext " + +PATCHES=( + "${FILESDIR}/${P}-gpsd-api9.patch" + "${FILESDIR}/${P}-gcc10.patch" +) diff --git a/sci-geosciences/foxtrotgps/metadata.xml b/sci-geosciences/foxtrotgps/metadata.xml index d196f9fe5744..66a2ed434943 100644 --- a/sci-geosciences/foxtrotgps/metadata.xml +++ b/sci-geosciences/foxtrotgps/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> <name>Gentoo Geosciences Project</name> </maintainer> <longdescription lang="en"> -FoxtrotGPS is an offshoot of Marcus Bauer's excellent Free & Open Source tangoGPS application, with a focus on cooperation and fostering community innovation. FoxtrotGPS is freely available to the public for use, redistribution, and modification under the terms of the GNU General Public License 2.0 (GPLv2). -</longdescription> + FoxtrotGPS is an offshoot of Marcus Bauer's excellent Free & Open Source tangoGPS application, with a focus on cooperation and fostering community innovation. FoxtrotGPS is freely available to the public for use, redistribution, and modification under the terms of the GNU General Public License 2.0 (GPLv2). + </longdescription> </pkgmetadata> diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest deleted file mode 100644 index 2a77e7222853..000000000000 --- a/sci-geosciences/gdal-grass/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST gdal-grass-2.0.0.tar.gz 56286 BLAKE2B 191402442bc3c16f3d07f538b9eae266e75c74efbecb235dc11cb3529e4758fc8354ab5e65ec4a8805595c6f1209d70e5f76a7006d546eb3d2e8f9e4966842ff SHA512 cefa60773c2acd5c1627b896e3298d02f51979c12f70ce67b88c0b886a13de2f62821a3d3e50984f5c676ef37819c685795949b06db57004a0edf8039e898d7e -DIST gdal-grass-2.1.0.tar.gz 54299 BLAKE2B 09b9a408584618cefcc989feebc75431ae3efed2c9f6504e65ccf28bbc02a6e5125cb049accece7fd598aeef0bb1d5cb572067fc5a764a49c99627132d650f65 SHA512 fb06b71839849de413f68beb8f2cd1c2273cc48b5205fe1b255ffc4976f8f913b4b226eba186a24f5b40fe5fbb1ceeab760d06915222e4a4b269a6fbc7bc9417 -DIST gdal-grass-2.1.3.tar.gz 54478 BLAKE2B 172200d8362b12583f0f73316b8c6d34875682c9d76c095745152c8d4fd1da1d9d1e94df5928225f6fda5712e987379c7c3192fa81d02b9cee9145fb577faee1 SHA512 c11776f92e591f1c0136e439ab6c672015171c5b750cb9332c73b49b3173c1d57efb4854b152a1d8e1b438c68a1130b4a46a189e1be0b99af9a8fb931f246e39 diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild deleted file mode 100644 index b480a2b497b9..000000000000 --- a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="GDAL plugin to access GRASS data" -HOMEPAGE="https://www.gdal.org/" -SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" - -IUSE="postgres" -RDEPEND=" - >=sci-libs/gdal-2.0.0 - sci-geosciences/grass:0= -" -DEPEND="${RDEPEND} - dev-libs/expat - dev-libs/json-c:= - virtual/jpeg - media-libs/tiff - sci-libs/libgeotiff - sci-libs/proj - sys-libs/zlib - postgres? ( dev-db/postgresql )" - -# these drivers are copied at install from the already installed GRASS -QA_PREBUILT="/usr/share/gdal/grass/driver/db/*" - -src_prepare() { - sed -e 's:mkdir ${GRASSTABLES_DIR}$:mkdir -p ${GRASSTABLES_DIR}:' \ - -i Makefile.in || die - default -} - -src_configure() { - econf \ - --with-grass="/usr/$(get_libdir)/grass70" \ - --with-gdal="/usr/bin/gdal-config" \ - $(use_with postgres postgres-includes "/usr/include/postgresql") -} - -src_install() { - #pass the right variables to 'make install' to prevent a sandbox access violation - emake DESTDIR="${D}" \ - GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \ - AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \ - install -} diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild deleted file mode 100644 index 1d121dde9203..000000000000 --- a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="GDAL plugin to access GRASS data" -HOMEPAGE="https://www.gdal.org/" -SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" - -IUSE="postgres" -RDEPEND=" - >=sci-libs/gdal-2.0.0 - sci-geosciences/grass:0= -" -DEPEND="${RDEPEND} - dev-libs/expat - dev-libs/json-c:= - media-libs/tiff - sci-libs/libgeotiff - sci-libs/proj - sys-libs/zlib - virtual/jpeg - postgres? ( dev-db/postgresql )" - -# these drivers are copied at install from the already installed GRASS -QA_PREBUILT="/usr/share/gdal/grass/driver/db/*" - -src_prepare() { - sed -e 's:mkdir ${GRASSTABLES_DIR}$:mkdir -p ${GRASSTABLES_DIR}:' \ - -i Makefile.in || die - default -} - -src_configure() { - econf \ - --with-grass="/usr/$(get_libdir)/grass70" \ - --with-gdal="/usr/bin/gdal-config" \ - $(use_with postgres postgres-includes "/usr/include/postgresql") -} - -src_install() { - #pass the right variables to 'make install' to prevent a sandbox access violation - emake DESTDIR="${D}" \ - GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \ - AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \ - install -} diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild deleted file mode 100644 index 745a05ffcfa8..000000000000 --- a/sci-geosciences/gdal-grass/gdal-grass-2.1.3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="GDAL plugin to access GRASS data" -HOMEPAGE="https://www.gdal.org/" -SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" - -IUSE="postgres" -RDEPEND=" - >=sci-libs/gdal-2.0.0:= - sci-geosciences/grass:= -" -DEPEND="${RDEPEND} - postgres? ( dev-db/postgresql )" - -# these drivers are copied at install from the already installed GRASS -QA_PREBUILT="/usr/share/gdal/grass/driver/db/*" - -src_prepare() { - sed -e 's:mkdir ${GRASSTABLES_DIR}$:mkdir -p ${GRASSTABLES_DIR}:' \ - -i Makefile.in || die - default -} - -src_configure() { - local grassp=$(best_version sci-geosciences/grass) - local grasspv=$(echo ${grassp/%-r[0-9]*/} | rev | cut -d - -f 1 | rev) - local grasspm=$(ver_cut 1-2 ${grasspv}) - local myeconfargs=( - --with-grass="/usr/$(get_libdir)/grass$(ver_rs 1 '' ${grasspm})" - --with-gdal="/usr/bin/gdal-config" - $(use_with postgres postgres-includes "/usr/include/postgresql") - ) - econf "${myeconfargs[@]}" -} - -src_install() { - #pass the right variables to 'make install' to prevent a sandbox access violation - emake DESTDIR="${D}" \ - GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \ - AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \ - install -} diff --git a/sci-geosciences/gdal-grass/metadata.xml b/sci-geosciences/gdal-grass/metadata.xml deleted file mode 100644 index 4c161841a958..000000000000 --- a/sci-geosciences/gdal-grass/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-geosciences@gentoo.org</email> - <name>Gentoo Geosciences Project</name> - </maintainer> - <use> - <flag name="postgres">Include support for <pkg>dev-db/postgresql</pkg></flag> - </use> -</pkgmetadata> diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest index c5a78e3dcdec..1fb2ce520239 100644 --- a/sci-geosciences/geocode-glib/Manifest +++ b/sci-geosciences/geocode-glib/Manifest @@ -1 +1 @@ -DIST geocode-glib-3.26.1.tar.xz 75296 BLAKE2B 68e42868edfd73db94d16dcc754eea1ee736ad910c5180616ba351cc50b682cd3b7ea4a64c9e1296af315298f68ea850a1773c4a05955c1159a6038773aad184 SHA512 0eb8e8a668c3950d06e77a379d375e2297cf7d95435aa8212715ddc36c3a57a53192e75dd0c82a2f2e7e558ea0e903a477c9dfa54f8cd2805d048fe46265d621 +DIST geocode-glib-3.26.4.tar.xz 75352 BLAKE2B be783328b2372e1647c3fd6debadaf8313688fe1c993cbc1e084cd9ad8ba8fec0b142a0f579f63085684ef8fafc6e7ec6f54441a085d25d9d5f2eed31a893d1b SHA512 998c2f02a8d3d34a8b6a4b031da2e7c28df27014bcf58f3374fbc0c829fff6257c2622fd9bf331e05b85fbc761c64554fb77ce2d986e0f8b59b17aa486f9f609 diff --git a/sci-geosciences/geocode-glib/files/disable-installed-tests.patch b/sci-geosciences/geocode-glib/files/disable-installed-tests.patch deleted file mode 100644 index 9358e4896526..000000000000 --- a/sci-geosciences/geocode-glib/files/disable-installed-tests.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/geocode-glib/tests/meson.build 2019-01-11 14:10:47.797376871 +0200 -+++ b/geocode-glib/tests/meson.build 2019-01-11 14:13:09.409159050 +0200 -@@ -3,7 +3,7 @@ - e = executable('geo-uri', - 'geo-uri.c', - dependencies: geocode_glib_dep, -- install: true, -+ install: false, - install_dir: install_dir) - test('Geo URI', e) - -@@ -12,7 +12,7 @@ - 'geocode-nominatim-test.c', - 'geocode-glib.c', - dependencies: geocode_glib_dep, -- install: true, -+ install: false, - install_dir: install_dir) - env = ['G_TEST_SRCDIR=' + meson.current_source_dir()] - test('API test', e, env: env) -@@ -20,10 +20,11 @@ - e = executable('mock-backend', - 'mock-backend.c', - dependencies: geocode_glib_dep, -- install: true, -+ install: false, - install_dir: install_dir) - test('Test mock backend', e) - -+if false - install_data('locale_format.json', - 'locale_name.json', - 'nominatim-area.json', -@@ -39,3 +40,4 @@ - 'search_lat_long.json', - 'xep.json', - install_dir: install_dir) -+endif diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.1.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild index ab7bb6a37ef6..88a1ebfb3092 100644 --- a/sci-geosciences/geocode-glib/geocode-glib-3.26.1.ebuild +++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild @@ -1,43 +1,43 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit gnome.org meson xdg DESCRIPTION="GLib helper library for geocoding services" -HOMEPAGE="https://git.gnome.org/browse/geocode-glib" +HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib" LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +SLOT="2" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="gtk-doc +introspection test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] - >=net-libs/libsoup-2.42:2.4[introspection?] + >=net-libs/libsoup-3.0.8:3.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + + !<=sci-geosciences/geocode-glib-3.26.4:0 " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.13 - app-text/docbook-xml-dtd:4.3 ) + app-text/docbook-xml-dtd:4.3 + ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig " -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/disable-installed-tests.patch -) - src_configure() { local emesonargs=( - $(meson_use test enable-installed-tests) # Actual installation to live system is sedded out, but we need this for running them in src_test + -Denable-installed-tests=false $(meson_use introspection enable-introspection) $(meson_use gtk-doc enable-gtk-doc) + -Dsoup2=false ) meson_src_configure } diff --git a/sci-geosciences/geocode-glib/metadata.xml b/sci-geosciences/geocode-glib/metadata.xml index f4c3acdf586c..70cb7ffcf02c 100644 --- a/sci-geosciences/geocode-glib/metadata.xml +++ b/sci-geosciences/geocode-glib/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<longdescription lang="en"> - geocode-glib is a helper library for geocoding and reverse-geocoding - services offered by OpenStreetMap and Nominatim. -</longdescription> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <longdescription lang="en"> + geocode-glib is a helper library for geocoding and reverse-geocoding + services offered by OpenStreetMap and Nominatim. + </longdescription> + <upstream> + <remote-id type="gnome-gitlab">GNOME/geocode-glib</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-geosciences/geopy/Manifest b/sci-geosciences/geopy/Manifest new file mode 100644 index 000000000000..b3e58b6afb0b --- /dev/null +++ b/sci-geosciences/geopy/Manifest @@ -0,0 +1,2 @@ +DIST geopy-2.3.0.tar.gz 290677 BLAKE2B 5bd981902e734d76289e628e92a14a550d92509a69585dea94c669256ed279655ed27d03752307c21c773f0364a8c62671d34c49fa889bc933ff021716062422 SHA512 ede61870f38ff2fb7c79f282b06711e6677f6054d082f3b0a1d9f5eace4e7597e65938fc7eebd2c31ceeb27e02de8d1e1a71d71bd66613b6d9185da5e4261a4f +DIST geopy-2.4.1.tar.gz 292965 BLAKE2B aceee966a0377e4ff619d48675b998f6e4cd6977224a4f27ba951ca87d72f289dd870aa70133fa3715cdc6cc8c41b71c00227f80b056b3e1dc4ec1396a287c39 SHA512 64263c85fd475072b66c037ffd9ff3352f7fad31e85507bf4eb91ea4a11c883dbc8b5348d29fd389f6a2765ba92cda4b883f1723bd99d9c1ad00154add3cc431 diff --git a/sci-geosciences/geopy/geopy-2.3.0-r2.ebuild b/sci-geosciences/geopy/geopy-2.3.0-r2.ebuild new file mode 100644 index 000000000000..96dc7a2bfd6b --- /dev/null +++ b/sci-geosciences/geopy/geopy-2.3.0-r2.ebuild @@ -0,0 +1,21 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Python client for several popular geocoding web services" +HOMEPAGE="https://github.com/geopy/geopy" +SRC_URI="https://github.com/geopy/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +# Need geocoding service to test +RESTRICT="test" + +RDEPEND=">=sci-geosciences/GeographicLib-1.51-r1[python(-),${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/sci-geosciences/geopy/geopy-2.4.1.ebuild b/sci-geosciences/geopy/geopy-2.4.1.ebuild new file mode 100644 index 000000000000..53d72329fb55 --- /dev/null +++ b/sci-geosciences/geopy/geopy-2.4.1.ebuild @@ -0,0 +1,21 @@ +# 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 +inherit distutils-r1 + +DESCRIPTION="Python client for several popular geocoding web services" +HOMEPAGE="https://github.com/geopy/geopy" +SRC_URI="https://github.com/geopy/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +# Need geocoding service to test +RESTRICT="test" + +RDEPEND="dev-python/geographiclib[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/sci-geosciences/geopy/metadata.xml b/sci-geosciences/geopy/metadata.xml new file mode 100644 index 000000000000..e47cc76db872 --- /dev/null +++ b/sci-geosciences/geopy/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <longdescription lang="en"> + geopy is a Python client for several popular geocoding web services. + geopy makes it easy for Python developers to locate the coordinates + of addresses, cities, countries, and landmarks across the globe using + third-party geocoders and other data sources. + </longdescription> + <upstream> + <remote-id type="github">geopy/geopy</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-geosciences/gmaptool/Manifest b/sci-geosciences/gmaptool/Manifest new file mode 100644 index 000000000000..c168da3c0f05 --- /dev/null +++ b/sci-geosciences/gmaptool/Manifest @@ -0,0 +1 @@ +DIST lgmt08220.zip 272383 BLAKE2B 94746ed28300a1db836993c3bb46def08b7961259d760f9f20c57e132ae5c9e077868dab5f98399d0975f947b78dbc602a5ec3393d01ba63998853c348628f22 SHA512 fba72ea07bdef216f7397a77c1918000492f79f66699aa0b1dda4d154638108237172a85651516c457b8ab7859ed1c5110e9d34247ebf74597329a0ab920c69f diff --git a/sci-geosciences/gmaptool/gmaptool-08220-r1.ebuild b/sci-geosciences/gmaptool/gmaptool-08220-r1.ebuild new file mode 100644 index 000000000000..7643990be362 --- /dev/null +++ b/sci-geosciences/gmaptool/gmaptool-08220-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Program for splitting and merging maps in Garmin format" +HOMEPAGE="https://www.gmaptool.eu/" +SRC_URI="https://www.gmaptool.eu/sites/default/files/lgmt${PV}.zip" +S="${WORKDIR}" + +LICENSE="CC-BY-SA-3.0 LGPL-2.1+" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" + +BDEPEND="app-arch/unzip" + +QA_PREBUILT="usr/bin/gmt" + +src_install() { + dobin gmt + dodoc readme.txt +} diff --git a/sci-geosciences/gmaptool/metadata.xml b/sci-geosciences/gmaptool/metadata.xml new file mode 100644 index 000000000000..5a83999da18a --- /dev/null +++ b/sci-geosciences/gmaptool/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + The program makes the following operations on map files in Garmin format: + - join several maps into single file. + - split map into files for Mapsource, + - split map into parts, + - write corrections into original files and insert a new unlock code, + - display informations about maps. + </longdescription> +</pkgmetadata> diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest index 44f607655fe3..63d6857c97f9 100644 --- a/sci-geosciences/gmt/Manifest +++ b/sci-geosciences/gmt/Manifest @@ -1,16 +1 @@ -DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279310e90b3f7a01a5b9e68186fc3d1711af4f5730fa20a8a04bdc57a8e06f9a656c8db71c5bc2b8d42292cb7434ad07880732 SHA512 57281e78cd40b168cfd49818a25523c1d1b44a8c4cab59aa5683052f14df25016b70485f79327bac37f5dd8b7c77d01a2264fe08045b7c13c3e1bd216323e50e -DIST gmt-4.5.18-src.tar.bz2 39791396 BLAKE2B 2199c337707773f91c3372992821f35a4e2d0f7451881507d29798425d914e82cc8d038fee43e6a44bbc18190619134906424f4d5ca3261af69d43934661fd90 SHA512 6d28ac29049c480d22063bbbcdb0cacf2c620e817eda19435e9b1bc0a899acf062296530f1fc677c77472fafaa6b1e6c443aaf8def7505847ed4afdd5c972945 -DIST gmt-4.5.6-doc.tar.bz2 25230761 BLAKE2B 5e4ed5400accb3da2af6d6403ffb1b86b05a8fe6724b7fcf1728c31f56cfd0a4ce80fe47b9b3f5fcab1bc42ef8cc06ec0cc971cdd7397ab059035dfe9bc2e109 SHA512 97d3ab39b8f015c7488d039af1578c9187f8fdd82e8492729150afb1ec658b2e5221d92145e0776348ecfd1a720004e9766760e3a20337b00f43f309150ae302 -DIST gmt-4.5.6-share.tar.bz2 43704 BLAKE2B 56c4c2e29a97824245c8b8cc9afbf5e865886d3047392c4ab72311bb278f4a041516a16858f06103b8edfe6ec251db09e0a3e028bb944c289ba833f99c0af79f SHA512 7b1ca938a291f06be83421d1324612851da74a2156bc7568da01b05f2a235eb2f36854abd4fac5c357f9e22df4f98a69410fc3e2e2117f72994db60c00780fc0 -DIST gmt-4.5.6-src.tar.bz2 1134118 BLAKE2B 6519002bfcafd91c420d56fb356d70cb6a814a62c8b7d9d30d77015f8401ea71ffb87b9ea4ea5b2af7917b0bce3794d66566150ce2ae82c7a5d9bb52bf5414ef SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e -DIST gmt-4.5.6-suppl.tar.bz2 4137369 BLAKE2B 9150e54385c4ee3df6dee6f8598cb2e91b4b23a3e4531fad7fee7e4eef80cbe6f06efd4a5a06882aff90782a5f07824cb6ed744da5c10e73402bdb1930984b9d SHA512 7e1cd35da0a7f75800074cac4dd7f82ce17721953251c951c4f585f0cf159af6c2450fba20d9c02fad69ec7a689483de55cc652fcc600535255cf17ab528a027 -DIST gmt-4.5.6-triangle.tar.bz2 103426 BLAKE2B cb6372a0980a660a7e70725d43681c0a251698ff89329f92c37965c70d180cfb63ee2741702c8f9cbfef0f41c95cf6676dabcef3aefb18801367efc32e833f44 SHA512 3daabba610a50e72c2e9e5dd7fb22ff02547c598ff22f40f145f3f794447cde995ddbdcd2560954478806fc5edc2af4fb59615e405622daa4292e6dc2f0e4f5e -DIST gmt-4.5.8-non-gpl.tar.bz2 109125 BLAKE2B 7b6eef77a7c15f6d5acfc9ca4cc4d2a8db8ef00362b2f1fc7c50edd76ffb14810da0eb1837a31f8a4b31391308f45f4c7289303d3bc4885f5c152d62b49151b5 SHA512 04b3eefd1490b194d7797af86fc726dd84960d65dd955e5ddefaf6ea4ec5a98f6f00085acc0cc846aa70e986facf65221256dd6a625f918c6abe6ba0b6b06f64 -DIST gmt-4.5.8.tar.bz2 39350328 BLAKE2B 8d1e0c588ef4ecef1d64a4071101d9a0c14ba9780a213ce1b121840c0acd676f43931f4a4f03a539b40bfba57935f8a9e9bae3cb3630410f15cccb3bd57eb87b SHA512 5bc3be1f7963df6a3035195e2123645d8a8b7a8a9aa17c89a6dd50560485706c628e0e0aca779930c4a28f2305fcc184981db728085d3373b2cad89e59d5c6fd -DIST gmt-4.5.9-non-gpl.tar.bz2 103494 BLAKE2B a056845917a7eb2c6e66a8797a2d47a2fe4c9a659b98242ff6953f9194d86d56a85c3e1e973f562d060a3d3396845847de683e06b6b929effb84ca0c625afe8e SHA512 a41cd94acbd014bed780797be1ac1b492388c7c8e0fcfc5e773e894e803a024bdc60b897589ad4db9af973f20606a87ac9cff606f0391641236bca95c0b7a4c5 -DIST gmt-4.5.9.tar.bz2 39325492 BLAKE2B 012afa7555d7262a4b8ae9af90309653f6f374fdb34bffbc1f0052e2cbee93b17d1f6e70934e3de555f83774a34c278bc81f5a6cc7521840a35bc70001d9ee6f SHA512 1edda71787fa2e1434a6891618d4523c39d04c2db285dadc66c1d52b425cfff6866c492926cae41d78d2a4e5118e8d003ef3d71d164e0c0695d71aaddb598242 -DIST gshhg-gmt-2.3.7.tar.gz 57052180 BLAKE2B 5b618c874cca97da819263c3c436db1235d3293712a72c21ac4ca3ae78e95b5d36915312de3df361f978b14c697884ca278bebc41ac4c1d054adda6c417eb5b9 SHA512 27e97efe9d146a58d1c6674c5b6cde6b7545be60c1f7d3d93faca1034986d1648e73b589de571897fc53cd0d050a5875dcc9923e3f861f8473ca568a8142d727 -DIST gshhs-2.1.1-coast.tar.bz2 4322743 BLAKE2B e171b6a41ceee6c15a9a7679c6a9145c1ffcede7be61bc26b351371a7bde7f4ddd68bbd5104638da56a66af3e930fc11d9dc6c215d3c3b528f0d56b855e3b496 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332 -DIST gshhs-2.1.1-full.tar.bz2 29916230 BLAKE2B 80ae867a46fc5f9cab60c3e4cedb0db7d683cb58294865a228b8853b458647179382d8fc7fefcbfff7f33ee0e12b527e402376b78f1be0ff8388a81ba682d52d SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375 -DIST gshhs-2.1.1-high.tar.bz2 9712697 BLAKE2B fa81ee855916566e135eb0522b414da9cf28f1cc29847fbccf80a485f337e6b8a1e051df95d38454679e0405cfa6777cc7f0139772425c082d46b6bd65c17c98 SHA512 a9c22d7ce285320d4ae22a1a446e7d7d446d1b0641abeb39d50e358d65011fd3e39761a61a41820a373df4d4ef950160f5aab71d2df899a8425caf7d162e6e0e -DIST gshhs-2.2.0.tar.bz2 47021761 BLAKE2B 89ffbca48d782a64ec1ecf7945915a64ab70385c1db3fef65bf1d41db46f3c047554d51c13de20706fe84d1568593679fb822b23d8ab580c100159475edd9cf1 SHA512 a9c1550f24feeefbc7ae633cce41e737f8153bb7df974e942fb5b9f0c931a49707c737f34bf6316ac89aa9bf487a091ada08ca8d798e2a5385e75f3dc05fdf83 +DIST gmt-6.4.0-src.tar.xz 55875004 BLAKE2B 887ea35708d354f3812822b1effd4906ead129a186b0117930bb46e057671645e3d2eec3e0a104aa3e06092c6c28857f5dba2c8828b61847e618651eeaa5f146 SHA512 0748215cbe9138a0ec3c7168019fee438e53c1d80a836caa33fa82d4d5ba30525e636a4a937ab9cb1c90cf07181c610f7ebcb5e844f0019f51523613878f7e40 diff --git a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch b/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch deleted file mode 100644 index f0fe4c3e833e..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch +++ /dev/null @@ -1,62 +0,0 @@ -Drop manipulation of several flags: - -* stripping of -g from CFLAGS, as it interferes with deliberate - generation of debug symbols and breaks on flags like -ggdb. -* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is - done as a separate step on Gentoo (and many other distros) in order - to faciliate retention or splitting of debug symbols. -* Setting of optimization flags, as the user should be free to choose - them. - -2009-07-27 Martin von Gagern - -Reference: http://bugs.gentoo.org/279268 - -Index: GMT4.5.0/configure -=================================================================== ---- GMT4.5.0.orig/configure -+++ GMT4.5.0/configure -@@ -10665,19 +10665,6 @@ if test "X$enable_debug" = "Xyes" ; then - echo "${ECHO_T}yes" >&6; } - CFLAGS="$CFLAGS -g" - else -- CFLAGS=`echo $CFLAGS | sed 's/-g//'` -- if test "$os" = "Darwin" ; then -- LDFLAGS="$LDFLAGS -Wl,-x" -- else -- LDFLAGS="$LDFLAGS -s" -- fi -- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then -- CFLAGS="$CFLAGS -O2" -- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then -- CFLAGS="$CFLAGS" -- else -- CFLAGS="$CFLAGS -O" -- fi - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } - fi -Index: GMT4.5.0/configure.ac -=================================================================== ---- GMT4.5.0.orig/configure.ac -+++ GMT4.5.0/configure.ac -@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then - AC_MSG_RESULT(yes) - CFLAGS="$CFLAGS -g" - else -- CFLAGS=`echo $CFLAGS | sed 's/-g//'` -- if test "$os" = "Darwin" ; then -- LDFLAGS="$LDFLAGS -Wl,-x" -- else -- LDFLAGS="$LDFLAGS -s" -- fi -- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then -- CFLAGS="$CFLAGS -O2" -- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then -- CFLAGS="$CFLAGS" -- else -- CFLAGS="$CFLAGS -O" -- fi - AC_MSG_RESULT(no) - fi - dnl ----------------------------------------------------------------- diff --git a/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch b/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch deleted file mode 100644 index 07494380fdfb..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -urN GMT4.5.6/src/Makefile GMT4.5.6.new/src/Makefile ---- GMT4.5.6/src/Makefile 2011-03-03 22:02:50.000000000 +0100 -+++ GMT4.5.6.new/src/Makefile 2011-06-07 14:48:00.969500019 +0200 -@@ -195,13 +195,13 @@ - $(RANLIB) $@ - - libpsl.$(SL): libpsl.a -- $(LD) $(LD_OPT) pslib.o $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) pslib.o $(LIBS) -o $@ - - libgmt.$(SL): libgmt.a -- $(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@ - - libgmtps.$(SL): libgmtps.a libgmt.$(SL) libpsl.$(SL) -- $(LD) $(LD_OPT) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@ - - #------------------------------------------------------------------------------- - # program rules -diff -urN GMT4.5.6/src/mgd77/Makefile GMT4.5.6.new/src/mgd77/Makefile ---- GMT4.5.6/src/mgd77/Makefile 2010-11-01 23:39:16.000000000 +0100 -+++ GMT4.5.6.new/src/mgd77/Makefile 2011-06-07 14:53:46.394181616 +0200 -@@ -93,7 +93,7 @@ - $(RANLIB) $@ - - libmgd77.$(SL): libmgd77.a -- $(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ - - #------------------------------------------------------------------------------- - # program rules -diff -urN GMT4.5.6/src/mgg/Makefile GMT4.5.6.new/src/mgg/Makefile ---- GMT4.5.6/src/mgg/Makefile 2010-11-01 23:39:16.000000000 +0100 -+++ GMT4.5.6.new/src/mgg/Makefile 2011-06-07 14:54:48.096410233 +0200 -@@ -95,7 +95,7 @@ - $(RANLIB) $@ - - libgmt_mgg.$(SL): libgmt_mgg.a -- $(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ - - #------------------------------------------------------------------------------- - # program rules -diff -urN GMT4.5.6/src/x2sys/Makefile GMT4.5.6.new/src/x2sys/Makefile ---- GMT4.5.6/src/x2sys/Makefile 2010-11-01 23:39:16.000000000 +0100 -+++ GMT4.5.6.new/src/x2sys/Makefile 2011-06-07 14:54:15.124822433 +0200 -@@ -83,7 +83,7 @@ - $(RANLIB) $@ - - libx2sys.$(SL): libx2sys.a -- $(LD) $(LD_OPT) x2sys.o $(ALLLIB) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) x2sys.o $(ALLLIB) -o $@ - - #------------------------------------------------------------------------------- - # program rules diff --git a/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch b/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch deleted file mode 100644 index 216149d93f78..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/mgd77/mgd77.c b/src/mgd77/mgd77.c -index b27b1d9..6a25576 100644 ---- a/src/mgd77/mgd77.c -+++ b/src/mgd77/mgd77.c -@@ -854,7 +854,7 @@ int MGD77_Decode_Header_m77t (struct MGD77_HEADER_PARAMS *P, char *record) - case 3: strcpy (P->Parameters_Surveyed_Code, word); break; - case 4: strncpy (P->File_Creation_Year, word, 4); - strncpy (P->File_Creation_Month, &word[4], 2); -- strncpy (P->File_Creation_Day, &word[6], 4); break; -+ strncpy (P->File_Creation_Day, &word[6], 2); break; - case 5: strcpy (P->Source_Institution, word); break; - case 6: strcpy (P->Country, word); break; - case 7: strcpy (P->Platform_Name, word); break; -@@ -865,11 +865,11 @@ int MGD77_Decode_Header_m77t (struct MGD77_HEADER_PARAMS *P, char *record) - case 12: strcpy (P->Funding, word); break; - case 13: strncpy (P->Survey_Departure_Year, word, 4); - strncpy (P->Survey_Departure_Month, &word[4], 2); -- strncpy (P->Survey_Departure_Day, &word[6], 4); break; -+ strncpy (P->Survey_Departure_Day, &word[6], 2); break; - case 14: strcpy (P->Port_of_Departure, word); break; - case 15: strncpy (P->Survey_Arrival_Year, word, 4); - strncpy (P->Survey_Arrival_Month, &word[4], 2); -- strncpy (P->Survey_Arrival_Day, &word[6], 4); break; -+ strncpy (P->Survey_Arrival_Day, &word[6], 2); break; - case 16: strcpy (P->Port_of_Arrival, word); break; - case 17: strcpy (P->Navigation_Instrumentation, word); break; - case 18: strcpy (P->Geodetic_Datum_Position_Determination_Method, word); break; diff --git a/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch b/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch deleted file mode 100644 index 5c63bb209578..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/gmt.h b/src/gmt.h -index d4c9c20..ea6ddc5 100644 ---- a/src/gmt.h -+++ b/src/gmt.h -@@ -34,9 +34,11 @@ extern "C" { - - /* GMT is POSIX.1 COMPLIANT */ - -+/* - #ifndef _POSIX_SOURCE - #define _POSIX_SOURCE 1 - #endif -+*/ - - /* Declaration modifiers for DLL support (MSC et al) */ -
\ No newline at end of file diff --git a/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch b/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch deleted file mode 100644 index f57f1d811b05..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch +++ /dev/null @@ -1,38 +0,0 @@ -Drop manipulation of several flags: - -* stripping of -g from CFLAGS, as it interferes with deliberate - generation of debug symbols and breaks on flags like -ggdb. -* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is - done as a separate step on Gentoo (and many other distros) in order - to faciliate retention or splitting of debug symbols. -* Setting of optimization flags, as the user should be free to choose - them. - -2009-07-27 Martin von Gagern - -Reference: http://bugs.gentoo.org/279268 - -Index: GMT4.5.0/configure.ac -=================================================================== ---- GMT4.5.0.orig/configure.ac -+++ GMT4.5.0/configure.ac -@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then - AC_MSG_RESULT(yes) - CFLAGS="$CFLAGS -g" - else -- CFLAGS=`echo $CFLAGS | sed 's/-g//'` -- if test "$os" = "Darwin" ; then -- LDFLAGS="$LDFLAGS -Wl,-x" -- else -- LDFLAGS="$LDFLAGS -s" -- fi -- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then -- CFLAGS="$CFLAGS -O2" -- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then -- CFLAGS="$CFLAGS" -- else -- CFLAGS="$CFLAGS -O" -- fi - AC_MSG_RESULT(no) - fi - dnl ----------------------------------------------------------------- diff --git a/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch b/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch deleted file mode 100644 index e724b4ceab79..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix "gmtdigitize.c:77:2: error: unknown type name 'gid_t'" -build failure; patch from upstream version 4.5.11 - -https://bugs.gentoo.org/show_bug.cgi?id=543624 - ---- a/src/misc/gmtdigitize.c -+++ b/src/misc/gmtdigitize.c -@@ -37,6 +37,11 @@ - * - */ - -+#define _XOPEN_SOURCE -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #include "gmt.h" - - #ifndef WIN32 diff --git a/sci-geosciences/gmt/gmt-4.5.18.ebuild b/sci-geosciences/gmt/gmt-4.5.18.ebuild deleted file mode 100644 index 9730b119d3cb..000000000000 --- a/sci-geosciences/gmt/gmt-4.5.18.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -GSHHG="gshhg-gmt-2.3.7" - -DESCRIPTION="Powerful map generator" -HOMEPAGE="https://gmt.soest.hawaii.edu/" -SRC_URI=" - mirror://gmt/${P}-src.tar.bz2 - mirror://gmt/${GSHHG}.tar.gz - gmttria? ( mirror://gmt/${P}-non-gpl-src.tar.bz2 )" - -LICENSE="GPL-2 gmttria? ( Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript" - -RDEPEND=" - !sci-biology/probcons - gdal? ( sci-libs/gdal ) - netcdf? ( >=sci-libs/netcdf-4.1 ) - octave? ( sci-mathematics/octave )" -DEPEND="${RDEPEND}" - -# mex can use matlab too which i can't test -REQUIRED_USE=" - mex? ( octave ) -" - -# hand written make files that are not parallel safe -MAKEOPTS+=" -j1" - -PATCHES=( - "${FILESDIR}"/${PN}-4.5.9-no-strip.patch - "${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch - ) - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_prepare() { - default - - mkdir "${S}/share/coast" || die - mv -f "${WORKDIR}/${GSHHG}/"*.nc "${S}/share/coast/" || die -} - -src_configure() { - econf \ - --libdir=/usr/$(get_libdir)/${P} \ - --includedir=/usr/include/${P} \ - --datadir=/usr/share/${P} \ - --docdir=/usr/share/doc/${PF} \ - --disable-update \ - --disable-matlab \ - --disable-xgrid \ - --disable-debug \ - $(use_enable gdal) \ - $(use_enable netcdf) \ - $(use_enable octave) \ - $(use_enable debug devdebug) \ - $(use_enable !metric US) \ - $(use_enable postscript eps) \ - $(use_enable mex) \ - $(use_enable gmttria triangle) -} - -src_install() { - emake DESTDIR="${D}" install-all - einstalldocs - - docompress -x /usr/share/doc/${PF}/{examples,tutorial} - - # remove static libs - find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} + || die - - cat <<- _EOF_ > "${T}/99gmt" - GMTHOME="${EPREFIX}/usr/share/${P}" - GMT_SHAREDIR="${EPREFIX}/usr/share/${P}" - _EOF_ - doenvd "${T}/99gmt" -} diff --git a/sci-geosciences/gmt/gmt-4.5.6.ebuild b/sci-geosciences/gmt/gmt-4.5.6.ebuild deleted file mode 100644 index 9e73c830b201..000000000000 --- a/sci-geosciences/gmt/gmt-4.5.6.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib autotools eutils - -GSHHS="gshhs-2.1.1" - -DESCRIPTION="Powerful map generator" -HOMEPAGE="http://gmt.soest.hawaii.edu/" -SRC_URI="mirror://gmt/legacy/${P}-src.tar.bz2 - mirror://gmt/legacy/${P}-share.tar.bz2 - mirror://gmt/legacy/${GSHHS}-coast.tar.bz2 - mirror://gmt/legacy/${P}-suppl.tar.bz2 - doc? ( mirror://gmt/legacy/${P}-doc.tar.bz2 ) - gmtfull? ( mirror://gmt/legacy/${GSHHS}-full.tar.bz2 ) - gmthigh? ( mirror://gmt/legacy/${GSHHS}-high.tar.bz2 ) - gmttria? ( mirror://gmt/legacy/${P}-triangle.tar.bz2 )" - -LICENSE="GPL-2 gmttria? ( Artistic )" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc debug gmtfull gmthigh gmttria +metric mex +netcdf octave postscript" - -RDEPEND=" - !sci-biology/probcons - netcdf? ( >=sci-libs/netcdf-4.1 ) - octave? ( sci-mathematics/octave ) -" -DEPEND="${RDEPEND}" - -RESTRICT="mirror" # for the gmttria - -S="${WORKDIR}/GMT${PV}" - -# mex can use matlab too which i can't test -REQUIRED_USE=" - mex? ( octave ) - gmthigh? ( !gmtfull ) gmtfull? ( !gmthigh ) -" - -# hand written make files that are not parallel safe -MAKEOPTS+=" -j1" - -src_prepare() { - mv -f "${WORKDIR}/share/"* "${S}/share/" || die - - epatch \ - "${FILESDIR}/${PN}-4.5.0-no-strip.patch" \ - "${FILESDIR}/${PN}-4.5.6-respect-ldflags.patch" \ - "${FILESDIR}"/${PN}-4.5.9-unistd.h.patch - - eautoreconf -} - -src_configure() { - # triangle disabled due to non-comercial license - econf \ - --libdir=/usr/$(get_libdir)/${P} \ - --includedir=/usr/include/${P} \ - --datadir=/usr/share/${P} \ - --docdir=/usr/share/doc/${PF} \ - --disable-update \ - --disable-debug \ - --disable-gdal \ - --disable-matlab \ - --disable-xgrid \ - --enable-shared \ - $(use_enable netcdf) \ - $(use_enable octave) \ - $(use_enable debug devdebug) \ - $(use_enable !metric US) \ - $(use_enable postscript eps) \ - $(use_enable mex) \ - $(use_enable gmttria triangle) -} - -src_install() { - emake \ - DESTDIR="${D}" \ - install-gmt install-data install-suppl install-man - - # remove static libs - find "${D}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} + - - dodoc README - use doc && dodoc -r "${S}"/share/doc/${PN}/* - - cat << _EOF_ > "${T}/99gmt" -GMTHOME=${EPREFIX}/usr/share/${P} -GMT_SHAREDIR=${EPREFIX}/usr/share/${P} -_EOF_ - doenvd "${T}/99gmt" -} diff --git a/sci-geosciences/gmt/gmt-4.5.8.ebuild b/sci-geosciences/gmt/gmt-4.5.8.ebuild deleted file mode 100644 index 69ac9baca347..000000000000 --- a/sci-geosciences/gmt/gmt-4.5.8.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils multilib - -GSHHS="gshhs-2.2.0" - -DESCRIPTION="Powerful map generator" -HOMEPAGE="http://gmt.soest.hawaii.edu/" -SRC_URI=" - mirror://gmt/legacy/${P}.tar.bz2 - mirror://gmt/legacy/${GSHHS}.tar.bz2 - gmttria? ( mirror://gmt/legacy/${P}-non-gpl.tar.bz2 )" - -LICENSE="GPL-2 gmttria? ( Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript" - -RDEPEND=" - !sci-biology/probcons - gdal? ( sci-libs/gdal ) - netcdf? ( >=sci-libs/netcdf-4.1 ) - octave? ( sci-mathematics/octave )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/GMT${PV}" - -# mex can use matlab too which i can't test -REQUIRED_USE=" - mex? ( octave ) -" - -# hand written make files that are not parallel safe -MAKEOPTS+=" -j1" - -PATCHES=( - "${FILESDIR}"/${PN}-4.5.0-no-strip.patch - "${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch - "${FILESDIR}"/${P}-bfr-overflow.patch - "${FILESDIR}"/${P}-impl-dec.patch - ) - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_prepare() { - mv -f "${WORKDIR}/share/"* "${S}/share/" || die - - tc-export AR RANLIB - - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - --libdir=/usr/$(get_libdir)/${P} - --includedir=/usr/include/${P} - --datadir=/usr/share/${P} - --docdir=/usr/share/doc/${PF} - --disable-update - --disable-matlab - --disable-xgrid - --disable-debug - $(use_enable gdal) - $(use_enable netcdf) - $(use_enable octave) - $(use_enable debug devdebug) - $(use_enable !metric US) - $(use_enable postscript eps) - $(use_enable mex) - $(use_enable gmttria triangle) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install install-all - - # remove static libs - find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} + - - cat <<- _EOF_ > "${T}/99gmt" - GMTHOME="${EPREFIX}/usr/share/${P}" - GMT_SHAREDIR="${EPREFIX}/usr/share/${P}" - _EOF_ - doenvd "${T}/99gmt" -} diff --git a/sci-geosciences/gmt/gmt-4.5.9.ebuild b/sci-geosciences/gmt/gmt-4.5.9.ebuild deleted file mode 100644 index 7aefd90eb08c..000000000000 --- a/sci-geosciences/gmt/gmt-4.5.9.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils multilib - -GSHHS="gshhs-2.2.0" - -DESCRIPTION="Powerful map generator" -HOMEPAGE="http://gmt.soest.hawaii.edu/" -SRC_URI=" - mirror://gmt/legacy/${P}.tar.bz2 - mirror://gmt/legacy/${GSHHS}.tar.bz2 - gmttria? ( mirror://gmt/legacy/${P}-non-gpl.tar.bz2 )" - -LICENSE="GPL-2 gmttria? ( Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript" - -RDEPEND=" - !sci-biology/probcons - gdal? ( sci-libs/gdal ) - netcdf? ( >=sci-libs/netcdf-4.1 ) - octave? ( sci-mathematics/octave )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/GMT${PV}" - -# mex can use matlab too which i can't test -REQUIRED_USE=" - mex? ( octave ) -" - -# hand written make files that are not parallel safe -MAKEOPTS+=" -j1" - -PATCHES=( - "${FILESDIR}"/${PN}-4.5.9-no-strip.patch - "${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch - "${FILESDIR}"/${PN}-4.5.9-unistd.h.patch - ) - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_prepare() { - mv -f "${WORKDIR}/share/"* "${S}/share/" || die - - tc-export AR RANLIB - - autotools-utils_src_prepare - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --libdir=/usr/$(get_libdir)/${P} - --includedir=/usr/include/${P} - --datadir=/usr/share/${P} - --docdir=/usr/share/doc/${PF} - --disable-update - --disable-matlab - --disable-xgrid - --disable-debug - $(use_enable gdal) - $(use_enable netcdf) - $(use_enable octave) - $(use_enable debug devdebug) - $(use_enable !metric US) - $(use_enable postscript eps) - $(use_enable mex) - $(use_enable gmttria triangle) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install install-all - - # remove static libs - find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} + - - cat <<- _EOF_ > "${T}/99gmt" - GMTHOME="${EPREFIX}/usr/share/${P}" - GMT_SHAREDIR="${EPREFIX}/usr/share/${P}" - _EOF_ - doenvd "${T}/99gmt" -} diff --git a/sci-geosciences/gmt/gmt-6.4.0.ebuild b/sci-geosciences/gmt/gmt-6.4.0.ebuild new file mode 100644 index 000000000000..ab7b61b5eb63 --- /dev/null +++ b/sci-geosciences/gmt/gmt-6.4.0.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 cmake + +DESCRIPTION="Powerful map generator" +HOMEPAGE="https://www.generic-mapping-tools.org" +SRC_URI="https://github.com/GenericMappingTools/${PN}/releases/download/${PV}/${P}-src.tar.xz" + +LICENSE="GPL-3+ gmttria? ( Artistic )" +SLOT="6" +KEYWORDS="amd64 ~x86" +IUSE="blas +fftw ffmpeg +gdal geos gmttria lapack openmp pcre threads zlib" + +DEPEND=" + app-text/ghostscript-gpl:= + media-gfx/graphicsmagick:= + net-misc/curl + >=sci-libs/netcdf-4.1:=[hdf5] + media-video/ffmpeg:= + blas? ( virtual/blas ) + fftw? ( sci-libs/fftw:3.0= ) + gdal? ( sci-libs/gdal:= ) + geos? ( sci-libs/geos ) + lapack? ( virtual/lapack ) + pcre? ( dev-libs/libpcre2 ) + zlib? ( sys-libs/zlib:= ) +" +RDEPEND="${DEPEND} + !sci-biology/probcons + sci-geosciences/dcw-gmt + sci-geosciences/gshhg-gmt +" + +src_prepare() { + cmake_src_prepare + # Rename man pages to avoid a name conflict with gmt5 + pushd man_release || die + local m c suffix newc + for m in *.gz; do + c=${m%%.*} + suffix=${m#*.} + if [[ "${c}" == "gmt" ]]; then + newc=gmt${SLOT} + else + newc=gmt${SLOT}_${c} + fi + mv "${c}.${suffix}" "${newc}.${suffix}" || die + done + popd || die +} + +src_configure() { + local mycmakeargs=( + -DGMT_DATADIR="share/${P}" + -DGMT_DOCDIR="share/doc/${PF}" + -DGMT_MANDIR="share/man" + -DLICENSE_RESTRICTED=$(usex gmttria no yes) + -DGMT_ENABLE_OPENMP=$(usex openmp) + -DGMT_USE_THREADS=$(usex threads) + -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=OFF # Install bash completions properly + -DGMT_INSTALL_MODULE_LINKS=OFF # Don't install symlinks on gmt binary, they are conflicted with gmt5 + -DGMT_INSTALL_NAME_SUFFIX="${SLOT}" + -DBASH_COMPLETION_DIR="$(get_bashcompdir)" + -DCMAKE_DISABLE_FIND_PACKAGE_PCRE=ON + $(cmake_use_find_package blas BLAS) + $(cmake_use_find_package gdal GDAL) + $(cmake_use_find_package geos GEOS) + $(cmake_use_find_package fftw FFTW3) + $(cmake_use_find_package lapack LAPACK) + $(cmake_use_find_package pcre PCRE2) + $(cmake_use_find_package zlib ZLIB) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + docompress -x /usr/share/doc/${PF}/examples + docompress -x /usr/share/doc/${PF}/tutorial + + # remove conflicting symlink + rm "${ED}/usr/bin/gmt" || die + rm "${ED}/usr/$(get_libdir)/libgmt.so" || die + rm "${ED}/usr/$(get_libdir)/libpostscriptlight.so" || die + + # Decompress manuals + find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} + || die + # Rename bash completion file + mv "${D}$(get_bashcompdir)/gmt_completion.bash" "${D}$(get_bashcompdir)/gmt${SLOT}" || die +} diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml index c31969b5f364..05748e9b8511 100644 --- a/sci-geosciences/gmt/metadata.xml +++ b/sci-geosciences/gmt/metadata.xml @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>sci-geosciences@gentoo.org</email> - <name>Gentoo Geosciences Project</name> - </maintainer> - <use> - <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag> - <flag name="gmtfull">Full resolution bathymetry database</flag> - <flag name="gmthigh">Add high resolution bathymetry database</flag> - <flag name="gmttria">Non GNU triangulation method, more efficient</flag> - <flag name="metric">Use SI (cm) units instead of US (inches) ones</flag> - <flag name="mex">Enable compilation of mex supplement which requires Octave/Matlab</flag> - <flag name="octave">Enable octave support</flag> - </use> + <maintainer type="project"> + <email>sci-geosciences@gentoo.org</email> + <name>Gentoo Geosciences Project</name> + </maintainer> + <use> + <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag> + <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag> + <flag name="gmttria">Non GNU triangulation method, more efficient</flag> + </use> + <upstream> + <remote-id type="github">GenericMappingTools/gmt</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest index 3da97278325d..bb13b4efd7ee 100644 --- a/sci-geosciences/gnome-maps/Manifest +++ b/sci-geosciences/gnome-maps/Manifest @@ -1,2 +1 @@ -DIST gnome-maps-3.30.3.1.tar.xz 2175840 BLAKE2B 0c2f44ec3262715d98e1a0412ca305e15916cdb92df5fc5b04df34b65a7b9c55d4f5dd9c54f9f9dc34f8e6dd889f60d7993b59ca0cd92e4e60b22b506877b24c SHA512 02d3b1b305c1011a60a34566847962ec3c32ee3563ce2c327b810fae24c2df08354d8420f1986645d861cfef7a35f336d67d4576a3e2f61eabdd972b8d070a8e -DIST gnome-maps-3.30.3.tar.xz 2176712 BLAKE2B 8595643ddf3f6c419fdc053561e49e62d6bd6e3713d3d809d3fe73cd1aecf3361e3f6592fb53d6963cbdd5fc3edaf1dcb616059da9e5e506a3399d00a9a65de7 SHA512 f3481266c6cf792da71ef40ce489c13fdd807dab91238e02b815b25e29119ffb56212fb03078e14004cca27e24906af1b94f7f3c4325bbf4f332c782c79d8203 +DIST gnome-maps-45.5.tar.xz 3141872 BLAKE2B 3064a7ba2e96eaca7c5ad3a66874eb05bde1e675076003f3470ab5bb3bab04525e83e09a2239524247e1963af768d3e36512cbe3bc4dfe05dd951570b4488567 SHA512 cfcf616c331b8feebd79e31585a7f6f0aa05d3cf48713930635585a7d069996ec8c739b6bc1528b649d01c59307a39402d46a27c5e773d1e6b9b6a46362af35b diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild deleted file mode 100644 index 9aea12d14292..000000000000 --- a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="A map application for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Maps" - -LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~x86" - -# Pure introspection dependencies found by grepping imports.gi in ${S} -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - >=dev-libs/gjs-1.50.0 - >=dev-libs/gobject-introspection-0.10.1:= - >=x11-libs/gtk+-3.22:3[introspection] - >=app-misc/geoclue-0.12.99:2.0[introspection] - >=dev-libs/libgee-0.16:0.8[introspection] - >=dev-libs/folks-0.10 - >=sci-geosciences/geocode-glib-3.15.2[introspection] - >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] - dev-libs/libxml2:2 - >=net-libs/rest-0.7.90:0.7[introspection] - - app-crypt/libsecret[introspection] - dev-libs/libgweather[introspection] - media-libs/clutter-gtk:1.0[introspection] - media-libs/clutter:1.0[introspection] - net-libs/gnome-online-accounts[introspection] - net-libs/libgfbgraph[introspection] - net-libs/libsoup:2.4[introspection] - net-libs/webkit-gtk:4[introspection] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postinst() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild deleted file mode 100644 index 33d1cef5ba9c..000000000000 --- a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="A map application for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Maps" - -LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" -SLOT="0" -IUSE="" -KEYWORDS="amd64 x86" - -# Pure introspection dependencies found by grepping imports.gi in ${S} -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - >=dev-libs/gjs-1.50.0 - >=dev-libs/gobject-introspection-0.10.1:= - >=x11-libs/gtk+-3.22:3[introspection] - >=app-misc/geoclue-0.12.99:2.0[introspection] - >=dev-libs/libgee-0.16:0.8[introspection] - >=dev-libs/folks-0.10 - >=sci-geosciences/geocode-glib-3.15.2[introspection] - >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] - dev-libs/libxml2:2 - >=net-libs/rest-0.7.90:0.7[introspection] - - app-crypt/libsecret[introspection] - dev-libs/libgweather[introspection] - media-libs/clutter-gtk:1.0[introspection] - media-libs/clutter:1.0[introspection] - net-libs/gnome-online-accounts[introspection] - net-libs/libgfbgraph[introspection] - net-libs/libsoup:2.4[introspection] - net-libs/webkit-gtk:4[introspection] -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postinst() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sci-geosciences/gnome-maps/gnome-maps-45.5.ebuild b/sci-geosciences/gnome-maps/gnome-maps-45.5.ebuild new file mode 100644 index 000000000000..8561146268a1 --- /dev/null +++ b/sci-geosciences/gnome-maps/gnome-maps-45.5.ebuild @@ -0,0 +1,50 @@ +# 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://wiki.gnome.org/Apps/Maps" + +LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" +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.1_beta:1.0=[introspection] + dev-libs/libxml2:2 + >=net-libs/rest-0.9.1:1.0[introspection] + + 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/gnome-maps/metadata.xml b/sci-geosciences/gnome-maps/metadata.xml index 39980802b1da..e3a36a2d3462 100644 --- a/sci-geosciences/gnome-maps/metadata.xml +++ b/sci-geosciences/gnome-maps/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gnome-maps</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest index 5e230661d070..32945c4dae51 100644 --- a/sci-geosciences/gpsbabel/Manifest +++ b/sci-geosciences/gpsbabel/Manifest @@ -1,2 +1,4 @@ -DIST gpsbabel-1.5.4.tar.gz 9099765 BLAKE2B 339cc78f94fed883b73c9f74cc6e27dd214438ba86917079b27459f543a9cb360bd8ec12408af1f23b9114d774a3b8eeccfb6b9f4fa9e7dc73b63e11bac20d43 SHA512 5fdc3bc07ad52d6c1e3532b287dcb506aba612ae9bc8db393b4837d79d773d6e22ad31f8f8e65770ec52b1afbda556e452af20dada1e411de93ca6e18054225b DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83 +DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911 +DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4 +DIST gpsbabel_1_9_0.tar.gz 14514572 BLAKE2B cdea8c74c1a75c4707b071b8a08fe83ce7fd3c6a6fd107c00d8fed958c9674c9f81de548a5cab7f9613a5d9f41834219f93bf7cabbc356047ef07f6667347bfe SHA512 e8591aef8015470471ff7ff6a75ab4a71a584f8de2ac00f3957d06ee76145bf1f53c26a12b8d963f1b96ce09270f54fbd5e96c80eccbeb8466ff94a75b72972d diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch deleted file mode 100644 index 2ab8d5e10c69..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch +++ /dev/null @@ -1,12 +0,0 @@ -Rename gpsbabelfe binary. ---- gpsbabel-1.4.3/gui/app.pro -+++ gpsbabel-1.4.3/gui/app.pro -@@ -30,7 +30,7 @@ - TARGET=GPSBabelFE - QMAKE_LFLAGS_RELEASE += -static-libgcc - } --unix:TARGET=gpsbabelfe-bin -+unix:TARGET=gpsbabelfe - mac:TARGET=GPSBabelFE - - FORMS += aboutui.ui diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch deleted file mode 100644 index b65413c3d7c5..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_statistic_uploading.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gui/babeldata.h 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/babeldata.h 2017-01-21 00:33:30.858046004 +0100 -@@ -64,7 +64,7 @@ - upgradeOffers_(0), - runCount_(0), - startupVersionCheck_(true), -- reportStatistics_(true), -+ reportStatistics_(false), - allowBetaUpgrades_(false), - ignoreVersionMismatch_(false), - disableDonateDialog_(false), diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch deleted file mode 100644 index b618106df3f0..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_update_check.patch +++ /dev/null @@ -1,108 +0,0 @@ -Disable check for newer versions on start. - ---- a/gui/preferences.ui 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/preferences.ui 2017-01-21 00:38:44.929972188 +0100 -@@ -40,13 +40,6 @@ - </property> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <item> -- <widget class="QCheckBox" name="startupCheck"> -- <property name="text"> -- <string>Check for newer version on start.</string> -- </property> -- </widget> -- </item> -- <item> - <widget class="QCheckBox" name="reportStatisticsCheck"> - <property name="text"> - <string>Anonymously report usage data.</string> ---- a/gui/preferences.cc 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/preferences.cc 2017-01-21 00:39:20.648418701 +0100 -@@ -39,7 +39,6 @@ - { - ui_.setupUi(this); - -- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); - ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); - ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_); - // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. -@@ -82,7 +81,6 @@ - formatList_[i].setHidden(item->checkState() == Qt::Unchecked); - } - -- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked(); - babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); - babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked(); - accept(); ---- a/gui/babeldata.h 2017-01-21 00:33:30.858046004 +0100 -+++ b/gui/babeldata.h 2017-01-21 00:40:03.888959247 +0100 -@@ -63,7 +63,7 @@ - upgradeErrors_(0), - upgradeOffers_(0), - runCount_(0), -- startupVersionCheck_(true), -+ startupVersionCheck_(false), - reportStatistics_(false), - allowBetaUpgrades_(false), - ignoreVersionMismatch_(false), ---- a/gui/mainwinui.ui 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/mainwinui.ui 2017-01-21 00:40:40.453416335 +0100 -@@ -637,7 +637,6 @@ - <addaction name="actionHelp"/> - <addaction name="separator"/> - <addaction name="actionAbout"/> -- <addaction name="actionUpgradeCheck"/> - <addaction name="separator"/> - <addaction name="actionVisit_Website"/> - <addaction name="actionMake_a_Donation"/> -@@ -666,11 +665,6 @@ - <string>Preferences...</string> - </property> - </action> -- <action name="actionUpgradeCheck"> -- <property name="text"> -- <string>Check for Upgrade</string> -- </property> -- </action> - <action name="actionVisit_Website"> - <property name="text"> - <string>Visit Website...</string> ---- a/gui/mainwindow.cc 2017-01-02 06:05:19.000000000 +0100 -+++ b/gui/mainwindow.cc 2017-01-21 00:42:02.939447485 +0100 -@@ -147,7 +147,6 @@ - connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX())); - connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX())); - connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX())); -- connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX())); - connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX())); - - connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)), -@@ -208,17 +208,6 @@ - restoreSettings(); - - upgrade = new UpgradeCheck(parent, formatList_, babelData_); -- if (babelData_.startupVersionCheck_) { -- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_, -- allowBetaUpgrades()); -- } -- -- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) { -- VersionMismatch vm(0, babelVersion_, QString(VERSION)); -- -- vm.exec(); -- babelData_.ignoreVersionMismatch_ = vm.neverAgain(); -- } - } - - //------------------------------------------------------------------------ -@@ -1021,10 +1010,6 @@ - //------------------------------------------------------------------------ - void MainWindow::closeActionX() - { -- QDateTime wt= upgrade->getUpgradeWarningTime(); -- if (wt.isValid()) { -- babelData_.upgradeCheckTime_ = wt; -- } - babelData_.runCount_++; - - QDateTime now = QDateTime::currentDateTime(); diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch deleted file mode 100644 index e9d56d0a460b..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-disable_version_check.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/gui/preferences.ui 2017-01-21 00:38:44.929972188 +0100 -+++ b/gui/preferences.ui 2017-01-21 00:50:05.314477610 +0100 -@@ -46,13 +46,6 @@ - </property> - </widget> - </item> -- <item> -- <widget class="QCheckBox" name="ignoreVersionMismatchCheck"> -- <property name="text"> -- <string>Ignore mismatch between command line and GUI version.</string> -- </property> -- </widget> -- </item> - </layout> - </widget> - </widget> ---- a/gui/preferences.cc 2017-01-21 00:39:20.648418701 +0100 -+++ b/gui/preferences.cc 2017-01-21 00:50:33.451829352 +0100 -@@ -40,7 +40,6 @@ - ui_.setupUi(this); - - ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); -- ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_); - // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. - if (VERSION == QString("1.4.1")) - babelData_.ignoreVersionMismatch_ = false; -@@ -82,7 +81,6 @@ - } - - babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); -- babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked(); - accept(); - } - ---- a/gui/babeldata.h 2017-01-21 00:40:03.888959247 +0100 -+++ b/gui/babeldata.h 2017-01-21 00:51:05.753233149 +0100 -@@ -66,7 +66,7 @@ - startupVersionCheck_(false), - reportStatistics_(false), - allowBetaUpgrades_(false), -- ignoreVersionMismatch_(false), -+ ignoreVersionMismatch_(true), - disableDonateDialog_(false), - donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0))) - { diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch deleted file mode 100644 index 36db615f9dec..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-1.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 30a345577a644125502f6e4f8b58ea3077ec8dad Mon Sep 17 00:00:00 2001 -From: Robert Lipe <robertlipe@gpsbabel.org> -Date: Mon, 4 Sep 2017 23:20:00 -0500 -Subject: [PATCH] Prefer QStringLiteral over implicit conversion from Latin1 - for Q5 5.9. Based on work by Bernd Zeimetz. - ---- - gpx.cc | 14 +++++++------- - magproto.cc | 6 +++--- - unicsv.cc | 8 ++++---- - 3 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/gpx.cc b/gpx.cc -index 3b3b963c..36701e52 100644 ---- a/gpx.cc -+++ b/gpx.cc -@@ -494,7 +494,7 @@ tag_cache_desc(const QXmlStreamAttributes& attr) - { - cache_descr_is_html = 0; - if (attr.hasAttribute("html")) { -- if (attr.value("html").toString().compare("True") == 0) { -+ if (attr.value("html").toString() == QStringLiteral("True")) { - cache_descr_is_html = 1; - } - } -@@ -509,16 +509,16 @@ tag_gs_cache(const QXmlStreamAttributes& attr) - gc_data->id = attr.value("id").toString().toInt(); - } - if (attr.hasAttribute("available")) { -- if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) { -+ if (attr.value("available").toString().compare(QStringLiteral("True"), Qt::CaseInsensitive) == 0) { - gc_data->is_available = status_true; -- } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) { -+ } else if (attr.value("available").toString().compare(QStringLiteral("False"), Qt::CaseInsensitive) == 0) { - gc_data->is_available = status_false; - } - } - if (attr.hasAttribute("archived")) { -- if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) { -+ if (attr.value("archived").toString().compare(QStringLiteral("True"), Qt::CaseInsensitive) == 0) { - gc_data->is_archived = status_true; -- } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) { -+ } else if (attr.value("archived").toString().compare(QStringLiteral("False"), Qt::CaseInsensitive) == 0) { - gc_data->is_archived = status_false; - } - } -@@ -972,7 +972,7 @@ gpx_end(const QString& el) - * last date we saw in this log. - */ - case tt_cache_log_type: -- if ((cdatastr.compare("Found it") == 0) && -+ if ((cdatastr.compare(QStringLiteral("Found it")) == 0) && - (0 == wpt_tmp->gc_data->last_found.toTime_t())) { - wpt_tmp->AllocGCData()->last_found = gc_log_date; - } -@@ -1423,7 +1423,7 @@ fprint_xml_chain(xml_tag* tag, const Waypoint* wpt) - fprint_xml_chain(tag->child, wpt); - } - if (wpt && wpt->gc_data->exported.isValid() && -- tag->tagname.compare("groundspeak:cache") == 0) { -+ tag->tagname.compare(QStringLiteral("groundspeak:cache")) == 0) { - writer->writeTextElement("time", - wpt->gc_data->exported.toPrettyString()); - } -diff --git a/magproto.cc b/magproto.cc -index 7c82e9fb..0deb7f33 100644 ---- a/magproto.cc -+++ b/magproto.cc -@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portname) - */ - QString exten = QFileInfo(curfname).suffix(); - if (exten.length() > 0) { -- if (0 == exten.compare("upt", Qt::CaseInsensitive)) { -+ if (0 == exten.compare(QStringLiteral("upt"), Qt::CaseInsensitive)) { - extension_hint = WPTDATAMASK; -- } else if (0 == exten.compare("log", Qt::CaseInsensitive)) { -+ } else if (0 == exten.compare(QStringLiteral("log"), Qt::CaseInsensitive)) { - extension_hint = TRKDATAMASK; -- } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) { -+ } else if (0 == exten.compare(QStringLiteral("rte"), Qt::CaseInsensitive)) { - extension_hint = RTEDATAMASK; - } - } -diff --git a/unicsv.cc b/unicsv.cc -index 4a7d78ed..6312e9d2 100644 ---- a/unicsv.cc -+++ b/unicsv.cc -@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, int* msec, time_t* date) - static status_type - unicsv_parse_status(const QString& str) - { -- if (str.compare("true", Qt::CaseInsensitive) == 0 || -- str.compare("yes", Qt::CaseInsensitive) == 0 || -+ if (str.compare(QStringLiteral("true"), Qt::CaseInsensitive) == 0 || -+ str.compare(QStringLiteral("yes"), Qt::CaseInsensitive) == 0 || - str == "1") { - return status_true; - } -- if (str.compare("false", Qt::CaseInsensitive) == 0 || -- str.compare("no", Qt::CaseInsensitive) == 0 || -+ if (str.compare(QStringLiteral("false"), Qt::CaseInsensitive) == 0 || -+ str.compare(QStringLiteral("no"), Qt::CaseInsensitive) == 0 || - str == "0") { - return status_false; - } diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch deleted file mode 100644 index ce1b0489146f..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-qt-5.9-2.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 604178aa8ad4d3c3ad218df24c1e9a6a1f683bb3 Mon Sep 17 00:00:00 2001 -From: Harel Mazor <harel.mazor@gmail.com> -Date: Tue, 24 Jan 2017 00:35:04 +0200 -Subject: [PATCH] Added geojson read capablity, moved magic strings to - constants, fixed windows compilation issues. - ---- - tef_xml.cc | 24 +++---- - -* Removed any unrelated changes except for s/windows/Qt-5.9/ compilation issues. - -diff --git a/tef_xml.cc b/tef_xml.cc -index b32d69b3..37dd85ba 100644 ---- a/tef_xml.cc -+++ b/tef_xml.cc -@@ -72,11 +72,11 @@ tef_start(xg_string args, const QXmlStreamAttributes* attrv) - bool valid = false; - - foreach(QXmlStreamAttribute attr, *attrv) { -- if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) { -- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) { -+ if (attr.name().compare(QString("Comment"), Qt::CaseInsensitive) == 0) { -+ if (attr.value().compare(QString("TourExchangeFormat"), Qt::CaseInsensitive) == 0) { - valid = true; - } -- } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Version"), Qt::CaseInsensitive) == 0) { - version = attr.value().toString().toDouble(); - } - } -@@ -95,9 +95,9 @@ tef_header(xg_string args, const QXmlStreamAttributes* attrv) - { - route = route_head_alloc(); - foreach(QXmlStreamAttribute attr, *attrv) { -- if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) { -+ if (attr.name().compare(QString("Name"), Qt::CaseInsensitive) == 0) { - route->rte_name = attr.value().toString().trimmed(); -- } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Software"), Qt::CaseInsensitive) == 0) { - route->rte_desc = attr.value().toString().trimmed(); - } - } -@@ -248,20 +248,20 @@ tef_item_start(xg_string args, const QXmlStreamAttributes* attrv) - QString attrstr = attr.value().toString(); - QByteArray attrtext = attrstr.toUtf8(); - -- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) { -+ if (attr.name().compare(QString("SegDescription"), Qt::CaseInsensitive) == 0) { - wpt_tmp->shortname = attrstr.trimmed(); -- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("PointDescription"), Qt::CaseInsensitive) == 0) { - wpt_tmp->description = attrstr.trimmed(); -- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 && -- attr.value().compare("true", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("ViaStation"), Qt::CaseInsensitive) == 0 && -+ attr.value().compare(QString("true"), Qt::CaseInsensitive) == 0) { - wpt_tmp->wpt_flags.fmt_use = 1; /* only a flag */ - - /* new in TEF V2 */ -- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Instruction"), Qt::CaseInsensitive) == 0) { - wpt_tmp->description = attrstr.trimmed(); -- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Altitude"), Qt::CaseInsensitive) == 0) { - wpt_tmp->altitude = attrstr.toDouble(); -- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("TimeStamp"), Qt::CaseInsensitive) == 0) { - /* nothing for the moment */ - } - } diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch deleted file mode 100644 index d3a4fa0c16a3..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_shapelib.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/configure.in 2017-01-02 06:05:19.000000000 +0100 -+++ b/configure.in 2017-01-21 00:26:02.239786037 +0100 -@@ -402,7 +402,7 @@ - AC_SUBST(QT_SYSINC_OPT) - AC_SUBST(QT_LIBS) - --AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty]) -+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty]) - AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh]) - AC_OUTPUT - ---- a/Makefile.in 2017-01-02 06:05:19.000000000 +0100 -+++ b/Makefile.in 2017-01-21 00:29:05.715731486 +0100 -@@ -100,7 +100,7 @@ - # 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 - - MINIZIP=zlib/contrib/minizip/zip.o \ - zlib/contrib/minizip/ioapi.o -@@ -119,7 +119,7 @@ - src/core/xmlstreamwriter.o \ - src/core/usasciicodec.o\ - src/core/ziparchive.o \ -- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) -+ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) - OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ - - DEPFILES = $(OBJS:.o=.d) -@@ -148,10 +148,10 @@ - all: gpsbabel$(EXEEXT) - - gpsbabel$(EXEEXT): configure Makefile $(OBJS) @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) -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ - gbversion.h.in gui/setup.iss.in -@@ -894,11 +894,7 @@ - session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ - gbfile.h cet.h inifile.h session.h src/core/datetime.h - shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ -- gbfile.h cet.h inifile.h session.h src/core/datetime.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 -+ gbfile.h cet.h inifile.h session.h src/core/datetime.h - skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ - gbfile.h cet.h inifile.h session.h src/core/datetime.h - skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ ---- a/shape.cc 2017-01-02 06:05:19.000000000 +0100 -+++ b/shape.cc 2017-01-21 00:29:58.514391517 +0100 -@@ -20,7 +20,7 @@ - - */ - #include "defs.h" --#include "shapelib/shapefil.h" -+#include <libshp/shapefil.h> - #include <stdlib.h> - - #if SHAPELIB_ENABLED diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch deleted file mode 100644 index ce3591715492..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-use_system_zlib.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/configure.in 2017-01-21 03:17:05.480317203 +0100 -+++ b/configure.in 2017-01-21 03:26:53.743671224 +0100 -@@ -402,7 +402,7 @@ - AC_SUBST(QT_SYSINC_OPT) - AC_SUBST(QT_LIBS) - --AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty]) -+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile]) - AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh]) - AC_OUTPUT - ---- a/Makefile.in 2017-01-21 03:17:05.530317828 +0100 -+++ b/Makefile.in 2017-01-21 03:32:19.447032690 +0100 -@@ -102,14 +102,7 @@ - - SHAPE=-lshp - --MINIZIP=zlib/contrib/minizip/zip.o \ -- zlib/contrib/minizip/ioapi.o -- --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 \ -- zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \ -- zlib/gzwrite.o zlib/zutil.o $(MINIZIP) -- -+ZLIB=-lz -lminizip - - LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ - csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \ -@@ -119,7 +112,7 @@ - src/core/xmlstreamwriter.o \ - src/core/usasciicodec.o\ - src/core/ziparchive.o \ -- $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) -+ $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) - OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ - - DEPFILES = $(OBJS:.o=.d) -@@ -148,10 +141,10 @@ - all: gpsbabel$(EXEEXT) - - gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - gpsbabel-debug: $(OBJS) -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) $(ZLIB) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ - gbversion.h.in gui/setup.iss.in ---- a/src/core/ziparchive.cc 2017-01-02 06:05:19.000000000 +0100 -+++ b/src/core/ziparchive.cc 2017-01-21 03:51:30.402421165 +0100 -@@ -23,7 +23,7 @@ - - #include "defs.h" - #include "src/core/logging.h" --#include "zlib/contrib/minizip/zip.h" -+#include <minizip/zip.h> - - #include <QtCore/QFile> - #include <QtCore/QDebug> -@@ -89,4 +89,4 @@ - return true; - } - return false; --} -\ No newline at end of file -+} ---- a/src/core/ziparchive.h 2017-01-02 06:05:19.000000000 +0100 -+++ b/src/core/ziparchive.h 2017-01-21 03:51:05.931115241 +0100 -@@ -21,7 +21,7 @@ - - #include <QtCore/QString> - #include <QtCore/QStringList> --#include "zlib/contrib/minizip/zip.h" -+#include <minizip/zip.h> - - class ZipArchive - { diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch new file mode 100644 index 000000000000..744400906963 --- /dev/null +++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch @@ -0,0 +1,118 @@ +diff --git a/Makefile.in b/Makefile.in +index 5ace8da1..1acadf3e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -104,7 +104,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ + # Extra modules in Jeeps that we don't use + # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o + +-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o ++SHAPE=-lshp + + ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \ + zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \ +@@ -120,7 +120,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ + src/core/textstream.o \ + src/core/usasciicodec.o \ + src/core/xmlstreamwriter.o \ +- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) ++ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) + OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ + + DEPFILES = $(OBJS:.o=.d) +@@ -153,10 +153,10 @@ toolinfo + all: gpsbabel$(EXEEXT) + + gpsbabel$(EXEEXT): configure Makefile $(OBJS) @USB_DEPS@ @GPSBABEL_DEBUG@ +- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ + + gpsbabel-debug: $(OBJS) @USB_DEPS@ +- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ + + Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ + gbversion.h.in gui/setup.iss.in +@@ -513,7 +513,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + ggv_bin.h globalsat_sport.h gpx.h src/core/xmlstreamwriter.h \ + src/core/xmltag.h kml.h xmlgeneric.h legacyformat.h lowranceusr.h \ + mynav.h nmea.h osm.h qstarz_bl_1000.h random.h shape.h \ +- shapelib/shapefil.h subrip.h unicsv.h src/core/textstream.h xcsv.h \ ++ subrip.h unicsv.h src/core/textstream.h xcsv.h \ + garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ +@@ -538,7 +538,7 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ + globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ +- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ ++ qstarz_bl_1000.h random.h shape.h subrip.h \ + unicsv.h src/core/textstream.h xcsv.h yahoo.h + garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \ + zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ +@@ -825,7 +825,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ + globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ +- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ ++ qstarz_bl_1000.h random.h shape.h subrip.h \ + unicsv.h src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h \ + jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ + jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ +@@ -841,7 +841,7 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + garmin_fit.h geojson.h ggv_bin.h globalsat_sport.h gpx.h \ + src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ + legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ +- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ ++ random.h shape.h subrip.h unicsv.h \ + src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ +@@ -961,10 +961,7 @@ session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h + shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ +- shape.h format.h shapelib/shapefil.h +-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h +-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h +-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h ++ shape.h format.h + skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +@@ -1059,7 +1056,7 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \ + src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ + legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ +- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ ++ random.h shape.h subrip.h unicsv.h \ + src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ +diff --git a/shape.cc b/shape.cc +index 933eb95a..f2ec5365 100644 +--- a/shape.cc ++++ b/shape.cc +@@ -32,7 +32,7 @@ + + #include "defs.h" + #include "shape.h" +-#include "shapelib/shapefil.h" ++#include <libshp/shapefil.h> + + + #if SHAPELIB_ENABLED +diff --git a/shape.h b/shape.h +index 0ce05af7..09931eff 100644 +--- a/shape.h ++++ b/shape.h +@@ -27,7 +27,7 @@ + + #include "defs.h" // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file + #include "format.h" // for Format +-#include "shapelib/shapefil.h" // for DBFHandle, SHPAPI_CALL, SHPHandle ++#include <libshp/shapefil.h> // for DBFHandle, SHPAPI_CALL, SHPHandle + + + #if SHAPELIB_ENABLED diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch index 3fdd274927eb..56c60a553485 100644 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.5.4-xmldoc.patch +++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch @@ -5,7 +5,7 @@ --stringparam make.clean.html "1" \ --stringparam html.valid.html "1" \ - --stringparam html.stylesheet \ -- "http://www.gpsbabel.org/style3.css" \ +- "https://www.gpsbabel.org/style3.css" \ + --nonet \ + --stringparam html.stylesheet "gpsbabel.org-style3.css" \ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \ diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.8.0-no-automagic-qt5-qt6.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.8.0-no-automagic-qt5-qt6.patch new file mode 100644 index 000000000000..47a1a37e1ba3 --- /dev/null +++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.8.0-no-automagic-qt5-qt6.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a7d805..65bd4db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,7 +26,11 @@ set(CMAKE_AUTORCC ON) + add_executable(gpsbabel) + + # Find the QtCore library +-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) ++if(USE_QT6) ++ find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED) ++else() ++ find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED) ++endif() + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) + list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core) + if(${Qt${QT_VERSION_MAJOR}Core_VERSION} VERSION_LESS 5.12) +diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt +index 4c839c2..ac329dd 100644 +--- a/gui/CMakeLists.txt ++++ b/gui/CMakeLists.txt +@@ -23,7 +23,11 @@ endif() + add_executable(${TARGET} WIN32 MACOSX_BUNDLE) + + # Find the QtCore library +-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) ++if(USE_QT6) ++ find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED) ++else() ++ find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED) ++endif() + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Network SerialPort Widgets Xml REQUIRED) + list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Xml) + if(${Qt${QT_VERSION_MAJOR}Core_VERSION} VERSION_LESS 5.12) diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild deleted file mode 100644 index 142868085915..000000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils qmake-utils - -DESCRIPTION="GPS waypoints, tracks and routes converter" -HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" -SRC_URI=" - https://dev.gentoo.org/~asturm/${P}.tar.gz - doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~x86-fbsd" -IUSE="doc +gui" - -RDEPEND=" - dev-libs/expat - dev-qt/qtcore:5 - sci-libs/shapelib:= - sys-libs/zlib[minizip] - virtual/libusb:0 - gui? ( - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) -" -DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xml-dtd:4.1.2 - dev-lang/perl - dev-libs/libxslt - ) - gui? ( dev-qt/linguist-tools:5 ) -" - -DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.3-fix_binary_name.patch - "${FILESDIR}"/${P}-disable_statistic_uploading.patch - "${FILESDIR}"/${P}-disable_update_check.patch - "${FILESDIR}"/${P}-disable_version_check.patch - "${FILESDIR}"/${P}-use_system_shapelib.patch - "${FILESDIR}"/${P}-use_system_zlib.patch - "${FILESDIR}"/${P}-xmldoc.patch - "${FILESDIR}"/${P}-qt-5.9-{1,2}.patch -) - -RESTRICT="test" # bug 421699 - -src_prepare() { - default - - # remove bundled libs and cleanup - rm -r shapelib zlib || die - sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die - - mv configure.in configure.ac || die - sed -i -e "/^configure:/s/configure.in/configure.ac/" Makefile.in || die - - use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}" - - eautoreconf -} - -src_configure() { - econf \ - $(use_with doc doc "${S}"/doc/manual) \ - LRELEASE=$(qt5_get_bindir)/lrelease \ - LUPDATE=$(qt5_get_bindir)/lupdate \ - QMAKE=$(qt5_get_bindir)/qmake \ - --with-zlib=system - - if use gui; then - pushd "${S}/gui" > /dev/null || die - $(qt5_get_bindir)/lrelease *.ts || die - eqmake5 - popd > /dev/null - fi -} - -src_compile() { - default - if use gui; then - pushd "${S}/gui" > /dev/null || die - emake - popd > /dev/null - fi - - if use doc; then - perl xmldoc/makedoc || die - emake gpsbabel.html - fi -} - -src_install() { - use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css ) - - default - - if use gui; then - dobin gui/objects/gpsbabelfe - insinto /usr/share/${PN}/translations/ - doins gui/gpsbabel*_*.qm - newicon gui/images/appicon.png ${PN}.png - make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience" - fi -} diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild new file mode 100644 index 000000000000..36dfe7b2188f --- /dev/null +++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild @@ -0,0 +1,91 @@ +# 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 new file mode 100644 index 000000000000..5214d81abcd5 --- /dev/null +++ b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild @@ -0,0 +1,113 @@ +# 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 new file mode 100644 index 000000000000..5b61f9f33ebe --- /dev/null +++ b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild @@ -0,0 +1,108 @@ +# 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 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,md} gui/README.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() { + 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-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild new file mode 100644 index 000000000000..5b61f9f33ebe --- /dev/null +++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild @@ -0,0 +1,108 @@ +# 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 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,md} gui/README.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() { + 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/metadata.xml b/sci-geosciences/gpsbabel/metadata.xml index be769e6d50b3..e6efed8c4a65 100644 --- a/sci-geosciences/gpsbabel/metadata.xml +++ b/sci-geosciences/gpsbabel/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> @@ -8,7 +8,4 @@ <upstream> <remote-id type="github">gpsbabel/gpsbabel</remote-id> </upstream> - <use> - <flag name="gui">Enable the graphical user interface (requires <pkg>dev-qt/qtwebengine</pkg>)</flag> - </use> </pkgmetadata> diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest index 866912d81e40..01f99a14b05e 100644 --- a/sci-geosciences/gpscorrelate/Manifest +++ b/sci-geosciences/gpscorrelate/Manifest @@ -1 +1 @@ -DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B 664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965 SHA512 c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f +DIST gpscorrelate-2.0.tar.xz 238276 BLAKE2B d576c49d80f9886530930e99231922816f8498abcedb748ce00706bd8906d9e3fb8d1e3402daab0278f6c8189fe423a44eeb4ca0bfd1b7ad56412ae49094fdea SHA512 b4e28a416ad8eec0ed04f24118db0198cbc7328f4d63e7620e7468a66cdcf9a3fe825b779a32f079511c49b9da4a778ff47daa40afeb9fc14f269bdc4c8162b8 diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch deleted file mode 100644 index f48dba1882f2..000000000000 --- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -urN gpscorrelate-1.6.1.old/Makefile gpscorrelate-1.6.1/Makefile ---- gpscorrelate-1.6.1.old/Makefile 2011-06-08 13:51:06.000000000 +0200 -+++ gpscorrelate-1.6.1/Makefile 2011-06-08 14:13:18.000000000 +0200 -@@ -4,11 +4,15 @@ - - COBJS = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o - GOBJS = main-gui.o gui.o unixtime.o gpx-read.o correlate.o exif-gps.o --CFLAGS = -Wall --override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2 --OFLAGS = -Wall --override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2 --prefix = /usr/local -+CFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2 -+CXXFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2 -+CLIBS = $(shell pkg-config --libs libxml-2.0) -lm -lexiv2 -lstdc++ -+ifdef BUILD_GUI -+CXXFLAGS += $(shell pkg-config --cflags gtk+-2.0) -+CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -+CLIBS += $(shell pkg-config --libs gtk+-2.0) -+endif -+prefix ?= /usr/local - bindir = $(prefix)/bin - datadir = $(prefix)/share - mandir = $(datadir)/man -@@ -18,16 +22,16 @@ - all: gpscorrelate gpscorrelate-gui gpscorrelate.1 - - gpscorrelate: $(COBJS) -- g++ $(OFLAGS) -o $@ $(COBJS) -+ $(CXX) $(LDFLAGS) $(COBJS) $(CLIBS) -o $@ - - gpscorrelate-gui: $(GOBJS) -- g++ $(OFLAGS) -o $@ $(GOBJS) -+ $(CXX) $(LDFLAGS) $(GOBJS) $(CLIBS) -o $@ - --.c.o: -- gcc $(CFLAGS) -c -o $*.o $< -+%.o: %.c -+ $(CC) -c -o $@ $< $(CFLAGS) - --.cpp.o: -- g++ $(CFLAGS) -c -o $*.o $< -+%.o: %.cpp $(DEPS) -+ $(CXX) -c -o $@ $< $(CXXFLAGS) - - clean: - rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe} diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch new file mode 100644 index 000000000000..131e21041898 --- /dev/null +++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-desktop-pass-validation.patch @@ -0,0 +1,10 @@ +diff --git a/gpscorrelate.desktop b/gpscorrelate.desktop +index b4db0d6..0885ca4 100644 +--- a/gpscorrelate.desktop ++++ b/gpscorrelate.desktop +@@ -1,4 +1,4 @@ +-[Desktop Entry] ++[Desktop Entry] + Type=Application + Version=1.0 + Name=GPSCorrelate diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch new file mode 100644 index 000000000000..f15032fd7c77 --- /dev/null +++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch @@ -0,0 +1,135 @@ +From 7c945a5c9116325dad795dbe9682c2c4a4dea2d9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 20 Aug 2023 18:57:43 +0200 +Subject: [PATCH] Fix build with >=exiv2-0.28 + +Fixes https://github.com/dfandrich/gpscorrelate/issues/22 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + exif-gps.cpp | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +diff --git a/exif-gps.cpp b/exif-gps.cpp +index d464d62..71b46ef 100644 +--- a/exif-gps.cpp ++++ b/exif-gps.cpp +@@ -44,6 +44,7 @@ + #include "exiv2/image.hpp" + #include "exiv2/exif.hpp" + #include "exiv2/error.hpp" ++#include "exiv2/version.hpp" + + #include "gpsstructure.h" + #include "exif-gps.h" +@@ -97,7 +98,11 @@ int main(int argc, char* argv[]) + char* ReadExifDate(const char* File, int* IncludesGPS) + { + // Open and read the file. ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ Exiv2::Image::UniquePtr Image; ++#else + Exiv2::Image::AutoPtr Image; ++#endif + + try { + Image = Exiv2::ImageFactory::open(File); +@@ -154,7 +159,11 @@ char* ReadExifData(const char* File, double* Lat, double* Long, double* Elev, in + // much more data than the last, specifically + // for display purposes. For the GUI version. + // Open and read the file. ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ Exiv2::Image::UniquePtr Image; ++#else + Exiv2::Image::AutoPtr Image; ++#endif + + try { + Image = Exiv2::ImageFactory::open(File); +@@ -273,7 +282,11 @@ char* ReadExifData(const char* File, double* Lat, double* Long, double* Elev, in + + // Is the altitude below sea level? If so, negate the value. + GPSData = ExifRead["Exif.GPSInfo.GPSAltitudeRef"]; ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ if (GPSData.count() >= 1 && GPSData.toUint32() == 1) ++#else + if (GPSData.count() >= 1 && GPSData.toLong() == 1) ++#endif + { + // Negate the elevation. + *Elev = -*Elev; +@@ -292,7 +305,11 @@ char* ReadGPSTimestamp(const char* File, char* DateStamp, char* TimeStamp, int* + // much more data than the last, specifically + // for display purposes. For the GUI version. + // Open and read the file. ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ Exiv2::Image::UniquePtr Image; ++#else + Exiv2::Image::AutoPtr Image; ++#endif + + try { + Image = Exiv2::ImageFactory::open(File); +@@ -463,7 +480,11 @@ int WriteGPSData(const char* File, const struct GPSPoint* Point, + struct utimbuf utb; + if (NoChangeMtime) + stat(File, &statbuf); ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ Exiv2::Image::UniquePtr Image; ++#else + Exiv2::Image::AutoPtr Image; ++#endif + + try { + Image = Exiv2::ImageFactory::open(File); +@@ -493,7 +514,11 @@ int WriteGPSData(const char* File, const struct GPSPoint* Point, + // Do all the easy constant ones first. + // GPSVersionID tag: standard says it should be four bytes: 02 02 00 00 + // (and, must be present). ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ Exiv2::Value::UniquePtr Value = Exiv2::Value::create(Exiv2::unsignedByte); ++#else + Exiv2::Value::AutoPtr Value = Exiv2::Value::create(Exiv2::unsignedByte); ++#endif + Value->read("2 2 0 0"); + replace(ExifToWrite, Exiv2::ExifKey("Exif.GPSInfo.GPSVersionID"), Value.get()); + // Datum: the datum of the measured data. The default is WGS-84. +@@ -643,7 +668,11 @@ int WriteFixedDatestamp(const char* File, time_t Time) + struct utimbuf utb; + stat(File, &statbuf); + ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ Exiv2::Image::UniquePtr Image; ++#else + Exiv2::Image::AutoPtr Image; ++#endif + + try { + Image = Exiv2::ImageFactory::open(File); +@@ -672,7 +701,11 @@ int WriteFixedDatestamp(const char* File, time_t Time) + ExifToWrite.erase(ExifToWrite.findKey(Exiv2::ExifKey("Exif.GPSInfo.GPSDateStamp"))); + ExifToWrite["Exif.GPSInfo.GPSDateStamp"] = ScratchBuf; + ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ Exiv2::Value::UniquePtr Value = Exiv2::Value::create(Exiv2::unsignedRational); ++#else + Exiv2::Value::AutoPtr Value = Exiv2::Value::create(Exiv2::unsignedRational); ++#endif + snprintf(ScratchBuf, sizeof(ScratchBuf), "%d/1 %d/1 %d/1", + TimeStamp.tm_hour, TimeStamp.tm_min, + TimeStamp.tm_sec); +@@ -705,7 +738,11 @@ int RemoveGPSExif(const char* File, int NoChangeMtime, int NoWriteExif) + stat(File, &statbuf); + + // Open the file and start reading. ++#if EXIV2_TEST_VERSION(0, 28, 0) ++ Exiv2::Image::UniquePtr Image; ++#else + Exiv2::Image::AutoPtr Image; ++#endif + + try { + Image = Exiv2::ImageFactory::open(File); +-- +2.41.0 + diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-respect-users-flags.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-respect-users-flags.patch new file mode 100644 index 000000000000..31519848a7a2 --- /dev/null +++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-respect-users-flags.patch @@ -0,0 +1,30 @@ +diff --git a/Makefile b/Makefile +index 7634553..9bfd025 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,12 +2,12 @@ + + PACKAGE_VERSION = 2.0 + +-CC = gcc +-CXX = g++ ++CC ?= gcc ++CXX ?= g++ + EXEEXT = +-PKG_CONFIG=pkg-config +-CFLAGS = -Wall -O2 +-LDFLAGS = -Wall -O2 -lm ++PKG_CONFIG?=pkg-config ++CFLAGS ?= -Wall -O2 ++LDFLAGS ?= -Wall -O2 + GTK = 3 + + COBJS = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o latlong.o +@@ -20,6 +20,7 @@ CFLAGSINC = `$(PKG_CONFIG) --cflags libxml-2.0 exiv2` + GTKFLAGS = `$(PKG_CONFIG) --cflags gtk+-$(GTK).0` + LIBS = `$(PKG_CONFIG) --libs libxml-2.0 exiv2` + LIBSGUI = `$(PKG_CONFIG) --libs gtk+-$(GTK).0` ++LIBS += -lm -lstdc++ + + CFLAGSINC += $(GTKFLAGS) + diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild deleted file mode 100644 index 07204797db36..000000000000 --- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs - -DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace" -HOMEPAGE="https://github.com/freefoote/gpscorrelate" -SRC_URI="http://freefoote.dview.net/linux/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="doc gtk" - -RDEPEND=" - dev-libs/libxml2:2 - media-gfx/exiv2:= - gtk? ( x11-libs/gtk+:2 ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.2 - dev-libs/libxslt - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}/${PN}-1.6.1-makefile.patch" ) - -src_compile() { - tc-export CC CXX - local opts="gpscorrelate gpscorrelate.1" - use gtk && opts+=" gpscorrelate-gui BUILD_GUI=1" - emake ${opts} -} - -src_install() { - dobin ${PN} - if use gtk; then - dobin ${PN}-gui - doicon ${PN}-gui.svg - domenu ${PN}.desktop - fi - if use doc; then - dohtml doc/* - fi - doman ${PN}.1 -} diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild new file mode 100644 index 000000000000..c57f7d9fdc55 --- /dev/null +++ b/sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace" +HOMEPAGE="https://dfandrich.github.io/gpscorrelate/" +SRC_URI="https://github.com/dfandrich/${PN}/releases/download/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="gtk" + +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + virtual/pkgconfig +" +DEPEND=" + dev-libs/libxml2:2 + media-gfx/exiv2:= + gtk? ( x11-libs/gtk+:3 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-desktop-pass-validation.patch" + "${FILESDIR}/${P}-respect-users-flags.patch" + "${FILESDIR}/${P}-exiv2-0.28.patch" # bug 906498 +) + +src_compile() { + emake gpscorrelate + use gtk && emake gpscorrelate-gui + +} + +src_install() { + dobin ${PN} + if use gtk; then + dobin ${PN}-gui + doicon -s scalable ${PN}-gui.svg + domenu ${PN}.desktop + fi + dodoc doc/*.html doc/*.png doc/*.xml + einstalldocs + doman doc/${PN}.1 +} diff --git a/sci-geosciences/gpscorrelate/metadata.xml b/sci-geosciences/gpscorrelate/metadata.xml index 6f9cf14be5be..a365fca487d4 100644 --- a/sci-geosciences/gpscorrelate/metadata.xml +++ b/sci-geosciences/gpscorrelate/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 3352663f8ca1..2aa15502e89e 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -1 +1,3 @@ -DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1 +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 diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch deleted file mode 100644 index 83e2907fca5b..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index c0f083a..4a98580 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries)) - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) - # Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version)) diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-setup.py b/sci-geosciences/gpsd/files/gpsd-3.3-setup.py deleted file mode 100644 index 93cc5e8f2149..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.3-setup.py +++ /dev/null @@ -1,17 +0,0 @@ -from distutils.core import setup, Extension - -setup( - name = "gps", - version = @VERSION@, - description = 'Python libraries for the gpsd service daemon', - url = @URL@, - author = 'the GPSD project', - author_email = @EMAIL@, - license = "BSD", - ext_modules=[ - Extension("gps.packet", @GPS_PACKET_SOURCES@, include_dirs=["."]), - Extension("gps.clienthelpers", @GPS_CLIENT_SOURCES@, include_dirs=["."]), - ], - packages = ['gps'], - scripts = @SCRIPTS@, -) diff --git a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch deleted file mode 100644 index 83e2907fca5b..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index c0f083a..4a98580 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries)) - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) - # Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version)) diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild deleted file mode 100644 index ecc199ad940b..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python2_7 ) -SCONS_MIN_VERSION="1.2.1" - -inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" - inherit git-2 -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86" -fi - -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" -HOMEPAGE="http://catb.org/gpsd/" - -LICENSE="BSD" -SLOT="0/23" - -GPSD_PROTOCOLS=( - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock 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 test udev usb X" -REQUIRED_USE="X? ( python ) - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( cxx )" - -RDEPEND=" - >=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} ) - usb? ( virtual/libusb:1 ) - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( sys-devel/bc )" - -# xml packages are for man page generation -if [[ ${PV} == *9999* ]] ; then - DEPEND+=" - app-text/xmlto - =app-text/docbook-xml-dtd-4.1*" -fi - -src_prepare() { - # Make sure our list matches the source. - local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | 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 - - epatch "${FILESDIR}"/${P}-do_not_rm_library.patch - - # Avoid useless -L paths to the install dir - sed -i \ - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ - SConstruct || die - - use python && distutils-r1_src_prepare -} - -python_prepare_all() { - python_export_best - # Extract python info out of SConstruct so we can use saner distribute - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - local pybins=$(pyvar python_progs | tail -1) - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") - local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") - sed \ - -e "s|@VERSION@|$(pyvar gpsd_version)|" \ - -e "s|@URL@|$(pyvar website)|" \ - -e "s|@EMAIL@|$(pyvar devmail)|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die - distutils-r1_python_prepare_all -} - -src_configure() { - myesconsargs=( - prefix="${EPREFIX}/usr" - libdir="\$prefix/$(get_libdir)" - udevdir="$(get_udevdir)" - chrpath=False - gpsd_user=gpsd - gpsd_group=uucp - nostrip=True - manbuild=False - shared=$(usex !static True False) - $(use_scons bluetooth bluez) - $(use_scons cxx libgpsmm) - $(use_scons debug clientdebug) - $(use_scons dbus dbus_export) - $(use_scons ipv6) - $(use_scons latency_timing timing) - $(use_scons ncurses) - $(use_scons ntp ntpshm) - $(use_scons ntp pps) - $(use_scons X python) - $(use_scons qt5 qt) - $(use_scons shm shm_export) - $(use_scons sockets socket_export) - $(use_scons usb) - ) - - use X && myesconsargs+=( xgps=1 ) - use qt5 && myesconsargs+=( qt_versioned=5 ) - - # enable specified protocols - local protocol - for protocol in ${GPSD_PROTOCOLS[@]} ; do - myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) - done -} - -src_compile() { - export CHRPATH= - tc-export CC CXX PKG_CONFIG - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} - escons - - use python && distutils-r1_src_compile -} - -src_install() { - DESTDIR="${D}" escons install $(usex udev udev-install "") - - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd - newinitd "${FILESDIR}"/gpsd.init-2 gpsd - - use python && distutils-r1_src_install -} - -pkg_preinst() { - # Run the gpsd daemon as gpsd and group uucp; create it here - # as it doesn't seem to be needed during compile/install ... - enewuser gpsd -1 -1 -1 "uucp" -} diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild new file mode 100644 index 000000000000..e2deae1550a1 --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild @@ -0,0 +1,212 @@ +# 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.24.ebuild new file mode 100644 index 000000000000..ea6badcf72b1 --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild @@ -0,0 +1,227 @@ +# 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 distutils-r1 scons-utils systemd toolchain-funcs udev + +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 ~loong ~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 navcom nmea2000 oceanserver oncore + 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 + + # bug #796476 + python_export_utf8_locale + + # 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_test() { + escons "${scons_opts[@]}" check +} + +python_test() { + # Silence QA check which gets confused by layout(?). We do run the tests. + :; +} + +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 +} + +pkg_postinst() { + use udev && udev_reload +} diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild new file mode 100644 index 000000000000..c617497e8672 --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..11} ) +SCONS_MIN_VERSION="2.3.0" + +inherit distutils-r1 scons-utils systemd toolchain-funcs udev + +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 ~loong ~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/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 +) +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" +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 )" +RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )" + +# 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 + + # bug #796476 + python_export_utf8_locale + + # 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_test() { + escons "${scons_opts[@]}" check +} + +python_test() { + # Silence QA check which gets confused by layout(?). We do run the tests. + :; +} + +src_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* + find "${D}"/python-discard/ -type d -delete + # Install correct multi-python copy + pushd "${P}" || die + use python && distutils-r1_src_install + popd || die +} + +pkg_postinst() { + use udev && udev_reload +} diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index 84668fd1c77f..5e2024d52363 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -1,44 +1,51 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python2_7 ) -SCONS_MIN_VERSION="1.2.1" +PYTHON_COMPAT=( python3_{10..11} ) +SCONS_MIN_VERSION="2.3.0" -inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs +inherit distutils-r1 scons-utils systemd toolchain-funcs udev -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" - inherit git-2 +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" + inherit git-r3 else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" -HOMEPAGE="http://catb.org/gpsd/" +HOMEPAGE="https://gpsd.gitlab.io/gpsd/" LICENSE="BSD" -SLOT="0/23" +SLOT="0/30" GPSD_PROTOCOLS=( aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver - oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt - tripmate tsip ublox + gpsclock greis isync itrax navcom nmea2000 oceanserver oncore + 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 test udev usb X" -REQUIRED_USE="X? ( python ) +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" +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=" + acct-user/gpsd + acct-group/dialout >=net-misc/pps-tools-0.0.20120407 - bluetooth? ( net-wireless/bluez ) + bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib @@ -54,122 +61,170 @@ RDEPEND=" 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/pygtk:2[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( sys-devel/bc )" - -# xml packages are for man page generation + 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 )" +RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )" + +# asciidoctor package is for man page generation if [[ ${PV} == *9999* ]] ; then - DEPEND+=" - app-text/xmlto - =app-text/docbook-xml-dtd-4.1*" + 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}"/SConstruct | 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 eerror "Detected protocols: ${src_protocols}" eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" die "please sync ebuild & source" fi - epatch "${FILESDIR}"/${P}-do_not_rm_library.patch + # bug #807661 + sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die - # Avoid useless -L paths to the install dir - sed -i \ - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ - SConstruct || die + default use python && distutils-r1_src_prepare } python_prepare_all() { - python_export_best - # Extract python info out of SConstruct so we can use saner distribute - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - local pybins=$(pyvar python_progs | tail -1) - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") - local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") + python_setup + + # bug #796476 + python_export_utf8_locale + + # 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@|$(pyvar gpsd_version)|" \ - -e "s|@URL@|$(pyvar website)|" \ - -e "s|@EMAIL@|$(pyvar devmail)|" \ + -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|@GPS_PACKET_SOURCES@|${packet}|" \ - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die + -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() { - myesconsargs=( + scons_opts=( prefix="${EPREFIX}/usr" libdir="\$prefix/$(get_libdir)" udevdir="$(get_udevdir)" + rundir="/run" chrpath=False gpsd_user=gpsd - gpsd_group=uucp + gpsd_group=dialout nostrip=True - python=False - manbuild=False + systemd=$(usex systemd) + unitdir="$(systemd_get_systemunitdir)" shared=$(usex !static True False) - $(use_scons bluetooth bluez) - $(use_scons cxx libgpsmm) - $(use_scons debug clientdebug) - $(use_scons dbus dbus_export) - $(use_scons ipv6) - $(use_scons latency_timing timing) - $(use_scons ncurses) - $(use_scons ntp ntpshm) - $(use_scons ntp pps) - $(use_scons qt5 qt) - $(use_scons shm shm_export) - $(use_scons sockets socket_export) - $(use_scons usb) + 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) ) - use qt5 && myesconsargs+=( qt_versioned=5 ) + 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 - myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) + 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 + escons "${scons_opts[@]}" + pushd "${P}" || die + ln -sf ../setup.py . || die use python && distutils-r1_src_compile + popd || die +} + +src_test() { + escons "${scons_opts[@]}" check +} + +python_test() { + # Silence QA check which gets confused by layout(?). We do run the tests. + :; } src_install() { - DESTDIR="${D}" escons install $(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 - if use python ; then - distutils-r1_src_install - # Delete all X related packages if user doesn't want them - if ! use X && [[ -f "${ED%/}"/usr/bin/xgps ]]; then - rm "${ED%/}"/usr/bin/xgps* || die - fi - fi + # 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 } -pkg_preinst() { - # Run the gpsd daemon as gpsd and group uucp; create it here - # as it doesn't seem to be needed during compile/install ... - enewuser gpsd -1 -1 -1 "uucp" +pkg_postinst() { + use udev && udev_reload } diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml index cb80bead87d3..f7825c1f5ebf 100644 --- a/sci-geosciences/gpsd/metadata.xml +++ b/sci-geosciences/gpsd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> @@ -15,10 +15,13 @@ </slots> <use> <flag name="dbus">export gpsd data over dbus connections</flag> - <flag name="latency_timing">support latency timing information</flag> + <flag name="latency-timing">support latency timing information</flag> <flag name="ntp">Enable <pkg>net-misc/ntp</pkg> shared memory interface and PPS kernel support for GPS time</flag> <flag name="sockets">export gpsd over unix sockets</flag> <flag name="shm">export gpsd over shared memory</flag> </use> + <upstream> + <remote-id type="gitlab">gpsd/gpsd</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-geosciences/gpsprune-bin/Manifest b/sci-geosciences/gpsprune-bin/Manifest new file mode 100644 index 000000000000..d426286ca59d --- /dev/null +++ b/sci-geosciences/gpsprune-bin/Manifest @@ -0,0 +1 @@ +DIST gpsprune_23.2.jar 1201771 BLAKE2B 6673381e2415ff58293a5f8aea2d4140054dfca846b5000b7fdd4ad405a3a5a634704131a7269d5a62e8a1870e6e3735321a54f6c07d729efa55c09e6ec52de0 SHA512 5e33909d709440b989426de9617b51408739c5dfea040bf0c61ff59ee654a20d318829bed1aa34cbe36dd3698ee30c6c421ad5c6f1c17018d71b5891bd7ffd45 diff --git a/sci-geosciences/gpsprune-bin/gpsprune-bin-23.2.ebuild b/sci-geosciences/gpsprune-bin/gpsprune-bin-23.2.ebuild new file mode 100644 index 000000000000..62b86546e93b --- /dev/null +++ b/sci-geosciences/gpsprune-bin/gpsprune-bin-23.2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop java-pkg-2 java-pkg-simple + +DESCRIPTION="An application for viewing, editing and converting GPS data" +HOMEPAGE="https://activityworkshop.net/software/gpsprune/index.html" +SRC_URI="https://activityworkshop.net/software/gpsprune/gpsprune_${PV}.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-11:*" + +S="${WORKDIR}" + +JAVA_JAR_FILENAME="gpsprune.jar" +JAVA_MAIN_CLASS="tim.prune.GpsPrune" +JAVA_LAUNCHER_FILENAME="gpsprune" + +src_prepare() { + default + + cp "${DISTDIR}/gpsprune_${PV}.jar" gpsprune.jar || die +} + +src_compile() { + : +} + +src_install() { + java-pkg-simple_src_install + + for size in 128 96 72 64 48 36 32 24 22 16; do + insinto "/usr/share/icons/hicolor/${size}x${size}/apps" + newins "tim/prune/gui/images/window_icon_${size}.png" gpsprune.png + done + + newmenu - gpsprune.desktop <<-EOF + [Desktop Entry] + Name=GpsPrune + Type=Application + Comment=Application for viewing, editing and converting coordinate data from GPS systems + Exec=gpsprune + Icon=gpsprune + Categories=Science;Geoscience; + EOF +} diff --git a/sci-geosciences/gpsprune-bin/metadata.xml b/sci-geosciences/gpsprune-bin/metadata.xml new file mode 100644 index 000000000000..382e03b1550d --- /dev/null +++ b/sci-geosciences/gpsprune-bin/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>zerochaos@gentoo.org</email> + <name>Rick Farina (Zero_Chaos)</name> + </maintainer> +</pkgmetadata> diff --git a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport index 2dff4915dffe..420d18ef5e5a 100644 --- a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport +++ b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport @@ -1,6 +1,5 @@ -=== modified file 'data/gpx-viewer-file-chooser.ui' ---- data/gpx-viewer-file-chooser.ui 2012-03-04 10:18:33 +0000 -+++ data/gpx-viewer-file-chooser.ui 2015-06-01 19:44:21 +0000 +--- a/data/gpx-viewer-file-chooser.ui ++++ b/data/gpx-viewer-file-chooser.ui @@ -7,7 +7,6 @@ <property name="title" translatable="yes">Choose gpx file(s)</property> <property name="icon_name">gpx-viewer</property> @@ -10,9 +9,8 @@ <property name="filter">gpx_viewer_file_chooser_filter</property> <property name="local_only">False</property> -=== modified file 'data/gpx-viewer-preferences.ui' ---- data/gpx-viewer-preferences.ui 2012-03-06 08:49:48 +0000 -+++ data/gpx-viewer-preferences.ui 2015-06-01 19:44:21 +0000 +--- a/data/gpx-viewer-preferences.ui ++++ b/data/gpx-viewer-preferences.ui @@ -5,7 +5,6 @@ <object class="GtkDialog" id="preferences_dialog"> <property name="border_width">5</property> diff --git a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild index 18278d6ae130..f46fb5bf69c7 100644 --- a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild +++ b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild @@ -1,15 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -VALA_MIN_API_VERSION=0.16 - -inherit autotools-utils gnome2 vala +inherit gnome2 vala DESCRIPTION="Simple program to visualize a gpx file" HOMEPAGE="https://github.com/DaveDavenport/gpx-viewer" -SRC_URI="https://edge.launchpad.net/${PN}/trunk/0.4.0/+download/${P}.tar.gz" +SRC_URI="https://edge.launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -23,7 +21,8 @@ RDEPEND=" >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libchamplain-0.12.3:0.12[gtk] x11-libs/gtk+:3" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" $(vala_depend) >=dev-util/intltool-0.21 virtual/pkgconfig" @@ -31,23 +30,22 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-crash-backport ) src_prepare() { + default vala_src_prepare - autotools-utils_src_prepare } src_configure() { - local myeconfargs=( - $(use_enable nls) - --disable-database-updates ) - autotools-utils_src_configure + econf \ + $(use_enable nls) \ + --disable-database-updates } src_compile() { - autotools-utils_src_compile gpx_viewer_vala.stamp - autotools-utils_src_compile + emake gpx_viewer_vala.stamp + default } -src_install () { - autotools-utils_src_install +src_install() { + default dosym ../icons/hicolor/scalable/apps/gpx-viewer.svg /usr/share/pixmaps/gpx-viewer.svg } diff --git a/sci-geosciences/gpx-viewer/metadata.xml b/sci-geosciences/gpx-viewer/metadata.xml index d78f80981828..d3369ac77939 100644 --- a/sci-geosciences/gpx-viewer/metadata.xml +++ b/sci-geosciences/gpx-viewer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> diff --git a/sci-geosciences/gpxlab/Manifest b/sci-geosciences/gpxlab/Manifest new file mode 100644 index 000000000000..e53ea4aabfe7 --- /dev/null +++ b/sci-geosciences/gpxlab/Manifest @@ -0,0 +1 @@ +DIST gpxlab-0.7.0.tar.gz 1082049 BLAKE2B e84b04ef711b9d6d24639f338a5dd1d61185aeb6917699228fdd68309f15736f52b0ead7cba234bd4538bb7012bba5b6889fcf020cbfad96d90e46d26628e086 SHA512 493eaab8d14bb7402eafe8273d6ced2bc2e0632448cfc7b510a4d8dbe180abcaa6e321f435b7a5209a322851f04af493786b88123962cac525a315ecf375f817 diff --git a/sci-geosciences/gpxlab/files/gpxlab-0.7.0.patch b/sci-geosciences/gpxlab/files/gpxlab-0.7.0.patch new file mode 100644 index 000000000000..40ccab708b05 --- /dev/null +++ b/sci-geosciences/gpxlab/files/gpxlab-0.7.0.patch @@ -0,0 +1,10 @@ +diff -r -U2 GPXLab-0.7.0.orig/GPXLab/GPXLab.pro GPXLab-0.7.0/GPXLab/GPXLab.pro +--- GPXLab-0.7.0.orig/GPXLab/GPXLab.pro 2019-12-11 15:44:11.000000000 +0700 ++++ GPXLab-0.7.0/GPXLab/GPXLab.pro 2021-03-25 17:03:19.093288969 +0700 +@@ -140,5 +140,5 @@ + + unix:!macx { +- isEmpty(PREFIX):PREFIX = /usr/local ++ isEmpty(PREFIX):PREFIX = /usr + DEFINES += PREFIX=\\\"$$PREFIX\\\" + diff --git a/sci-geosciences/gpxlab/gpxlab-0.7.0-r1.ebuild b/sci-geosciences/gpxlab/gpxlab-0.7.0-r1.ebuild new file mode 100644 index 000000000000..56fda8622ff6 --- /dev/null +++ b/sci-geosciences/gpxlab/gpxlab-0.7.0-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="fi ru" +inherit plocale qmake-utils xdg + +MY_PN="GPXLab" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="An application to display and manage GPS tracks" +HOMEPAGE="https://github.com/BourgeoisLab/GPXLab" +SRC_URI="https://github.com/BourgeoisLab/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtnetwork:5" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( "${FILESDIR}"/${PN}-0.7.0.patch ) + +src_prepare() { + default + + plocale_find_changes ${MY_PN}/locale "${PN}_" '.ts' + + rm_ts() { + sed -e "s|locale/${PN}_${1}.ts||" -i ${MY_PN}/${MY_PN}.pro || die + } + plocale_for_each_disabled_locale rm_ts +} + +src_compile() { + $(qt5_get_bindir)/lrelease ${MY_PN}.pro || die "lrelease failed" + eqmake5 ${MY_PN}.pro + emake +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README.md CHANGELOG.md +} diff --git a/sci-geosciences/gpxlab/metadata.xml b/sci-geosciences/gpxlab/metadata.xml new file mode 100644 index 000000000000..68d6d15cbcc1 --- /dev/null +++ b/sci-geosciences/gpxlab/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>grozin@gentoo.org</email> + <name>Andrey Grozin</name> + </maintainer> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <upstream> + <remote-id type="github">BourgeoisLab/GPXLab</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-geosciences/gpxpy/Manifest b/sci-geosciences/gpxpy/Manifest deleted file mode 100644 index a2d85130b002..000000000000 --- a/sci-geosciences/gpxpy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gpxpy-0.8.6.tar.gz 65569 BLAKE2B d0a2673fc4a9adc7b15f45239091f823d6aa5191f7a07bf70d78cc38ca2cbef603e599b08fdcf221805bb81e61ac27d8e41402df77c998d826cdd4d74e376b4b SHA512 3c180436210689724f88fdac43576a9a11b3f8717fb6f8acd7c8ce0afc1219714b4c83f1ba4f64487d35d0189d65a311d77f7778e7d84f315b251d1098f8989c diff --git a/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild b/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild deleted file mode 100644 index ef9599c0c7bb..000000000000 --- a/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) - -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="python GPX parser" -HOMEPAGE="https://github.com/tkrajina/gpxpy" -SRC_URI="https://github.com/tkrajina/${PN}/tarball/85c3477b -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="" - -DOCS=( NOTICE.txt README.md ) - -python_test() { - ${PYTHON} -m unittest test -} diff --git a/sci-geosciences/gpxpy/metadata.xml b/sci-geosciences/gpxpy/metadata.xml deleted file mode 100644 index de597e19e44e..000000000000 --- a/sci-geosciences/gpxpy/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">tkrajina/gpxpy</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index 399b2aaea3d3..ec2061b8c395 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,4 +1,3 @@ -DIST gpxsee-6.3.tar.gz 3861093 BLAKE2B bd6cd81b1f2c4fdd3b4b6c0bae72be1a48ad0f0d22203f653e325228974eaf0043eca41efd42e085bd5811a8d2a9cd2f51fe04c03d9e9d064e01cfc24d7a12e4 SHA512 7a4f23444517a0481490f8f1a0520634e63e0416dd5fd5bdb01942df138839595dffd4bced21e264552915c38e5653e927244ea5ca185ff3f93df56fad3e9c73 -DIST gpxsee-7.1.tar.gz 3868798 BLAKE2B 08bc30d77508429bec94bbdb255b76b79c21bd2e251b216743f49fa45f59ded5a02e730c4766fd9f15e2357d74a66750e3e7515a9d8bdd21a1f97dee77cbec02 SHA512 bb7dc14a3cf7ca87a4335383d6c4c380fcf1a0009161ec988b1b5cf964cf757bbe05ae2e51d726edcb97966918afe4d872172087988321222a65e3c27c276a5d -DIST gpxsee-7.5.tar.gz 4302319 BLAKE2B f31aba249b87a85b7d5e4b2e3bb6c300b682a0f0e77d82b8151ffbd621664840782a1894277249e5f858a6837cf0580bb32748a04684157999edc64295f4192d SHA512 ff55267abeda8970282bbbadc9fdf0c72120aa25cf6f3ce95de77ea330087e36a0c64332ff9cd1c569bac24bed891dc265ded57587e7fb258b30e382fa31b093 -DIST gpxsee-7.8.tar.gz 4330785 BLAKE2B 360e7bb21870256b0480653687e2323e262d84db511acecd3a45228bab87b25b6eac5ae96e670d50bb5e9f8090907c9876685df5a4badba9d12572efbb30afe7 SHA512 07c6a67f574abc1f916a1d25424ab4e277617ac4b698c99307a144a07d2d08634e9c3353bfd2f3fddf0b45c27adbd1ba8499c46a35608aa66a9a851118ce2af5 +DIST gpxsee-13.14.tar.gz 5552553 BLAKE2B 693af0d57fc923b7ccaeace7c52f76bba4749dee9bae4f7593dc350cfe4c89bf2212a32fa47a52d39cde2f91fcc53675867b7be6b9241daef615eda388a8cf53 SHA512 af21cfa160bfdf21f3537da254e0f079063b827a4fe008245e9b67d50735480a82138d1a5aad119fb73397ca2d53b98c2dfb83b3419f32c3339876050c5f4816 +DIST gpxsee-13.19.tar.gz 5613645 BLAKE2B 24f79bc88d8ca469b463abf8a8d25d013448aa2eec112dac90f8780de5efff8afcfd3bcc008ebe6efc9de4d3728a1cd29290924423205beaecb41d6f0708f477 SHA512 0d9ee02dc75e55d757fb2461eca979d02a809cbf0cc310bcdeacddaa4c6eb0d8bca7707175915c42f298e279b088defe05e36f02618b560caf3cd0f40e149922 +DIST gpxsee-13.20.tar.gz 5621055 BLAKE2B 7536746873be93960c8e9b0b3656f0d6873753b778413c01755fee9bff1442aa1d1c07c7d98fba6f1588aa94238a20e6a7a7dca6848338e20ec52da9e7988c30 SHA512 ada925466874ff867ce3895852eaa0926666787685fb890d46be006b0b919a3a7074b94079eed4d480be2b54017c598c4eda04579165c291190c4f1e69d1cb6f diff --git a/sci-geosciences/gpxsee/files/gpxsee-7.33.patch b/sci-geosciences/gpxsee/files/gpxsee-7.33.patch new file mode 100644 index 000000000000..00b5ec1286b0 --- /dev/null +++ b/sci-geosciences/gpxsee/files/gpxsee-7.33.patch @@ -0,0 +1,10 @@ +diff -U2 -r GPXSee-7.33.orig/gpxsee.pro GPXSee-7.33/gpxsee.pro +--- GPXSee-7.33.orig/gpxsee.pro 2020-10-08 03:57:53.000000000 +0700 ++++ GPXSee-7.33/gpxsee.pro 2020-10-15 22:26:51.786533119 +0700 +@@ -446,5 +446,5 @@ + + unix:!macx { +- isEmpty(PREFIX):PREFIX = /usr/local ++ PREFIX = /usr + DEFINES += PREFIX=\\\"$$PREFIX\\\" + diff --git a/sci-geosciences/gpxsee/gpxsee-13.14.ebuild b/sci-geosciences/gpxsee/gpxsee-13.14.ebuild new file mode 100644 index 000000000000..977e4fb382f7 --- /dev/null +++ b/sci-geosciences/gpxsee/gpxsee-13.14.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh" +inherit plocale qmake-utils xdg + +MY_PN="GPXSee" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" +HOMEPAGE="https://www.gpxsee.org/ 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" + +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 +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) + +src_prepare() { + default + + plocale_find_changes lang "${PN}_" '.ts' + + rm_ts() { + sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro + } + + plocale_for_each_disabled_locale rm_ts +} + +src_compile() { + $(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" + eqmake5 gpxsee.pro + emake +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README.md +} diff --git a/sci-geosciences/gpxsee/gpxsee-13.19.ebuild b/sci-geosciences/gpxsee/gpxsee-13.19.ebuild new file mode 100644 index 000000000000..6ed42a42478c --- /dev/null +++ b/sci-geosciences/gpxsee/gpxsee-13.19.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh" +inherit plocale qmake-utils xdg + +MY_PN="GPXSee" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" +HOMEPAGE="https://www.gpxsee.org/ 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=" + 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=" + qt6? ( dev-qt/qttools:6 ) + !qt6? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) + +src_prepare() { + default + + plocale_find_changes lang "${PN}_" '.ts' + + rm_ts() { + sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro + } + + plocale_for_each_disabled_locale rm_ts +} + +src_compile() { + 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 +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README.md +} diff --git a/sci-geosciences/gpxsee/gpxsee-13.20.ebuild b/sci-geosciences/gpxsee/gpxsee-13.20.ebuild new file mode 100644 index 000000000000..6ed42a42478c --- /dev/null +++ b/sci-geosciences/gpxsee/gpxsee-13.20.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh" +inherit plocale qmake-utils xdg + +MY_PN="GPXSee" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" +HOMEPAGE="https://www.gpxsee.org/ 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=" + 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=" + qt6? ( dev-qt/qttools:6 ) + !qt6? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) + +src_prepare() { + default + + plocale_find_changes lang "${PN}_" '.ts' + + rm_ts() { + sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro + } + + plocale_for_each_disabled_locale rm_ts +} + +src_compile() { + 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 +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README.md +} diff --git a/sci-geosciences/gpxsee/gpxsee-6.3.ebuild b/sci-geosciences/gpxsee/gpxsee-6.3.ebuild deleted file mode 100644 index 845d03f7b4f1..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-6.3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="cs da de en fi fr nb pl ru sv" -inherit qmake-utils l10n xdg-utils gnome2-utils - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="http://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - l10n_find_plocales_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - l10n_for_each_disabled_locale_do rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - local lang - newbin ${MY_PN} ${PN} - dodoc README.md - insinto /usr/share/${PN} - doins -r pkg/maps pkg/csv - - insinto /usr/share/${PN}/translations - for lang in lang/*.qm; do - [ -f "${lang}" ] && doins "${lang}" - done - - insinto /usr/share/applications - doins pkg/${PN}.desktop - insinto /usr/share/mime/packages - doins pkg/${PN}.xml - insinto /usr/share/pixmaps - doins icons/${PN}.png -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild b/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild deleted file mode 100644 index f37e65f5536a..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="cs da de en fi fr nb pl ru sv tr" -inherit qmake-utils l10n xdg-utils gnome2-utils - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="http://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - l10n_find_plocales_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - l10n_for_each_disabled_locale_do rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - local lang - newbin ${MY_PN} ${PN} - dodoc README.md - insinto /usr/share/${PN} - doins -r pkg/maps pkg/csv - - insinto /usr/share/${PN}/translations - for lang in lang/*.qm; do - [ -f "${lang}" ] && doins "${lang}" - done - - insinto /usr/share/applications - doins pkg/${PN}.desktop - insinto /usr/share/mime/packages - doins pkg/${PN}.xml - insinto /usr/share/pixmaps - doins icons/${PN}.png -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/gpxsee/gpxsee-7.5.ebuild b/sci-geosciences/gpxsee/gpxsee-7.5.ebuild deleted file mode 100644 index 6b28d5dd63ab..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-7.5.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="cs da de en es fi fr nb pl pt_BR ru sv tr" -inherit qmake-utils l10n xdg-utils gnome2-utils - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="http://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - l10n_find_plocales_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - l10n_for_each_disabled_locale_do rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - local lang - dobin ${PN} - dodoc README.md - insinto /usr/share/${PN} - doins -r pkg/maps pkg/csv - - insinto /usr/share/${PN}/translations - for lang in lang/*.qm; do - [ -f "${lang}" ] && doins "${lang}" - done - - insinto /usr/share/applications - doins pkg/${PN}.desktop - insinto /usr/share/mime/packages - doins pkg/${PN}.xml - insinto /usr/share/pixmaps - doins icons/${PN}.png -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/gpxsee/gpxsee-7.8.ebuild b/sci-geosciences/gpxsee/gpxsee-7.8.ebuild deleted file mode 100644 index 6b28d5dd63ab..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-7.8.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="cs da de en es fi fr nb pl pt_BR ru sv tr" -inherit qmake-utils l10n xdg-utils gnome2-utils - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="http://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - l10n_find_plocales_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - l10n_for_each_disabled_locale_do rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - local lang - dobin ${PN} - dodoc README.md - insinto /usr/share/${PN} - doins -r pkg/maps pkg/csv - - insinto /usr/share/${PN}/translations - for lang in lang/*.qm; do - [ -f "${lang}" ] && doins "${lang}" - done - - insinto /usr/share/applications - doins pkg/${PN}.desktop - insinto /usr/share/mime/packages - doins pkg/${PN}.xml - insinto /usr/share/pixmaps - doins icons/${PN}.png -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/gpxsee/metadata.xml b/sci-geosciences/gpxsee/metadata.xml index 9e1420e8d7d2..83c1cf2df276 100644 --- a/sci-geosciences/gpxsee/metadata.xml +++ b/sci-geosciences/gpxsee/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>grozin@gentoo.org</email> @@ -9,10 +9,8 @@ <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> </maintainer> - <longdescription lang="en"> - GPXSee is a GPS log file viewer and analyzer that supports GPX, TCX, KML, FIT, IGC and NMEA files. - </longdescription> <upstream> <remote-id type="sourceforge">gpxsee</remote-id> + <remote-id type="github">tumic0/GPXSee</remote-id> </upstream> </pkgmetadata> diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index ab09e66a39fe..bc17e20a6fdd 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,4 +1,2 @@ -DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b -DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321 -DIST grass-7.4.1.tar.gz 57969640 BLAKE2B 1d3d0fd20611971ec349bf0e26ef7d886b7047e1ec48f48584f8ba2e5562f352433c9869420d7e030e66fb5a9e60de20e6a78d1fd5142380fbcab51f700766d8 SHA512 66616e495aa798cd1ad7a0284a386f7e99741918596b816a712788114e7dc491be0b5f19551f102b436518a5cabcdedbc61042acf0a9b06b9d8df12b4de26c90 -DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83 +DIST grass-8.3.1.tar.gz 68491177 BLAKE2B 58513c8c273b55831bca764c9e61e54b92c075ea2f4ff3c2f059ebcce98f25694ee03a25bef7a3e1c443165dd9493d3ce469233be3b65596dc28da166c12d174 SHA512 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793 +DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0 diff --git a/sci-geosciences/grass/files/grass-7.0.1-declare-inespg.patch b/sci-geosciences/grass/files/grass-7.0.1-declare-inespg.patch deleted file mode 100644 index 91f33a202635..000000000000 --- a/sci-geosciences/grass/files/grass-7.0.1-declare-inespg.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/general/g.proj/main.c b/general/g.proj/main.c -index 21d7b95..f81b392 100644 ---- a/general/g.proj/main.c -+++ b/general/g.proj/main.c -@@ -41,8 +41,8 @@ int main(int argc, char *argv[]) # undeclared var if OSG disabled - *forcedatumtrans; /* Force override of datumtrans parameters */ - - struct Option *location, /* Name of new location to create */ --#ifdef HAVE_OGR - *inepsg, /* EPSG projection code */ -+#ifdef HAVE_OGR - *inwkt, /* Input file with projection in WKT format */ - *inproj4, /* Projection in PROJ.4 format */ - *ingeo, /* Input geo-referenced file readable by - diff --git a/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch b/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch deleted file mode 100644 index 97be4d7d8606..000000000000 --- a/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch +++ /dev/null @@ -1,94 +0,0 @@ -Index: releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/lextab.py -=================================================================== ---- a/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71218) -+++ b/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71219) -@@ -1,59 +1,8 @@ - # lextab.py. This file automatically created by PLY (version 2.2). Don't edit! --_lextokens = { -- 'RIGHT_OP': None, -- 'RIGHT_ASSIGN': None, -- 'DEC_OP': None, -- 'PP_MACRO_PARAM': None, -- 'DIV_ASSIGN': None, -- 'PP_DEFINE': None, -- 'PP_END_DEFINE': None, -- 'PP_DEFINE_MACRO_NAME': None, -- 'HEADER_NAME': None, -- 'NEWLINE': None, -- 'CHARACTER_CONSTANT': None, -- 'PP_STRINGIFY': None, -- 'AND_ASSIGN': None, -- 'PTR_OP': None, -- 'ELLIPSIS': None, -- 'IDENTIFIER': None, -- 'ADD_ASSIGN': None, -- 'PERIOD': None, -- 'AND_OP': None, -- 'OTHER': None, -- 'LPAREN': None, -- 'LEFT_OP': None, -- 'LE_OP': None, -- 'OR_OP': None, -- 'SUB_ASSIGN': None, -- 'MOD_ASSIGN': None, -- 'STRING_LITERAL': None, -- 'PP_IDENTIFIER_PASTE': None, -- 'PP_NUMBER': None, -- 'PP_DEFINE_NAME': None, -- 'XOR_ASSIGN': None, -- 'OR_ASSIGN': None, -- 'GE_OP': None, -- 'MUL_ASSIGN': None, -- 'LEFT_ASSIGN': None, -- 'INC_OP': None, -- 'NE_OP': None, -- 'EQ_OP': None} --_lexreflags = 0 --_lexliterals = '' -+_lextokens = {'RIGHT_OP': None, 'RIGHT_ASSIGN': None, 'DEC_OP': None, 'PP_MACRO_PARAM': None, 'DIV_ASSIGN': None, 'PP_DEFINE': None, 'PP_END_DEFINE': None, 'PP_DEFINE_MACRO_NAME': None, 'HEADER_NAME': None, 'NEWLINE': None, 'CHARACTER_CONSTANT': None, 'PP_STRINGIFY': None, 'AND_ASSIGN': None, 'PTR_OP': None, 'ELLIPSIS': None, 'IDENTIFIER': None, 'ADD_ASSIGN': None, 'PERIOD': None, 'AND_OP': None, 'OTHER': None, 'LPAREN': None, 'LEFT_OP': None, 'LE_OP': None, 'OR_OP': None, 'SUB_ASSIGN': None, 'MOD_ASSIGN': None, 'STRING_LITERAL': None, 'PP_IDENTIFIER_PASTE': None, 'PP_NUMBER': None, 'PP_DEFINE_NAME': None, 'XOR_ASSIGN': None, 'OR_ASSIGN': None, 'GE_OP': None, 'MUL_ASSIGN': None, 'LEFT_ASSIGN': None, 'INC_OP': None, 'NE_OP': None, 'EQ_OP': None} -+_lexreflags = 0 -+_lexliterals = '' - _lexstateinfo = {'INITIAL': 'inclusive', 'DEFINE': 'exclusive'} --_lexstatere = { -- 'INITIAL': [ -- ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [ -- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [ -- None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [ -- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [ -- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [ -- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [ -- ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [ -- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [ -- None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [ -- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [ -- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [ -- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]} -+_lexstatere = {'INITIAL': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]} - _lexstateignore = {'INITIAL': ' \t\x0b\x0c\r', 'DEFINE': ' \t\x0b\x0c\r'} - _lexstateerrorf = {'INITIAL': 't_INITIAL_error', 'DEFINE': 't_DEFINE_error'} -Index: releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/pplexer.py -=================================================================== ---- a/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71218) -+++ b/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71219) -@@ -52,7 +52,7 @@ - 'L': '[a-zA-Z_]', - 'H': '[a-fA-F0-9]', - 'E': '[Ee][+-]?\s*{D}+', -- 'FS': '[FflL]', -+ 'FS': '([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)', - 'IS': '[uUlL]*', - } - # Helper: substitute {foo} with subs[foo] in string (makes regexes more lexy) -@@ -226,10 +226,10 @@ - exp = m.group("exp") - suf = m.group("suf") - -- if dp or exp or (suf and suf in ("Ff")): -+ if dp or exp or (suf and suf not in ("Ll")): - s = m.group(0) - if suf: -- s = s[:-1] -+ s = s[:-len(suf)] - # Attach a prefix so the parser can figure out if should become an - # integer, float, or long - t.value = "f" + s diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch deleted file mode 100644 index 115ff06febc3..000000000000 --- a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: /grass/trunk/lib/raster/R.h -=================================================================== ---- /grass/trunk/lib/raster/R.h (revision 71264) -+++ /grass/trunk/lib/raster/R.h (revision 71265) -@@ -1,5 +1,4 @@ - #include <grass/config.h> - #include <grass/gis.h> --#include <rpc/types.h> - #ifdef HAVE_GDAL - #include <gdal.h> diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch deleted file mode 100644 index c1361f6af088..000000000000 --- a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: /grass/branches/releasebranch_7_2/lib/raster/get_row.c
-===================================================================
---- /grass/branches/releasebranch_7_2/lib/raster/get_row.c (revision 71943)
-+++ /grass/branches/releasebranch_7_2/lib/raster/get_row.c (revision 71944)
-@@ -15,6 +15,4 @@
- #include <unistd.h>
- #include <sys/types.h>
--
--#include <rpc/types.h> /* need this for sgi */
-
- #include <grass/config.h>
-Index: /grass/branches/releasebranch_7_2/lib/raster/open.c
-===================================================================
---- /grass/branches/releasebranch_7_2/lib/raster/open.c (revision 71943)
-+++ /grass/branches/releasebranch_7_2/lib/raster/open.c (revision 71944)
-@@ -13,6 +13,4 @@
- */
-
--#include <rpc/types.h>
--#include <rpc/xdr.h>
- #include <unistd.h>
- #include <string.h>
-Index: /grass/branches/releasebranch_7_2/lib/raster/range.c
-===================================================================
---- /grass/branches/releasebranch_7_2/lib/raster/range.c (revision 71943)
-+++ /grass/branches/releasebranch_7_2/lib/raster/range.c (revision 71944)
-@@ -13,5 +13,4 @@
-
- #include <unistd.h>
--#include <rpc/types.h> /* need this for sgi */
-
- #include <grass/raster.h>
diff --git a/sci-geosciences/grass/files/grass-flock.patch b/sci-geosciences/grass/files/grass-flock.patch new file mode 100644 index 000000000000..4070f228dbb0 --- /dev/null +++ b/sci-geosciences/grass/files/grass-flock.patch @@ -0,0 +1,17 @@ +diff -Naur grass-7.8.3.org/include/Make/HtmlRules.make grass-7.8.3/include/Make/HtmlRules.make +--- grass-7.8.3.org/include/Make/HtmlRules.make 2020-05-05 10:51:50.000000000 +0200 ++++ grass-7.8.3/include/Make/HtmlRules.make 2020-10-10 13:43:42.800880621 +0200 +@@ -11,10 +11,10 @@ + endif + + $(HTMLDIR)/%.png: %.png | $(HTMLDIR) +- $(INSTALL_DATA) $< $@ ++ flock $@ $(INSTALL_DATA) $< $@ + + $(HTMLDIR)/%.jpg: %.jpg | $(HTMLDIR) +- $(INSTALL_DATA) $< $@ ++ flock $@ $(INSTALL_DATA) $< $@ + + $(HTMLDIR)/%.gif: %.gif | $(HTMLDIR) +- $(INSTALL_DATA) $< $@ ++ flock $@ $(INSTALL_DATA) $< $@ diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild deleted file mode 100644 index 6b99aa466e7b..000000000000 --- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" # bug 572440 -WANT_AUTOCONF="2.1" -WX_GTK_VER=3.0 - -inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils - -MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) -MY_PM=${MY_PM/.} -MY_P=${P/_rc/RC} - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="https://grass.osgeo.org/" -SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/7.2.0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" - -RDEPEND="${PYTHON_DEPS} - >=app-admin/eselect-1.2 - dev-python/numpy[${PYTHON_USEDEP}] - media-libs/libprojectm - sci-libs/proj - sci-libs/xdrfile - sci-libs/gdal - sys-libs/gdbm - sys-libs/ncurses:0= - sys-libs/zlib:= - fftw? ( sci-libs/fftw:3.0= ) - geos? ( sci-libs/geos ) - blas? ( virtual/blas - sci-libs/cblas-reference ) - lapack? ( virtual/lapack ) - liblas? ( sci-geosciences/liblas ) - mysql? ( virtual/mysql ) - netcdf? ( sci-libs/netcdf ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:0= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:0= ) - truetype? ( media-libs/freetype:2 ) - X? ( - dev-python/wxpython:3.0[cairo,opengl?] - x11-libs/cairo[X,opengl?] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/flex - sys-devel/gettext - sys-devel/bison - X? ( - dev-lang/swig - x11-base/xorg-proto - )" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - opengl? ( X )" - -PATCHES=( - "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch - "${FILESDIR}/${P}"-gcc7.patch - "${FILESDIR}/${P}"-glibc-2.26-{1,2}.patch -) - -pkg_setup() { - if use lapack; then - local mylapack - mylapack=$(eselect lapack show) || die - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas - myblas=$(eselect blas show) || die - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix unversioned python calls - local pyver=${EPYTHON/python/} - sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die - - # fix header being unconditionally included - # see upstream https://trac.osgeo.org/grass/ticket/2779 - sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \ - -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" - - default - eautoconf - - ebegin "Fixing python shebangs" - python_fix_shebang -q "${S}" - eend $? -} - -src_configure() { - if use X; then - WX_BUILD=yes - setup-wxwidgets - fi - - addwrite "${ROOT}dev/dri/renderD128" - - econf \ - --enable-shared \ - --disable-w11 \ - $(use_with cxx) \ - $(use_with tiff) \ - $(use_with png) \ - $(use_with postgres) \ - $(use_with mysql) \ - $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \ - $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \ - $(use_with sqlite) \ - $(use_with opengl) \ - $(use_with odbc) \ - $(use_with fftw) \ - $(use_with blas) \ - $(use_with lapack) \ - $(use_with X cairo) \ - $(use_with truetype freetype) \ - $(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \ - $(use_with nls) \ - $(use_with readline) \ - --without-opendwg \ - --with-regex \ - $(use_with threads pthread) \ - $(use_with openmp) \ - $(use_with opencl) \ - --with-gdal="${ROOT}usr/bin/gdal-config" \ - $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \ - $(use_with X wxwidgets "${WX_CONFIG}") \ - $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \ - $(use_with geos geos "${ROOT}usr/bin/geos-config") \ - --with-proj-includes="${ROOT}usr/include/libprojectM" \ - --with-proj-libs="${ROOT}usr/$(get_libdir)" \ - --with-proj-share="${ROOT}usr/share/proj/" \ - $(use_with X x) -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${D}" \ - INST_DIR="${D}usr/${MY_PM}" \ - prefix="${D}usr" BINDIR="${D}usr/bin" \ - PREFIX="${D}usr/" \ - install - - pushd "${D}usr/${MY_PM}" &> /dev/null || die - - # fix docs - dodoc AUTHORS CHANGES - docinto html - dodoc -r docs/html/* - rm -rf docs/ || die - rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die - - # manuals - dodir /usr/share/man/man1 - rm -rf man/ || die - - # translations - if use nls; then - dodir /usr/share/locale/ - mv locale/* "${D}usr/share/locale/" || die - rm -rf locale/ || die - # pt_BR is broken - mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die - fi - - popd &> /dev/null || die - - # place libraries where they belong - mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die - - # place header files where they belong - mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die - # make rules are not required on installed system - rm -rf "${D}usr/include/Make" || die - - # mv remaining gisbase stuff to libdir - mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die - - # get proper folder for grass path in script - local gisbase - gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}" - sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \ - -i "${D}usr/bin/${MY_PM}" || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \ - "${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die - - # set proper python interpreter - sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die - - if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" - doicon -s 48 gui/icons/${PN}-48x48.png - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; -} - -pkg_postinst() { - if use X; then - xdg_desktop_database_update - gnome2_icon_cache_update - fi -} - -pkg_postrm() { - if use X; then - xdg_desktop_database_update - gnome2_icon_cache_update - fi -} diff --git a/sci-geosciences/grass/grass-7.4.0.ebuild b/sci-geosciences/grass/grass-7.4.0.ebuild deleted file mode 100644 index 4b0679f5b2c9..000000000000 --- a/sci-geosciences/grass/grass-7.4.0.ebuild +++ /dev/null @@ -1,281 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" # bug 572440 -WANT_AUTOCONF="2.1" -WX_GTK_VER=3.0 - -inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils - -MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) -MY_PM=${MY_PM/.} -MY_P=${P/_rc/RC} - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="https://grass.osgeo.org/" -SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/7.4.0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" - -RDEPEND="${PYTHON_DEPS} - >=app-admin/eselect-1.2 - dev-python/numpy[${PYTHON_USEDEP}] - media-libs/libprojectm - sci-libs/proj - sci-libs/xdrfile - sci-libs/gdal - sys-libs/gdbm - sys-libs/ncurses:0= - sys-libs/zlib:= - fftw? ( sci-libs/fftw:3.0= ) - geos? ( sci-libs/geos ) - blas? ( virtual/blas - sci-libs/cblas-reference ) - lapack? ( virtual/lapack ) - liblas? ( sci-geosciences/liblas ) - mysql? ( virtual/mysql ) - netcdf? ( sci-libs/netcdf ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:0= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:0= ) - truetype? ( media-libs/freetype:2 ) - X? ( - dev-python/wxpython:3.0[cairo,opengl?] - x11-libs/cairo[X,opengl?] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/flex - sys-devel/gettext - sys-devel/bison - X? ( - dev-lang/swig - x11-base/xorg-proto - )" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - opengl? ( X )" - -PATCHES=( - "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch -) - -#pre_pkg_setup() { -# export LIBS="$(pkg-config --libs libtirpc) ${LIBS}" -# export CPPFLAGS="$(pkg-config --cflags libtirpc) ${CPPFLAGS}" -# einfo "LIBS='${LIBS}' CPPFLAGS='${CPPFLAGS}' # bug #588980" -#} - -pkg_setup() { - if use lapack; then - local mylapack - mylapack=$(eselect lapack show) || die - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas - myblas=$(eselect blas show) || die - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix unversioned python calls - local pyver=${EPYTHON/python/} - sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die - - # fix header being unconditionally included - # see upstream https://trac.osgeo.org/grass/ticket/2779 - sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \ - -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" - - default - eautoconf - - ebegin "Fixing python shebangs" - python_fix_shebang -q "${S}" - eend $? - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl - -} - -src_configure() { - if use X; then - WX_BUILD=yes - setup-wxwidgets - fi - - addwrite "${EPREFIX}/dev/dri/renderD128" - - econf \ - --enable-shared \ - --disable-w11 \ - $(use_with cxx) \ - $(use_with tiff) \ - $(use_with png) \ - $(use_with postgres) \ - $(use_with mysql) \ - $(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") \ - $(use_with mysql mysql-libs "${EPREFIX}/usr/$(get_libdir)/mysql") \ - $(use_with sqlite) \ - $(use_with opengl) \ - $(use_with odbc) \ - $(use_with fftw) \ - $(use_with blas) \ - $(use_with lapack) \ - $(use_with X cairo) \ - $(use_with truetype freetype) \ - $(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") \ - $(use_with nls) \ - $(use_with readline) \ - --without-opendwg \ - --with-regex \ - $(use_with threads pthread) \ - $(use_with openmp) \ - $(use_with opencl) \ - --with-gdal="${EPREFIX}/usr/bin/gdal-config" \ - $(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") \ - $(use_with X wxwidgets "${WX_CONFIG}") \ - $(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") \ - $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") \ - --with-proj-includes="${EPREFIX}/usr/include/libprojectM" \ - --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" \ - --with-proj-share="${EPREFIX}/usr/share/proj/" \ - $(use_with X x) -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${D}" \ - INST_DIR="${D}usr/${MY_PM}" \ - prefix="${D}usr" BINDIR="${D}usr/bin" \ - PREFIX="${D}usr/" \ - install - - pushd "${D}usr/${MY_PM}" &> /dev/null || die - - # fix docs - dodoc AUTHORS CHANGES - docinto html - dodoc -r docs/html/* - rm -rf docs/ || die - rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die - - # manuals - dodir /usr/share/man/man1 - rm -rf man/ || die - - # translations - if use nls; then - dodir /usr/share/locale/ - mv locale/* "${D}usr/share/locale/" || die - rm -rf locale/ || die - fi - - popd &> /dev/null || die - - # place libraries where they belong - mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die - - # place header files where they belong - mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die - # make rules are not required on installed system - rm -rf "${D}usr/include/Make" || die - - # mv remaining gisbase stuff to libdir - mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die - - # get proper folder for grass path in script - local gisbase - gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}" - sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \ - -i "${D}usr/bin/${MY_PM}" || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \ - "${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die - - # set proper python interpreter - sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die - - if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" - doicon -s 48 gui/icons/${PN}-48x48.png - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; -} - -pkg_postinst() { - if use X; then - xdg_desktop_database_update - gnome2_icon_cache_update - fi -} - -pkg_postrm() { - if use X; then - xdg_desktop_database_update - gnome2_icon_cache_update - fi -} diff --git a/sci-geosciences/grass/grass-7.4.1.ebuild b/sci-geosciences/grass/grass-7.4.1.ebuild deleted file mode 100644 index 7c4d6e63529f..000000000000 --- a/sci-geosciences/grass/grass-7.4.1.ebuild +++ /dev/null @@ -1,284 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" # bug 572440 -WANT_AUTOCONF="2.1" -WX_GTK_VER=3.0 - -inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils - -MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) -MY_PM=${MY_PM/.} -MY_P=${P/_rc/RC} - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="https://grass.osgeo.org/" -SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/7.4.0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" - -RDEPEND="${PYTHON_DEPS} - >=app-admin/eselect-1.2 - dev-python/numpy[${PYTHON_USEDEP}] - media-libs/libprojectm - sci-libs/proj - sci-libs/xdrfile - sci-libs/gdal - sys-libs/gdbm - sys-libs/ncurses:0= - sys-libs/zlib:= - fftw? ( sci-libs/fftw:3.0= ) - geos? ( sci-libs/geos ) - blas? ( virtual/blas - sci-libs/cblas-reference ) - lapack? ( virtual/lapack ) - liblas? ( sci-geosciences/liblas ) - mysql? ( virtual/mysql ) - netcdf? ( sci-libs/netcdf ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:0= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:0= ) - truetype? ( media-libs/freetype:2 ) - X? ( - dev-python/wxpython:3.0[cairo,opengl?] - x11-libs/cairo[X,opengl?] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/flex - sys-devel/gettext - sys-devel/bison - X? ( - dev-lang/swig - x11-base/xorg-proto - )" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - opengl? ( X )" - -PATCHES=( - "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch -) - -pkg_setup() { - if use lapack; then - local mylapack - mylapack=$(eselect lapack show) || die - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas - myblas=$(eselect blas show) || die - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix unversioned python calls - local pyver=${EPYTHON/python/} - sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die - - # fix header being unconditionally included - # see upstream https://trac.osgeo.org/grass/ticket/2779 - sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \ - -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" - - default - eautoconf - - ebegin "Fixing python shebangs" - python_fix_shebang -q "${S}" - eend $? - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl - -} - -src_configure() { - if use X; then - WX_BUILD=yes - setup-wxwidgets - fi - - addwrite "${EPREFIX}/dev/dri/renderD128" - - econf \ - --enable-shared \ - --disable-w11 \ - $(use_with cxx) \ - $(use_with tiff) \ - $(use_with png) \ - $(use_with postgres) \ - $(use_with mysql) \ - $(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") \ - $(use_with mysql mysql-libs "${EPREFIX}/usr/$(get_libdir)/mysql") \ - $(use_with sqlite) \ - $(use_with opengl) \ - $(use_with odbc) \ - $(use_with fftw) \ - $(use_with blas) \ - $(use_with lapack) \ - $(use_with X cairo) \ - $(use_with truetype freetype) \ - $(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") \ - $(use_with nls) \ - $(use_with readline) \ - --without-opendwg \ - --with-regex \ - $(use_with threads pthread) \ - $(use_with openmp) \ - $(use_with opencl) \ - --with-gdal="${EPREFIX}/usr/bin/gdal-config" \ - $(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") \ - $(use_with X wxwidgets "${WX_CONFIG}") \ - $(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") \ - $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") \ - --with-proj-includes="${EPREFIX}/usr/include/libprojectM" \ - --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" \ - --with-proj-share="${EPREFIX}/usr/share/proj/" \ - $(use_with X x) -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${D}" \ - INST_DIR="${D}/usr/$(get_libdir)/${MY_PM}" \ - prefix="${D}/usr/" BINDIR="${D}/usr/bin" \ - PREFIX="${D}/usr/" \ - install - - pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die - - dodoc AUTHORS CHANGES - docinto html - dodoc -r docs/html/* - - # manuals - dodir /usr/share/man/man1 - rm -rf man/ || die - - # translations - if use nls; then - dodir /usr/share/locale/ - mv locale/* "${D}usr/share/locale/" || die - fi - - popd &> /dev/null || die - - # link libraries in the ~standard~ place - for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do - dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}" - done - - # link headers in the ~standard~ place - dodir "/usr/include/" - dosym "../$(get_libdir)/${MY_PM}/include/grass" "/usr/include/grass" - - # fix paths in addons makefile includes - local scriptMakeDir - scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/" - for mkFile in $(ls "${scriptMakeDir}"); do - echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die - sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die - done - - # get proper folder for grass path in script - local gisbase - gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}" - sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \ - -i "${D}usr/bin/${MY_PM}" || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \ - "${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die - - # set proper python interpreter - sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die - - if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" - doicon -s 48 gui/icons/${PN}-48x48.png - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; -} - -pkg_postinst() { - if use X; then - xdg_desktop_database_update - gnome2_icon_cache_update - fi - - ewarn "GRASS addons may fail due to Python 3 incompatibility." - ewarn "If that is tha case you can change the shebang a the beginning of" - ewarn "the script to enforce Python 2 usage." - ewarn "#!/usr/bin/env python" - ewarn "Should be changed into" - ewarn "#!/usr/bin/env python2" -} - -pkg_postrm() { - if use X; then - xdg_desktop_database_update - gnome2_icon_cache_update - fi -} diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild deleted file mode 100644 index e067fbf0aaa6..000000000000 --- a/sci-geosciences/grass/grass-7.4.4.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" # bug 572440 -WANT_AUTOCONF="2.1" -WX_GTK_VER=3.0 - -inherit autotools desktop eapi7-ver python-single-r1 wxwidgets xdg - -MY_PM=${PN}$(ver_cut 1-2 ${PV}) -MY_PM=${MY_PM/.} -MY_P=${P/_rc/RC} - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="https://grass.osgeo.org/" -SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/7.4.0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X" - -RDEPEND="${PYTHON_DEPS} - >=app-admin/eselect-1.2 - dev-python/numpy[${PYTHON_USEDEP}] - media-libs/libprojectm - sci-libs/gdal - sys-libs/gdbm - sys-libs/ncurses:0= - sci-libs/proj - sci-libs/xdrfile - sys-libs/zlib - blas? ( - sci-libs/cblas-reference - virtual/blas - ) - fftw? ( sci-libs/fftw:3.0= ) - geos? ( sci-libs/geos ) - lapack? ( virtual/lapack ) - liblas? ( sci-geosciences/liblas ) - mysql? ( dev-db/mysql-connector-c:= ) - netcdf? ( sci-libs/netcdf ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:0= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:0= ) - truetype? ( media-libs/freetype:2 ) - X? ( - dev-python/wxpython:3.0[cairo,opengl?] - x11-libs/cairo[X,opengl?] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt - ) -" -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - X? ( - dev-lang/swig - x11-base/xorg-proto - ) -" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - opengl? ( X )" - -PATCHES=( "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch ) - -pkg_setup() { - if use lapack; then - local mylapack - mylapack=$(eselect lapack show) || die - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas - myblas=$(eselect blas show) || die - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix unversioned python calls - local pyver=${EPYTHON/python/} - sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die - - # fix header being unconditionally included - # see upstream https://trac.osgeo.org/grass/ticket/2779 - sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \ - -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" - - default - eautoconf - - ebegin "Fixing python shebangs" - python_fix_shebang -q "${S}" - eend $? - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl - -} - -src_configure() { - if use X; then - WX_BUILD=yes - setup-wxwidgets - fi - - addwrite "${EPREFIX%/}/dev/dri/renderD128" - - local myeconfargs=( - --enable-shared - --disable-w11 - --without-opendwg - --with-regex - --with-gdal="${EPREFIX%/}/usr/bin/gdal-config" - --with-proj-includes="${EPREFIX%/}/usr/include/libprojectM" - --with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)" - --with-proj-share="${EPREFIX%/}/usr/share/proj/" - $(use_with cxx) - $(use_with tiff) - $(use_with png) - $(use_with postgres) - $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql") - $(use_with sqlite) - $(use_with opengl) - $(use_with odbc) - $(use_with fftw) - $(use_with blas) - $(use_with lapack) - $(use_with X cairo) - $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2") - $(use_with nls) - $(use_with readline) - $(use_with threads pthread) - $(use_with openmp) - $(use_with opencl) - $(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config") - $(use_with X wxwidgets "${WX_CONFIG}") - $(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config") - $(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config") - $(use_with X x) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${D}" \ - INST_DIR="${D}/usr/$(get_libdir)/${MY_PM}" \ - prefix="${D}/usr/" BINDIR="${D}/usr/bin" \ - PREFIX="${D}/usr/" \ - install - - pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die - - local HTML_DOCS=( docs/html/. ) - einstalldocs - - # manuals - dodir /usr/share/man/man1 - rm -rf man/ || die - - # translations - if use nls; then - dodir /usr/share/locale/ - mv locale/* "${D}/usr/share/locale/" || die - fi - - popd &> /dev/null || die - - # link libraries in the ~standard~ place - for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do - dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}" - done - - # link headers in the ~standard~ place - dodir "/usr/include/" - dosym "../$(get_libdir)/${MY_PM}/include/grass" "/usr/include/grass" - - # fix paths in addons makefile includes - local scriptMakeDir - scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/" - for mkFile in $(ls "${scriptMakeDir}"); do - echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die - sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die - done - - # get proper folder for grass path in script - local gisbase - gisbase="${ROOT}/usr/$(get_libdir)/${MY_PM}" - sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \ - -i "${D}/usr/bin/${MY_PM}" || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \ - "${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die - - # set proper python interpreter - sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}/usr/bin/${MY_PM}" || die - - if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" - doicon -s 48 gui/icons/${PN}-48x48.png - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; -} - -pkg_postinst() { - use X && xdg_pkg_postinst - - ewarn "GRASS addons may fail due to Python 3 incompatibility." - ewarn "If that is tha case you can change the shebang a the beginning of" - ewarn "the script to enforce Python 2 usage." - ewarn "#!/usr/bin/env python" - ewarn "Should be changed into" - ewarn "#!/usr/bin/env python2" -} - -pkg_postrm() { - use X && xdg_pkg_postrm -} diff --git a/sci-geosciences/grass/grass-8.3.1.ebuild b/sci-geosciences/grass/grass-8.3.1.ebuild new file mode 100644 index 000000000000..8a3ea23d393d --- /dev/null +++ b/sci-geosciences/grass/grass-8.3.1.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite" # bug 572440 + +inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="https://grass.osgeo.org/" + +LICENSE="GPL-2" + +if [[ ${PV} =~ "9999" ]]; then + SLOT="0/8.3" +else + SLOT="0/$(ver_cut 1-2 ${PV})" +fi + +GVERSION=${SLOT#*/} +MY_PM="${PN}${GVERSION}" +MY_PM="${MY_PM/.}" + +if [[ ${PV} =~ "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OSGeo/grass.git" +else + MY_P="${P/_rc/RC}" + SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="amd64 ~ppc ~x86" + fi + + 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" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + opengl? ( X )" + +RDEPEND=" + ${PYTHON_DEPS} + >=app-admin/eselect-1.2 + $(python_gen_cond_dep ' + 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:= + sys-libs/ncurses:= + sci-libs/proj:= + sys-libs/zlib + media-libs/libglvnd + media-libs/glu + blas? ( + virtual/cblas[eselect-ldso(+)] + virtual/blas[eselect-ldso(+)] + ) + bzip2? ( app-arch/bzip2:= ) + fftw? ( sci-libs/fftw:3.0= ) + geos? ( sci-libs/geos:= ) + lapack? ( virtual/lapack[eselect-ldso(+)] ) + las? ( sci-geosciences/liblas ) + mysql? ( dev-db/mysql-connector-c:= ) + netcdf? ( sci-libs/netcdf:= ) + odbc? ( dev-db/unixODBC ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + pdal? ( >=sci-libs/pdal-2.0.0:= ) + png? ( media-libs/libpng:= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + readline? ( sys-libs/readline:= ) + sqlite? ( dev-db/sqlite:3 ) + tiff? ( media-libs/tiff:= ) + truetype? ( media-libs/freetype:2 ) + X? ( + $(python_gen_cond_dep ' + >=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}] + ') + x11-libs/cairo[X] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + ) + zstd? ( app-arch/zstd:= )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + X? ( dev-lang/swig )" + +PATCHES=( + # bug 746590 + "${FILESDIR}/${PN}-flock.patch" +) + +pkg_setup() { + if use lapack; then + local mylapack=$(eselect lapack show) + if [[ -z "${mylapack/.*reference.*/}" ]] && \ + [[ -z "${mylapack/.*atlas.*/}" ]]; then + ewarn "You need to set lapack to atlas or reference. Do:" + ewarn " eselect lapack set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + if use blas; then + local myblas=$(eselect blas show) + if [[ -z "${myblas/.*reference.*/}" ]] && \ + [[ -z "${myblas/.*atlas.*/}" ]]; then + ewarn "You need to set blas to atlas or reference. Do:" + ewarn " eselect blas set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix unversioned python calls + sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die + sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die + + default + + # When patching the build system, avoid running autoheader here. The file + # config.in.h is maintained manually upstream. Changes to it may lead to + # undefined behavior. See bug #866554. + # AT_NOEAUTOHEADER=1 eautoreconf + + ebegin "Fixing python shebangs" + python_fix_shebang -q "${S}" + eend $? + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + shopt -s nullglob + local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862579 + # https://github.com/OSGeo/grass/issues/3506 + # + # Do not trust it with LTO either + append-flags -fno-strict-aliasing + filter-lto + + addwrite /dev/dri/renderD128 + + local myeconfargs=( + --enable-shared + --disable-w11 + --without-opendwg + --with-regex + --with-gdal="${EPREFIX}"/usr/bin/gdal-config + --with-proj-includes="${EPREFIX}"/usr/include/proj + --with-proj-libs="${EPREFIX}"/usr/$(get_libdir) + --with-proj-share="${EPREFIX}"/usr/share/proj/ + $(use_with cxx) + $(use_with tiff) + $(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config) + $(use_with postgres) + $(use_with mysql) + $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql) + $(use_with sqlite) + $(use_with opengl) + $(use_with odbc) + $(use_with fftw) + $(use_with blas) + $(use_with lapack) + $(use_with X cairo) + $(use_with truetype freetype) + $(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2) + $(use_with nls) + $(use_with readline) + $(use_with threads pthread) + $(use_with openmp) + $(use_with opencl) + $(use_with bzip2 bzlib) + $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config) + $(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 X x) + $(use_with zstd) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # we don't want to link against embedded mysql lib + emake CC="$(tc-getCC)" MYSQLDLIB="" +} + +src_install() { + emake DESTDIR="${ED}" \ + INST_DIR=/usr/$(get_libdir)/${MY_PM} \ + prefix=/usr/ BINDIR=/usr/bin \ + install + + pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die + + local HTML_DOCS=( docs/html/. ) + einstalldocs + + # translations + if use nls; then + insinto /usr/share/locale + doins -r locale/. + fi + + popd >/dev/null || die + + # link libraries in the ~standard~ place + local f file + for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do + file="${f##*/}" + dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} + done + + # link headers in the ~standard~ place + dodir /usr/include/ + dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass + + # set proper python interpreter + sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ +os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ + -i "${ED}"/usr/bin/grass || die + + if use X; then + local GUI="--gui" + make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" + doicon -s 48 gui/icons/${PN}-48x48.png + fi + + # install .pc file so other apps know where to look for grass + insinto /usr/$(get_libdir)/pkgconfig/ + doins grass.pc + + # fix weird +x on tcl scripts + find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die +} + +pkg_postinst() { + use X && xdg_pkg_postinst +} + +pkg_postrm() { + use X && xdg_pkg_postrm +} diff --git a/sci-geosciences/grass/grass-8.3.2.ebuild b/sci-geosciences/grass/grass-8.3.2.ebuild new file mode 100644 index 000000000000..8a3ea23d393d --- /dev/null +++ b/sci-geosciences/grass/grass-8.3.2.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite" # bug 572440 + +inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="https://grass.osgeo.org/" + +LICENSE="GPL-2" + +if [[ ${PV} =~ "9999" ]]; then + SLOT="0/8.3" +else + SLOT="0/$(ver_cut 1-2 ${PV})" +fi + +GVERSION=${SLOT#*/} +MY_PM="${PN}${GVERSION}" +MY_PM="${MY_PM/.}" + +if [[ ${PV} =~ "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OSGeo/grass.git" +else + MY_P="${P/_rc/RC}" + SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="amd64 ~ppc ~x86" + fi + + 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" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + opengl? ( X )" + +RDEPEND=" + ${PYTHON_DEPS} + >=app-admin/eselect-1.2 + $(python_gen_cond_dep ' + 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:= + sys-libs/ncurses:= + sci-libs/proj:= + sys-libs/zlib + media-libs/libglvnd + media-libs/glu + blas? ( + virtual/cblas[eselect-ldso(+)] + virtual/blas[eselect-ldso(+)] + ) + bzip2? ( app-arch/bzip2:= ) + fftw? ( sci-libs/fftw:3.0= ) + geos? ( sci-libs/geos:= ) + lapack? ( virtual/lapack[eselect-ldso(+)] ) + las? ( sci-geosciences/liblas ) + mysql? ( dev-db/mysql-connector-c:= ) + netcdf? ( sci-libs/netcdf:= ) + odbc? ( dev-db/unixODBC ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + pdal? ( >=sci-libs/pdal-2.0.0:= ) + png? ( media-libs/libpng:= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + readline? ( sys-libs/readline:= ) + sqlite? ( dev-db/sqlite:3 ) + tiff? ( media-libs/tiff:= ) + truetype? ( media-libs/freetype:2 ) + X? ( + $(python_gen_cond_dep ' + >=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}] + ') + x11-libs/cairo[X] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + ) + zstd? ( app-arch/zstd:= )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + X? ( dev-lang/swig )" + +PATCHES=( + # bug 746590 + "${FILESDIR}/${PN}-flock.patch" +) + +pkg_setup() { + if use lapack; then + local mylapack=$(eselect lapack show) + if [[ -z "${mylapack/.*reference.*/}" ]] && \ + [[ -z "${mylapack/.*atlas.*/}" ]]; then + ewarn "You need to set lapack to atlas or reference. Do:" + ewarn " eselect lapack set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + if use blas; then + local myblas=$(eselect blas show) + if [[ -z "${myblas/.*reference.*/}" ]] && \ + [[ -z "${myblas/.*atlas.*/}" ]]; then + ewarn "You need to set blas to atlas or reference. Do:" + ewarn " eselect blas set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix unversioned python calls + sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die + sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die + + default + + # When patching the build system, avoid running autoheader here. The file + # config.in.h is maintained manually upstream. Changes to it may lead to + # undefined behavior. See bug #866554. + # AT_NOEAUTOHEADER=1 eautoreconf + + ebegin "Fixing python shebangs" + python_fix_shebang -q "${S}" + eend $? + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + shopt -s nullglob + local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862579 + # https://github.com/OSGeo/grass/issues/3506 + # + # Do not trust it with LTO either + append-flags -fno-strict-aliasing + filter-lto + + addwrite /dev/dri/renderD128 + + local myeconfargs=( + --enable-shared + --disable-w11 + --without-opendwg + --with-regex + --with-gdal="${EPREFIX}"/usr/bin/gdal-config + --with-proj-includes="${EPREFIX}"/usr/include/proj + --with-proj-libs="${EPREFIX}"/usr/$(get_libdir) + --with-proj-share="${EPREFIX}"/usr/share/proj/ + $(use_with cxx) + $(use_with tiff) + $(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config) + $(use_with postgres) + $(use_with mysql) + $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql) + $(use_with sqlite) + $(use_with opengl) + $(use_with odbc) + $(use_with fftw) + $(use_with blas) + $(use_with lapack) + $(use_with X cairo) + $(use_with truetype freetype) + $(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2) + $(use_with nls) + $(use_with readline) + $(use_with threads pthread) + $(use_with openmp) + $(use_with opencl) + $(use_with bzip2 bzlib) + $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config) + $(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 X x) + $(use_with zstd) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # we don't want to link against embedded mysql lib + emake CC="$(tc-getCC)" MYSQLDLIB="" +} + +src_install() { + emake DESTDIR="${ED}" \ + INST_DIR=/usr/$(get_libdir)/${MY_PM} \ + prefix=/usr/ BINDIR=/usr/bin \ + install + + pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die + + local HTML_DOCS=( docs/html/. ) + einstalldocs + + # translations + if use nls; then + insinto /usr/share/locale + doins -r locale/. + fi + + popd >/dev/null || die + + # link libraries in the ~standard~ place + local f file + for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do + file="${f##*/}" + dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} + done + + # link headers in the ~standard~ place + dodir /usr/include/ + dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass + + # set proper python interpreter + sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ +os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ + -i "${ED}"/usr/bin/grass || die + + if use X; then + local GUI="--gui" + make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" + doicon -s 48 gui/icons/${PN}-48x48.png + fi + + # install .pc file so other apps know where to look for grass + insinto /usr/$(get_libdir)/pkgconfig/ + doins grass.pc + + # fix weird +x on tcl scripts + find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die +} + +pkg_postinst() { + use X && xdg_pkg_postinst +} + +pkg_postrm() { + use X && xdg_pkg_postrm +} diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild new file mode 100644 index 000000000000..ed68dea0c142 --- /dev/null +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite" # bug 572440 + +inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="https://grass.osgeo.org/" + +LICENSE="GPL-2" + +if [[ ${PV} =~ "9999" ]]; then + SLOT="0/8.4" +else + SLOT="0/$(ver_cut 1-2 ${PV})" +fi + +GVERSION=${SLOT#*/} +MY_PM="${PN}${GVERSION}" +MY_PM="${MY_PM/.}" + +if [[ ${PV} =~ "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OSGeo/grass.git" +else + MY_P="${P/_rc/RC}" + SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~ppc ~x86" + fi + + 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" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + opengl? ( X )" + +RDEPEND=" + ${PYTHON_DEPS} + >=app-admin/eselect-1.2 + $(python_gen_cond_dep ' + 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:= + sys-libs/ncurses:= + sci-libs/proj:= + sys-libs/zlib + media-libs/libglvnd + media-libs/glu + blas? ( + virtual/cblas[eselect-ldso(+)] + virtual/blas[eselect-ldso(+)] + ) + bzip2? ( app-arch/bzip2:= ) + fftw? ( sci-libs/fftw:3.0= ) + geos? ( sci-libs/geos:= ) + lapack? ( virtual/lapack[eselect-ldso(+)] ) + las? ( sci-geosciences/liblas ) + mysql? ( dev-db/mysql-connector-c:= ) + netcdf? ( sci-libs/netcdf:= ) + odbc? ( dev-db/unixODBC ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + pdal? ( >=sci-libs/pdal-2.0.0:= ) + png? ( media-libs/libpng:= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + readline? ( sys-libs/readline:= ) + sqlite? ( dev-db/sqlite:3 ) + tiff? ( media-libs/tiff:= ) + truetype? ( media-libs/freetype:2 ) + X? ( + $(python_gen_cond_dep ' + >=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}] + ') + x11-libs/cairo[X] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + ) + zstd? ( app-arch/zstd:= )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + X? ( dev-lang/swig )" + +pkg_setup() { + if use lapack; then + local mylapack=$(eselect lapack show) + if [[ -z "${mylapack/.*reference.*/}" ]] && \ + [[ -z "${mylapack/.*atlas.*/}" ]]; then + ewarn "You need to set lapack to atlas or reference. Do:" + ewarn " eselect lapack set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + if use blas; then + local myblas=$(eselect blas show) + if [[ -z "${myblas/.*reference.*/}" ]] && \ + [[ -z "${myblas/.*atlas.*/}" ]]; then + ewarn "You need to set blas to atlas or reference. Do:" + ewarn " eselect blas set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix unversioned python calls + sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die + sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die + + default + + # When patching the build system, avoid running autoheader here. The file + # config.in.h is maintained manually upstream. Changes to it may lead to + # undefined behavior. See bug #866554. + # AT_NOEAUTOHEADER=1 eautoreconf + + ebegin "Fixing python shebangs" + python_fix_shebang -q "${S}" + eend $? + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + shopt -s nullglob + local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862579 + # https://github.com/OSGeo/grass/issues/3506 + # + # Do not trust it with LTO either + append-flags -fno-strict-aliasing + filter-lto + + addwrite /dev/dri/renderD128 + + local myeconfargs=( + --enable-shared + --disable-w11 + --without-opendwg + --with-regex + --with-gdal="${EPREFIX}"/usr/bin/gdal-config + --with-proj-includes="${EPREFIX}"/usr/include/proj + --with-proj-libs="${EPREFIX}"/usr/$(get_libdir) + --with-proj-share="${EPREFIX}"/usr/share/proj/ + $(use_with cxx) + $(use_with tiff) + $(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config) + $(use_with postgres) + $(use_with mysql) + $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql) + $(use_with sqlite) + $(use_with opengl) + $(use_with odbc) + $(use_with fftw) + $(use_with blas) + $(use_with lapack) + $(use_with X cairo) + $(use_with truetype freetype) + $(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2) + $(use_with nls) + $(use_with readline) + $(use_with threads pthread) + $(use_with openmp) + $(use_with opencl) + $(use_with bzip2 bzlib) + $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config) + $(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 X x) + $(use_with zstd) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # we don't want to link against embedded mysql lib + emake CC="$(tc-getCC)" MYSQLDLIB="" +} + +src_install() { + emake DESTDIR="${ED}" \ + INST_DIR=/usr/$(get_libdir)/${MY_PM} \ + prefix=/usr/ BINDIR=/usr/bin \ + install + + pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die + + local HTML_DOCS=( docs/html/. ) + einstalldocs + + # translations + if use nls; then + insinto /usr/share/locale + doins -r locale/. + fi + + popd >/dev/null || die + + # link libraries in the ~standard~ place + local f file + for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do + file="${f##*/}" + dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} + done + + # link headers in the ~standard~ place + dodir /usr/include/ + dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass + + # set proper python interpreter + sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ +os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ + -i "${ED}"/usr/bin/grass || die + + if use X; then + local GUI="--gui" + make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" + doicon -s 48 gui/icons/${PN}-48x48.png + fi + + # install .pc file so other apps know where to look for grass + insinto /usr/$(get_libdir)/pkgconfig/ + doins grass.pc + + # fix weird +x on tcl scripts + find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die +} + +pkg_postinst() { + use X && xdg_pkg_postinst +} + +pkg_postrm() { + use X && xdg_pkg_postrm +} diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml index 61353627f8de..4dffe6c5b468 100644 --- a/sci-geosciences/grass/metadata.xml +++ b/sci-geosciences/grass/metadata.xml @@ -1,19 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> <name>Gentoo Geosciences Project</name> </maintainer> -<longdescription>The original GIS, yes the first one, developed by the US -Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation -Project for more info http://grass.itc.it/gdp/index.php -</longdescription> + <longdescription> + The original GIS, yes the first one, developed by the US + Army Corp of Engineers, now an active free and open source GIS. See the GRASS Documentation + Project for more info https://grass.osgeo.org/. + </longdescription> <use> - <flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds - extended options to the v.select module</flag> - <flag name="liblas">Include support for LAS and LAZ encoded LiDAR - files through <pkg>sci-geosciences/liblas</pkg></flag> - <flag name="opencl">Enable OpenCL support</flag> + <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> </use> + <upstream> + <remote-id type="github">OSGeo/grass</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-geosciences/gshhg-gmt/Manifest b/sci-geosciences/gshhg-gmt/Manifest new file mode 100644 index 000000000000..77d15e749a86 --- /dev/null +++ b/sci-geosciences/gshhg-gmt/Manifest @@ -0,0 +1 @@ +DIST gshhg-gmt-2.3.7.tar.gz 57052180 BLAKE2B 5b618c874cca97da819263c3c436db1235d3293712a72c21ac4ca3ae78e95b5d36915312de3df361f978b14c697884ca278bebc41ac4c1d054adda6c417eb5b9 SHA512 27e97efe9d146a58d1c6674c5b6cde6b7545be60c1f7d3d93faca1034986d1648e73b589de571897fc53cd0d050a5875dcc9923e3f861f8473ca568a8142d727 diff --git a/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild b/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild new file mode 100644 index 000000000000..98d5752ac303 --- /dev/null +++ b/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Geography Database" +HOMEPAGE="https://www.soest.hawaii.edu/pwessel/gshhg/" +SRC_URI="https://www.soest.hawaii.edu/pwessel/gshhg/${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="amd64 ~x86" + +src_install() { + dodoc README.TXT + insinto /usr/share/gshhg + doins *.nc +} diff --git a/sci-geosciences/gshhg-gmt/metadata.xml b/sci-geosciences/gshhg-gmt/metadata.xml new file mode 100644 index 000000000000..75acc6f6ef6d --- /dev/null +++ b/sci-geosciences/gshhg-gmt/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci-geosciences@gentoo.org</email> + <name>Gentoo Geosciences Project</name> + </maintainer> + <longdescription lang="en"> + GSHHS is a high-resolution shoreline data set amalgamated from two + databases in the public domain. The data have undergone extensive + processing and are free of internal inconsistencies such as erratic + points and crossing segments. The shorelines are constructed + entirely from hierarchically arranged closed polygons. The data can + be used to simplify data searches and data selections, or to study + the statistical characteristics of shorelines and land-masses. + </longdescription> +</pkgmetadata> diff --git a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild index 3465400d19bd..37c8476bd8c1 100644 --- a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild +++ b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild @@ -1,20 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs data" HOMEPAGE="https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html" SRC_URI="https://www.ngdc.noaa.gov/mgg/shorelines/data/gshhg/oldversions/version${PV}/gshhs+wdbii_${PV}.zip" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" -RDEPEND="" -DEPEND="${RDEPEND}" -S="${WORKDIR}" +BDEPEND="app-arch/unzip" src_install() { dodoc gshhs/README.TXT diff --git a/sci-geosciences/gshhs-data/metadata.xml b/sci-geosciences/gshhs-data/metadata.xml index 71e2884352e9..75acc6f6ef6d 100644 --- a/sci-geosciences/gshhs-data/metadata.xml +++ b/sci-geosciences/gshhs-data/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> diff --git a/sci-geosciences/gshhs/gshhs-1.13.ebuild b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild index 49e225769e93..dd460de1633c 100644 --- a/sci-geosciences/gshhs/gshhs-1.13.ebuild +++ b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild @@ -1,32 +1,32 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs" HOMEPAGE="https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html" -SRC_URI="ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_1.13_src.zip" +SRC_URI="ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_${PV}_src.zip" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="+data" -RDEPEND="sci-libs/netcdf - sci-libs/gdal +RDEPEND="sci-libs/netcdf:= + sci-libs/gdal:= data? ( sci-geosciences/gshhs-data )" -DEPEND="${RDEPEND} - virtual/pkgconfig - app-arch/unzip" - -S="${WORKDIR}/${PN}" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip + virtual/pkgconfig" src_compile() { local p for p in gshhs gshhs_dp gshhstograss; do - $(tc-getCC) ${CFLAGS} $($(tc-getPKG_CONFIG) --cflags netcdf) \ + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ + $($(tc-getPKG_CONFIG) --cflags netcdf) \ ${LDFLAGS} ${p}.c \ $($(tc-getPKG_CONFIG) --libs netcdf) -lgdal -lm -o ${p} \ || die diff --git a/sci-geosciences/gshhs/metadata.xml b/sci-geosciences/gshhs/metadata.xml index 3e37aee7d8b2..dd2953636a71 100644 --- a/sci-geosciences/gshhs/metadata.xml +++ b/sci-geosciences/gshhs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild index b1cae729d35b..7752dc2afb2f 100644 --- a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild +++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit autotools gnome2 @@ -11,34 +11,27 @@ SRC_URI="http://www.zen35309.zen.co.uk/gps/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" +KEYWORDS="amd64 ~x86" RDEPEND=" - dev-libs/glib:2 dev-libs/dbus-glib - virtual/libgudev + dev-libs/glib:2 + dev-libs/libgudev + net-wireless/bluez x11-libs/cairo x11-libs/gtk+:3 - virtual/freedesktop-icon-theme - net-wireless/bluez -" -DEPEND="${DEPEND} - virtual/pkgconfig + virtual/freedesktop-icon-theme" +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/gettext -" - -DOCS="README AUTHORS ChangeLog" + virtual/pkgconfig" src_prepare() { + default + # werror is bad idea sed -i -e 's:-Werror::g' configure.ac || die # we run this ourselves sed -i -e '/gtk-update-icon-cache/d' Makefile.am || die eautoreconf } - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" -} diff --git a/sci-geosciences/gtk-g-rays2/metadata.xml b/sci-geosciences/gtk-g-rays2/metadata.xml index d78f80981828..d3369ac77939 100644 --- a/sci-geosciences/gtk-g-rays2/metadata.xml +++ b/sci-geosciences/gtk-g-rays2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/Manifest b/sci-geosciences/harmonics-dwf-free-noncomm/Manifest deleted file mode 100644 index 2c5f59b725ae..000000000000 --- a/sci-geosciences/harmonics-dwf-free-noncomm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST harmonics-dwf-20111230-nonfree.tar.bz2 308689 BLAKE2B f268116cb49b3fe4bcdf7f714a0e4f8af17021e05c028abe2b94c3ac483c9cc1a309bd07e3b38d4e4ad186d9bd19e66e6b1c94526601fbbedb285a9bcdab0780 SHA512 53da55c37dfa1e5f9be1c46cd53d80208c2bf5a2af6e53e26c0dfe097d85399f503c8bed389d368e9183ba1b5506a9debdc3f2a633c6bfc6b5b188f5800ca36a diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild b/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild deleted file mode 100644 index 4a08e6e7970e..000000000000 --- a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_P="${P/-free-noncomm-/-}" -DESCRIPTION="Tidal harmonics database for libtcd" -HOMEPAGE="http://www.flaterco.com/xtide/" -# Even though the SRC_URI is labeled nonfree, the data is actually available for -# any non-commercial use. -SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-nonfree.tar.bz2" - -LICENSE="free-noncomm" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -S=${WORKDIR} - -src_install() { - insinto /usr/share/harmonics - doins "${WORKDIR}/${MY_P}"-nonfree.tcd -} diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild index 7d140e843b2d..54fd46dbb772 100644 --- a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild +++ b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild @@ -1,19 +1,17 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 MY_P="${P/-free-/-}" DESCRIPTION="Tidal harmonics database for libtcd" -HOMEPAGE="http://www.flaterco.com/xtide/" +HOMEPAGE="https://flaterco.com/xtide/" SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-free.tar.bz2" +S="${WORKDIR}/${MY_P}" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -S=${WORKDIR}/${MY_P} +KEYWORDS="amd64 ~x86" src_install() { insinto /usr/share/harmonics diff --git a/sci-geosciences/harmonics-dwf-free/metadata.xml b/sci-geosciences/harmonics-dwf-free/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/sci-geosciences/harmonics-dwf-free/metadata.xml +++ b/sci-geosciences/harmonics-dwf-free/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest new file mode 100644 index 000000000000..bd030b524db9 --- /dev/null +++ b/sci-geosciences/josm-bin/Manifest @@ -0,0 +1,3 @@ +DIST josm-snapshot-19017.jar 16761531 BLAKE2B 8789b5aa4c1de250523d065a8c7d788d26bbc597c5a381065093c547a97ecdfb4386b51aed02ca77747139cbdeff5ad99c04b1e08eba592f18301204003d038e SHA512 6beaa0e10e6682124be9434034ac6610d2ad9c3bd9c8e0f46982e21344f8ac95868d020bb383462984875272291889d0ab3a802349e1cfcdee482a8dd8940c0c +DIST josm-snapshot-19039.jar 16767506 BLAKE2B fe5fe056771c17179bd0480792c0cccb963af792066ab7f72e8bda3cfd414323ea1b37d166ad80d4c5228bf2bf92be83df6e07fb1d59c4af57e41b7aaeb7057f SHA512 316bab3ed4654b46b65c5924a6fe8978da0af505d6287086bfb9a0a0b30486a22c53b9d93934009f49e0b18daf44b7aa34d1651d6cf66a6e9d8e0e3b5020fd57 +DIST josm-snapshot-19067.jar 18350764 BLAKE2B c4341e1f1442887b490d8118e6bdad72bcacaf437017f251b3a167622b75360434c57df5ef2631eb57bf747af5ec313c5a3029b9c2aed9134f2c8080904cbf6c SHA512 0300e21f494748ca3a4b8792ed671a5f9b9106f83ebe65e108c4d58b15e9312fa7323a016d0d4e55ee1ea9ea7bc201c1f209db9860cce026e66530d725357ae9 diff --git a/sci-geosciences/josm-bin/josm-bin-19017.ebuild b/sci-geosciences/josm-bin/josm-bin-19017.ebuild new file mode 100644 index 000000000000..3c2c192c743d --- /dev/null +++ b/sci-geosciences/josm-bin/josm-bin-19017.ebuild @@ -0,0 +1,37 @@ +# 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-19039.ebuild b/sci-geosciences/josm-bin/josm-bin-19039.ebuild new file mode 100644 index 000000000000..6303fb8bbeed --- /dev/null +++ b/sci-geosciences/josm-bin/josm-bin-19039.ebuild @@ -0,0 +1,37 @@ +# 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-19067.ebuild b/sci-geosciences/josm-bin/josm-bin-19067.ebuild new file mode 100644 index 000000000000..6303fb8bbeed --- /dev/null +++ b/sci-geosciences/josm-bin/josm-bin-19067.ebuild @@ -0,0 +1,37 @@ +# 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/metadata.xml b/sci-geosciences/josm-bin/metadata.xml new file mode 100644 index 000000000000..5ebe998800b9 --- /dev/null +++ b/sci-geosciences/josm-bin/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>henning@hennsch.de</email> + <name>Henning Schild</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>sci-geosciences@gentoo.org</email> + <name>Gentoo Geosciences Project</name> + </maintainer> + <upstream> + <changelog>https://josm.openstreetmap.de/wiki/StartupPage</changelog> + </upstream> +</pkgmetadata> diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest deleted file mode 100644 index c9742966e182..000000000000 --- a/sci-geosciences/josm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST josm-10966.tar.gz 61397663 BLAKE2B 31fce57126f0a311c1e7d815c1a26406c7d29429c737fc2405c3fed4240787f1e25b08ad7ca1d9b476bbf2d722a4f03db4dc6cf4a2911edd73f77165d253ef82 SHA512 a710e8c8b696955140a858dcb53184515a5c0d7b8cde71099258690b26cc980b903cfea2e4ef9b7fbf524e3b8a153f71d4464260294b0fdcf8941812ffe6b5ee diff --git a/sci-geosciences/josm/josm-10966.ebuild b/sci-geosciences/josm/josm-10966.ebuild deleted file mode 100644 index a357e498979b..000000000000 --- a/sci-geosciences/josm/josm-10966.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_ANT_ENCODING=UTF-8 - -[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion" -ESVN_REPO_URI="https://josm.openstreetmap.de/svn/trunk" -inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS} -unset SUBVERSION_ECLASS - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="https://josm.openstreetmap.de/" -# Upstream doesn't provide versioned tarballs, so we'll have to create one on our own: -# REVISION=${PV} -# mkdir -p josm-${REVISION} -# svn co -r ${REVISION} https://josm.openstreetmap.de/svn/trunk/ josm-${REVISION} -# cd josm-${REVISION} && ant init-svn-revision-xml && cd - -# tar -cz --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION} -[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == "9999" ]] || \ -KEYWORDS="amd64 x86" - -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" - -IUSE="" - -src_prepare() { - - if [[ ${PV} == "9999" ]]; then - - # create-revision needs the compile directory to be a svn directory - # see also https://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html - sed -i \ - -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \ - build.xml || die "sed failed" - - else - - # Remove dependency on git and svn just for generating a - # revision - the tarball should already have REVISION.XML - sed -i -e 's:, *init-git-revision-xml::g' \ - -e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \ - -e 's:${svn.info.result}:1:' \ - build.xml || die "sed failed" - - fi - -} - -src_compile() { - eant dist-optimized -} - -src_install() { - java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed" - - newicon images/logo.png josm.png || die "newicon failed" - make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience" -} diff --git a/sci-geosciences/josm/josm-99999.ebuild b/sci-geosciences/josm/josm-99999.ebuild deleted file mode 100644 index fb12e465c397..000000000000 --- a/sci-geosciences/josm/josm-99999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_ANT_ENCODING=UTF-8 - -[[ ${PV} == "99999" ]] && SUBVERSION_ECLASS="subversion" -ESVN_REPO_URI="https://josm.openstreetmap.de/svn/trunk" -inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS} -unset SUBVERSION_ECLASS - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="https://josm.openstreetmap.de/" -[[ ${PV} == "99999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == "99999" ]] || \ -KEYWORDS="~amd64 ~x86" - -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" - -IUSE="" - -src_prepare() { - if [[ ${PV} == "99999" ]]; then - - # create-revision needs the compile directory to be a svn directory - # see also https://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html - sed -i \ - -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \ - build.xml || die "Sed failed" - fi -} - -src_compile() { - eant dist-optimized -} - -src_install() { - java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed" - - newicon images/logo.png josm.png || die "newicon failed" - make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience" -} diff --git a/sci-geosciences/josm/metadata.xml b/sci-geosciences/josm/metadata.xml deleted file mode 100644 index d78f80981828..000000000000 --- a/sci-geosciences/josm/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-geosciences@gentoo.org</email> - <name>Gentoo Geosciences Project</name> - </maintainer> -</pkgmetadata> diff --git a/sci-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest index 42e07c62c7b9..3458e0e36292 100644 --- a/sci-geosciences/laszip/Manifest +++ b/sci-geosciences/laszip/Manifest @@ -1,2 +1,2 @@ -DIST laszip-src-2.2.0.tar.gz 407457 BLAKE2B d183ab6acf67708b3fc293ade228f516cc364d4cd494f5758cbba93969605f66e450aaa01a07660fd8976031b7747b40e0400573558d0f14b0e19874bf7d9fe3 SHA512 44dacb0d0ab79ac02c784549f42c4522451646b322835afc78fbf8bb82be40e023d374635c2a18989c73a5553e05b55d7c32f35d510f816704020b0e02365824 -DIST laszip-src-3.4.1.tar.gz 219421 BLAKE2B b1bb3f66d9209c6a137af84c8d220ee6a50309139721b8e0befb4f56991e8153fc6446666ca5c2cdcb57abf297694f1f679a3961dabdff6450bc6dcc965ef6cd SHA512 001602a602dda1e43a08ee306b9c7c23faaf5777d551c269aac4a21b1c99449d2f12f46a0f95ff237003a0ab691eaca15b43b2f4d354651abc5d54930a39a134 +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 diff --git a/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch b/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch deleted file mode 100644 index 4587331eba3f..000000000000 --- a/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- laszip-src-2.2.0/configure.ac -+++ laszip-src-2.2.0/configure.ac -@@ -21,9 +21,6 @@ - - m4_define([debug_default],[no]) - --CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS" --CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++98 $CXXFLAGS" -- - dnl ######################################################################### - dnl Checks for programs. - dnl ######################################################################### -@@ -68,8 +65,8 @@ - CXXFLAGS="$CXXFLAGS -g -DDEBUG" - AC_MSG_RESULT(yes) - else -- CFLAGS="$CFLAGS -O3 -DNDEBUG" -- CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG" -+ CFLAGS="$CFLAGS -DNDEBUG" -+ CXXFLAGS="$CXXFLAGS -DNDEBUG" - AC_MSG_RESULT(no) - fi - ---- laszip-src-2.2.0/src/Makefile.am -+++ laszip-src-2.2.0/src/Makefile.am -@@ -1,6 +1,6 @@ - SUBDIRS = . - --AM_CPPFLAGS = -I. -I../include -I../include/laszip -+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/include/laszip - noinst_LTLIBRARIES = liblibrary.la - - liblibrary_la_SOURCES = arithmeticmodel.cpp \ ---- laszip-src-2.2.0/tools/Makefile.am -+++ laszip-src-2.2.0/tools/Makefile.am -@@ -1,5 +1,5 @@ - --AM_CPPFLAGS = -I../include -I../include/laszip -+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/laszip - LDADD = ../liblaszip.la - - laszippertest_SOURCES = laszippertest.cpp ---- laszip-src-2.2.0/include/laszip/Makefile.am -+++ laszip-src-2.2.0/include/laszip/Makefile.am -@@ -1,4 +1,4 @@ --laszipdir = $(includedir)/ -+laszipdir = $(includedir)/laszip/ - - laszip_HEADERS = lasunzipper.hpp \ - laszip.hpp \ diff --git a/sci-geosciences/laszip/laszip-2.2.0.ebuild b/sci-geosciences/laszip/laszip-2.2.0.ebuild deleted file mode 100644 index 02addaad7d04..000000000000 --- a/sci-geosciences/laszip/laszip-2.2.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils 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/v${PV}/${PN}-src-${PV}.tar.gz" - -SLOT="0" -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~ia64 ppc ppc64 x86" - -S="${WORKDIR}/${PN}-src-${PV}" - -PATCHES=( - "${FILESDIR}"/${P}_fix-build-system.patch -) - -src_configure() { - append-flags -fno-strict-aliasing - autotools-utils_src_configure -} diff --git a/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild b/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild new file mode 100644 index 000000000000..d41ac8eef3fb --- /dev/null +++ b/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild @@ -0,0 +1,25 @@ +# 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 index 27cff79b9aa1..fd0926e96b21 100644 --- a/sci-geosciences/laszip/laszip-3.4.1.ebuild +++ b/sci-geosciences/laszip/laszip-3.4.1.ebuild @@ -1,16 +1,25 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils +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.gz" +SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV}.tar.bz2" SLOT="0" LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" +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 new file mode 100644 index 000000000000..e82c9094b483 --- /dev/null +++ b/sci-geosciences/laszip/laszip-3.4.3.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +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" +S="${WORKDIR}/${PN}-src-${PV}" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" diff --git a/sci-geosciences/laszip/metadata.xml b/sci-geosciences/laszip/metadata.xml index 5d256ab2d073..32b4a940de78 100644 --- a/sci-geosciences/laszip/metadata.xml +++ b/sci-geosciences/laszip/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> <name>Gentoo Geosciences Project</name> </maintainer> - <longdescription lang="en"> -An open-source utility for compressing LAS-stored LiDAR information in a -lossless format. - </longdescription> <upstream> <remote-id type="github">LASzip/LASzip</remote-id> </upstream> diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest index 3b20aa193d59..fcc9da773c40 100644 --- a/sci-geosciences/liblas/Manifest +++ b/sci-geosciences/liblas/Manifest @@ -1,2 +1 @@ -DIST libLAS-1.8.1.tar.bz2 3920203 BLAKE2B 2ef8e822c5d1c07d929e788c59e6e5b942aba637fb764d37e1505d136c75cd4a28efc4702b022bcfee8063b684956b4466c9ec00e737d7024ca2719d7b11f341 SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6 diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch new file mode 100644 index 000000000000..6f0c132b5c58 --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch @@ -0,0 +1,24 @@ +From 6a666b9101293b13fde4e4eb1d2c627f7613515e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Felipe=20M=2E=20L=C3=B3pez?= <femulop@gmail.com> +Date: Fri, 19 Jul 2019 08:26:44 +0200 +Subject: [PATCH] Always return NULL when Open() is used (#168) + +Attempt to open LAS file using standard stream, without +Boost supports built in, always failed with +"Cannot open sample.las for read. Exiting..." +--- + include/liblas/liblas.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/liblas/liblas.hpp b/include/liblas/liblas.hpp +index 325de3ff..5c950ce0 100644 +--- a/include/liblas/liblas.hpp ++++ b/include/liblas/liblas.hpp +@@ -138,6 +138,7 @@ inline std::istream* Open(std::string const& filename, std::ios::openmode mode) + ifs = new std::ifstream(); + ifs->open(filename.c_str(), mode); + if (ifs->is_open() == false) return NULL; ++ return ifs; + } + catch (...) + { diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch b/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch new file mode 100644 index 000000000000..288f207737bf --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch @@ -0,0 +1,55 @@ +diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp +index d3116a1..ab20e06 100644 +--- a/include/liblas/detail/binary.hpp ++++ b/include/liblas/detail/binary.hpp +@@ -17,6 +17,8 @@ + #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+
++#include <liblas/detail/endian.hpp>
++
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
+@@ -25,7 +27,6 @@ +
+ #include <boost/config.hpp>
+ #include <boost/static_assert.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/type_traits/is_signed.hpp>
+
+ #if CHAR_BIT != 8
+@@ -43,7 +44,7 @@ namespace detail { namespace binary { + struct big_endian_tag {};
+ struct little_endian_tag {};
+
+-#ifdef BOOST_BIG_ENDIAN
++#ifdef LIBLAS_BIG_ENDIAN
+ typedef big_endian_tag native_endian_tag;
+ #else
+ typedef little_endian_tag native_endian_tag;
+diff --git a/src/c_api.cpp b/src/c_api.cpp +index a70fe74..e8be785 100644 +--- a/src/c_api.cpp ++++ b/src/c_api.cpp +@@ -96,6 +96,7 @@ using namespace liblas; + #endif + + #include <boost/lambda/lambda.hpp> ++#include <boost/bind.hpp> + + bool IsReprojectionTransform(liblas::TransformPtr const& p) + { +diff --git a/src/header.cpp b/src/header.cpp +index 9987ce1..a5c8f7d 100644 +--- a/src/header.cpp ++++ b/src/header.cpp +@@ -54,7 +54,7 @@ + // boost + #include <boost/cstdint.hpp> + #include <boost/lambda/lambda.hpp> +- ++#include <boost/bind.hpp> + //std + #include <algorithm> + #include <fstream> diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch b/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch new file mode 100644 index 000000000000..0c3b8ceec269 --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch @@ -0,0 +1,18 @@ +Description: Fix compilation with -DDEBUG and GDAL >= 2 +Author: Even Rouault <even.rouault@spatialys.com> +Origin: https://github.com/libLAS/libLAS/commit/72f7709bf1dfd3473b64cdba0259363d3beea3c3 + +--- a/src/gt_wkt_srs.cpp ++++ b/src/gt_wkt_srs.cpp +@@ -90,7 +90,11 @@ static const char *papszDatumEquiv[] = + /* LibgeotiffOneTimeInit() */ + /************************************************************************/ + ++#if GDAL_VERSION_MAJOR >= 2 ++static CPLMutex* hMutex = NULL; ++#else + static void* hMutex = NULL; ++#endif + + void LibgeotiffOneTimeInit() + { diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch b/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch new file mode 100644 index 000000000000..b279eb40f4cd --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch @@ -0,0 +1,34 @@ +https://github.com/libLAS/libLAS/commit/8c4985384453a2df7254f05688b83706723bad7b.patch +https://bugs.gentoo.org/789732 + +From 8c4985384453a2df7254f05688b83706723bad7b Mon Sep 17 00:00:00 2001 +From: FX Coudert <fxcoudert@gmail.com> +Date: Wed, 4 Oct 2017 11:51:23 +0200 +Subject: [PATCH] fix pointer comparison + +--- + src/gt_citation.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gt_citation.cpp b/src/gt_citation.cpp +index 65fce31a..8d3966bc 100644 +--- a/src/gt_citation.cpp ++++ b/src/gt_citation.cpp +@@ -155,7 +155,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID) + if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ') + p1 --; + p2 = p1 - 1; +- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) ++ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) + p2--; + if(p2 != p1 - 1) + p1 = p2; +@@ -198,7 +198,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID) + if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ') + p1 --; + char* p2 = p1 - 1; +- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) ++ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) + p2--; + if(p2 != p1 - 1) + p1 = p2; diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch b/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch new file mode 100644 index 000000000000..0691c16c1b7e --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch @@ -0,0 +1,34 @@ +From 3a572ff7e684668da62c794b37ccccbc169723de Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 26 Feb 2020 17:45:30 +0100 +Subject: [PATCH] Fix build against >=GDAL-2.5.0 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/gt_wkt_srs.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/gt_wkt_srs.cpp b/src/gt_wkt_srs.cpp +index 9871aa0..099972d 100755 +--- a/src/gt_wkt_srs.cpp ++++ b/src/gt_wkt_srs.cpp +@@ -493,7 +493,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn ) + { + char *pszWKT; + oSRS.morphFromESRI(); +- oSRS.FixupOrdering(); + if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) + return pszWKT; + } +@@ -1094,8 +1093,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn ) + /* ==================================================================== */ + char *pszWKT; + +- oSRS.FixupOrdering(); +- + if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) + return pszWKT; + else +-- +2.25.1 + diff --git a/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild index 377be29abea5..1c896bcd74f1 100644 --- a/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild +++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils +inherit cmake flag-o-matic DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS" HOMEPAGE="https://github.com/libLAS/libLAS/" SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/libLAS-${PV}" -SLOT="0" LICENSE="BSD" -KEYWORDS="amd64 ~ia64 ppc ppc64 x86" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" IUSE="gdal" DEPEND=" @@ -25,16 +26,21 @@ RDEPEND="${DEPEND}" # tests known to fail due to LD_LIBRARY_PATH issue RESTRICT="test" -S="${WORKDIR}/libLAS-${PV}" - PATCHES=( "${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch "${FILESDIR}"/${P}-fix-overload-call.patch # bug 661654 "${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482 + "${FILESDIR}"/${P}-CVE-2018-20540-fixup.patch # bug 698846 + "${FILESDIR}"/${P}-fix-debug.patch # bug 668778 + "${FILESDIR}"/${P}-boost-1.73.patch # bug 722878 + "${FILESDIR}"/${P}-gcc11.patch # bug 789732 ) src_prepare() { - cmake-utils_src_prepare + use gdal && has_version ">=sci-libs/gdal-2.5.0" && PATCHES+=( + "${FILESDIR}"/${P}-gdal-2.5.0.patch # bug 707706 + ) + cmake_src_prepare # add missing linkage sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \ @@ -42,9 +48,13 @@ src_prepare() { } src_configure() { + # Aliasing violations (bug #862585) + filter-lto + append-flags -fno-strict-aliasing + local mycmakeargs=( -DLIBLAS_LIB_SUBDIR=$(get_libdir) -DWITH_GDAL=$(usex gdal) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/sci-geosciences/liblas/liblas-1.8.1.ebuild b/sci-geosciences/liblas/liblas-1.8.1.ebuild deleted file mode 100644 index 2b0d2893bd8a..000000000000 --- a/sci-geosciences/liblas/liblas-1.8.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS" -HOMEPAGE="http://www.liblas.org" -SRC_URI="http://download.osgeo.org/${PN}/libLAS-${PV}.tar.bz2" - -# tests known to fail due to LD_LIBRARY_PATH issue -RESTRICT="test" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 ~ia64 ppc ppc64 x86" -IUSE="gdal" - -RDEPEND=" - dev-libs/boost:= - sci-geosciences/laszip - sci-libs/libgeotiff - gdal? ( sci-libs/gdal ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/libLAS-${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch -) - -src_prepare() { - cmake-utils_src_prepare - - # add missing linkage - sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \ - -i "${S}/apps/CMakeLists.txt" || die -} - -src_configure() { - local mycmakeargs=( - "-DWITH_GDAL=$(usex gdal)" - -DLIBLAS_LIB_SUBDIR=$(get_libdir) - ) - cmake-utils_src_configure -} diff --git a/sci-geosciences/liblas/metadata.xml b/sci-geosciences/liblas/metadata.xml index 38120b5c596a..b134a755b5b1 100644 --- a/sci-geosciences/liblas/metadata.xml +++ b/sci-geosciences/liblas/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> @@ -9,7 +9,7 @@ <flag name="gdal">Add support for the <pkg>sci-libs/gdal</pkg> geospatial raster library</flag> </use> -<longdescription lang="en"> -A C/C++ library for reading and writing the very common LAS LiDAR format. -</longdescription> +<upstream> + <remote-id type="github">libLAS/libLAS</remote-id> +</upstream> </pkgmetadata> diff --git a/sci-geosciences/librttopo/Manifest b/sci-geosciences/librttopo/Manifest new file mode 100644 index 000000000000..7dba5b6ed3be --- /dev/null +++ b/sci-geosciences/librttopo/Manifest @@ -0,0 +1 @@ +DIST librttopo-1.1.0.tar.gz 301077 BLAKE2B 4d296593b5f50712952f54cf5bde540d32293dd7d401fe26325201df202caf7b7841eee0cf65cdbd2fd1789cb050d6fe532af60f76105ae0288c0beb1adca2f2 SHA512 624c2aeff16737d0bec28f8b38427351a3af20658a077d280a1b2422697419394f36832db9459bf25c7d699bc002eaec499dcbd65bca7d2b3f8b92e78650dea3 diff --git a/sci-geosciences/librttopo/librttopo-1.1.0.ebuild b/sci-geosciences/librttopo/librttopo-1.1.0.ebuild new file mode 100644 index 000000000000..6d2203aaf4cd --- /dev/null +++ b/sci-geosciences/librttopo/librttopo-1.1.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies" +HOMEPAGE="https://git.osgeo.org/gitea/rttopo/librttopo" +SRC_URI="https://git.osgeo.org/gitea/rttopo/librttopo/archive/${P}.tar.gz" +S="${WORKDIR}/librttopo" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +RDEPEND="sci-libs/geos" +DEPEND="${RDEPEND}" + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-geosciences/mapnik-world-boundaries/metadata.xml b/sci-geosciences/librttopo/metadata.xml index 22c8c1ac24a6..080560a80ec2 100644 --- a/sci-geosciences/mapnik-world-boundaries/metadata.xml +++ b/sci-geosciences/librttopo/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> <name>Gentoo Geosciences Project</name> </maintainer> - <longdescription lang="en"> - World Boundaries data from openstreetmap needed by mapnik - </longdescription> </pkgmetadata> diff --git a/sci-geosciences/libtcd/Manifest b/sci-geosciences/libtcd/Manifest index 2e834d8f4857..d1ee8fd701d6 100644 --- a/sci-geosciences/libtcd/Manifest +++ b/sci-geosciences/libtcd/Manifest @@ -1,3 +1 @@ -DIST libtcd-2.2.5-r2.tar.bz2 294449 BLAKE2B 82c91beab6f4fe5d6c4ddfdca043a83db01508fca9475576c2f4174d14928acd7c5c56afd2dce2fc741bb2bf61244ed65f63e9298ab5e6d2b3520622b283aa68 SHA512 125b8f4258c576d82f86f75c9dec4e6e0dba8d46e897835ff8ee57cb58495c3f2ae42040719aa8a6f0fa70be40dbc3eb082250cfa197f15f0b23d2ee37a47fbd -DIST libtcd-2.2.6.tar.bz2 300738 BLAKE2B 321ef152e68bc6a333590bc2675890a04ea2e6e5f776bc3f3744bef8dfc5367bc0625f65cef522a59c715123f5c1ee84e8142464e520e1b70958f6cbaf40e6a3 SHA512 e0c5c35a72617c013fa2cfe94c0aff16c9d14870aa1b3ab14bf1a01715df8f8d9e9acbfa07c60275ea95266f1debbe1b61aa46e47344bba38ec64286bf2ca1eb -DIST libtcd-2.2.7.tar.bz2 306184 BLAKE2B 77d942adb822d96c86dbda2141acf1e2e30551b70e24bc325f412691149d2dd28a862592d8c0f57a0d528bcfee991613ff81f654a3541be341145a02e5af0164 SHA512 3347539a186c13fd9713752e4c9bb75c50eeee74f85a9126d7ed376f927675af6943fc486ff9396b5504b9d1aa8e33ebdd41663fc1ec5ed8babf4c207be3ce3f +DIST libtcd-2.2.7-r3.tar.xz 272284 BLAKE2B c0ba7c969272177d5388cdbc1d7de2cf05f54355aa8b1230afefecccb1c1f7ed40f30bf1e383ad75a2a4336d61b81d6163b93eb938530e98b9be789e0f86ecfb SHA512 741bb28fdb3998c75439151207fe1d85ee425a4e75286c0a8c68ee31b5fa79e097e7e6d2113315ffc90c11305df41aea022e691d1985c0b6b0d44a720d211e36 diff --git a/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild b/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild deleted file mode 100644 index 582689ba71a2..000000000000 --- a/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MY_P=${PN}-${PV/_p/-r} -DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files" -HOMEPAGE="http://www.flaterco.com/xtide/libtcd.html" -SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc static-libs" - -DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${P%_*} - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - use static-libs || prune_libtool_files - use doc && dohtml libtcd.html -} diff --git a/sci-geosciences/libtcd/libtcd-2.2.6.ebuild b/sci-geosciences/libtcd/libtcd-2.2.6.ebuild deleted file mode 100644 index ac79514bf6d8..000000000000 --- a/sci-geosciences/libtcd/libtcd-2.2.6.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MY_P=${PN}-${PV/_p/-r} -DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files" -HOMEPAGE="http://www.flaterco.com/xtide/libtcd.html" -SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2" - -LICENSE="public-domain" -SLOT="0/1" -KEYWORDS="~amd64 ~x86" -IUSE="doc static-libs" - -DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${P%_*} - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - use static-libs || prune_libtool_files - use doc && dohtml libtcd.html -} diff --git a/sci-geosciences/libtcd/libtcd-2.2.7.ebuild b/sci-geosciences/libtcd/libtcd-2.2.7.ebuild deleted file mode 100644 index 20fa5a171536..000000000000 --- a/sci-geosciences/libtcd/libtcd-2.2.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MY_P=${PN}-${PV/_p/-r} -DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files" -HOMEPAGE="http://www.flaterco.com/xtide/libtcd.html" -SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2" - -LICENSE="public-domain" -SLOT="0/1" -KEYWORDS="~amd64 ~x86" -IUSE="doc static-libs" - -DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${P%_*} - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - use static-libs || prune_libtool_files - use doc && dohtml libtcd.html -} diff --git a/sci-geosciences/libtcd/libtcd-2.2.7_p3.ebuild b/sci-geosciences/libtcd/libtcd-2.2.7_p3.ebuild new file mode 100644 index 000000000000..3ff5a581edee --- /dev/null +++ b/sci-geosciences/libtcd/libtcd-2.2.7_p3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P=${PN}-${PV/_p/-r} +DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files" +HOMEPAGE="https://flaterco.com/xtide/libtcd.html" +SRC_URI="https://flaterco.com/files/xtide/${MY_P}.tar.xz" +S="${WORKDIR}"/${P%_*} + +LICENSE="public-domain" +SLOT="0/1" +KEYWORDS="amd64 ~x86" +IUSE="doc" + +DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302" +RDEPEND="${DEPEND}" + +src_configure() { + econf --disable-static +} + +src_install() { + default + + rm \ + "${ED}"/usr/share/doc/${P}/{AUTHORS,ChangeLog,NEWS,README} \ + "${ED}"/usr/share/${PN}/libtcd.html \ + || die + + if use doc ; then + docinto html + dodoc libtcd.html + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-geosciences/libtcd/metadata.xml b/sci-geosciences/libtcd/metadata.xml index 6f49eba8f496..115e9d64a669 100644 --- a/sci-geosciences/libtcd/metadata.xml +++ b/sci-geosciences/libtcd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/sci-geosciences/mapnik-world-boundaries/Manifest b/sci-geosciences/mapnik-world-boundaries/Manifest deleted file mode 100644 index 300821a14a1a..000000000000 --- a/sci-geosciences/mapnik-world-boundaries/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST processed_p-20090514.zip 255429573 BLAKE2B c0dc970f03a92ea2071d9a4edcfeb060e3bc972a681f2a153fd512ddd2a4f4605ccd9125a9a7584d83f35560245f7fee6e58ec153ab51b899c75b4e9cc5837e7 SHA512 8a6c35def519b8c3652bfa6d63b62b1c3e2acbfc833a62157443c171e495f8698912ccbd36a4def590329937ad4b9f4c4595a016013df8209cbc7c5b3e19b2c4 -DIST world_boundaries-spherical-20090331.tgz 52857349 BLAKE2B 9a968a5682607980010eb3eb8080ab1a9e94c4581e3bd201b572f793249b322d01ee4224e090cfb118474e396e7c9aab8900a6119506a29757d57ed04d7e547f SHA512 2d83049688b52987ffa26afb25a340dd1f68f22fe8fbf8e5ca10a798e34cde9c6e4508c44edf86cd46f7ab3d154b123cbbd6084f8b7087c5fbb4c6a14b9cc69d diff --git a/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild b/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild deleted file mode 100644 index e68b87be369c..000000000000 --- a/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Mapnik World Boundaries" -HOMEPAGE="https://www.openstreetmap.org/" -SRC_URI="mirror://gentoo/world_boundaries-spherical-20090331.tgz - mirror://gentoo/processed_p-20090514.zip" - -LICENSE="CC-BY-SA-2.0" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -DEPEND="app-arch/unzip" -RDEPEND="" - -S="${WORKDIR}" - -src_prepare() { - default - mv coastlines/* world_boundaries/ -} - -src_install() { - insinto /usr/share/mapnik - doins -r world_boundaries -} diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest deleted file mode 100644 index 814739a065bd..000000000000 --- a/sci-geosciences/mapnik/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mapnik-3.0.18.tar.bz2 10103474 BLAKE2B de914ffe31940b74114cdf07a9ff13f36c7210d27b84cecd16fda7c429f0c4be7ffb9e677cf1bc8d156298b5f10ed2a41adcbf4f7727bbf85d2f0099950f5c4f SHA512 7af04b9437c83cddedf2b43f7da0622e44178b4ecce80c0349bacf551bf747698d9ec9e4d6eee68c0265feeae5833281215a759de5a1394abbdfdd39eef39661 -DIST mapnik-3.0.9.tar.gz 13434729 BLAKE2B 49cf90089b34cfc706f85950d090609d5f9a5a6e9cfb56f6e1f1a6279f864b35f3f8d456caa2365787261affc4acb85ad93621d6471efed85f560c808dc0535a SHA512 ad45ecbb2661e860b7057e0a235542a390ae5790f401ef2c04f1517b6487e83cdb8e307072681847cb72a3abc242e0114bc15d48f504dec1f92df970dd1556e1 diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch deleted file mode 100644 index 89541cb85ed7..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -503,16 +503,7 @@ for opt in pickle_store: - #print 'missing opt', opt - preconfigured = False - --# if custom arguments are supplied make sure to accept them --if opts.args: -- # since we have custom arguments update environment with all opts to -- # make sure to absorb the custom ones -- opts.Update(env) -- # now since we've got custom arguments we'll disregard any -- # pickled environment and force another configuration -- preconfigured = False -- --elif preconfigured: -+if preconfigured: - if not HELP_REQUESTED: - color_print(4,'Using previous successful configuration...') - color_print(4,'Re-configure by running "python scons/scons.py configure".') diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch deleted file mode 100644 index c92c0e9a02a7..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/build.py -+++ b/src/build.py -@@ -38,7 +38,7 @@ def call(cmd, silent=True): - print stderr - - def ldconfig(*args,**kwargs): -- call('ldconfig') -+ pass - - if env['LINKING'] == 'static': - lib_env.Append(CXXFLAGS="-fPIC") diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch deleted file mode 100644 index 1330fe6c0fb2..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1ddfe6c315487a802f2ea38119255a203a25913c Mon Sep 17 00:00:00 2001 -From: Raul Marin <git@rmr.ninja> -Date: Tue, 3 Apr 2018 13:18:03 +0200 -Subject: [PATCH] Qualify ICU types explicitly - -ICU 61 has dropped the global `using namespace icu;` -http://site.icu-project.org/download/61#TOC-Migration-Issues ---- - include/mapnik/text/scrptrun.hpp | 2 +- - src/text/text_layout.cpp | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/include/mapnik/text/scrptrun.hpp b/include/mapnik/text/scrptrun.hpp -index 2161c510d9..c219a2a0d3 100644 ---- a/include/mapnik/text/scrptrun.hpp -+++ b/include/mapnik/text/scrptrun.hpp -@@ -37,7 +37,7 @@ struct ParenStackEntry - UScriptCode scriptCode = USCRIPT_INVALID_CODE; - }; - --class ScriptRun : public UObject { -+class ScriptRun : public icu::UObject { - public: - ScriptRun(); - -diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp -index 663cbe11aa..ecf02ab8e3 100644 ---- a/src/text/text_layout.cpp -+++ b/src/text/text_layout.cpp -@@ -207,6 +207,7 @@ void text_layout::layout() - // At the end everything that is left over is added as the final line. - void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits) - { -+ using BreakIterator = icu::BreakIterator; - text_line line(line_limits.first, line_limits.second); - shape_text(line); - -@@ -228,7 +229,7 @@ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits) - } - - mapnik::value_unicode_string const& text = itemizer_.text(); -- Locale locale; // TODO: Is the default constructor correct? -+ icu::Locale locale; // TODO: Is the default constructor correct? - UErrorCode status = U_ZERO_ERROR; - std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status)); - -@@ -336,6 +337,7 @@ inline int adjust_last_break_position (int pos, bool repeat_wrap_char) - - void text_layout::break_line(std::pair<unsigned, unsigned> && line_limits) - { -+ using BreakIterator = icu::BreakIterator; - text_line line(line_limits.first, line_limits.second); - shape_text(line); - double scaled_wrap_width = wrap_width_ * scale_factor_; diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch deleted file mode 100644 index 2414bf95fedd..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -317,7 +317,7 @@ - ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)), - - # Install Variables -- ('PREFIX', 'The install path "prefix"', '/usr/local'), -+ ('PREFIX', 'The install path "prefix"', '/usr'), - ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT), - ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), - ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''), -@@ -1222,6 +1222,8 @@ - - color_print(4,'Configuring build environment...') - -+ OPTIONAL_LIBSHEADERS = [] -+ - if not env['FAST']: - SetCacheMode('force') - -@@ -1410,7 +1412,8 @@ - # https://github.com/mapnik/mapnik/issues/913 - if env.get('XMLPARSER') and env['XMLPARSER'] == 'libxml2': - if env.get('XML2_LIBS') or env.get('XML2_INCLUDES'): -- OPTIONAL_LIBSHEADERS.insert(0,['libxml2','libxml/parser.h',True,'C']) -+ # code doesn't actually use HAVE_XMML2 but set just to have a fifth value -+ OPTIONAL_LIBSHEADERS.append(['libxml2','libxml/parser.h',True,'C','-DHAVE_XML2']) - if env.get('XML2_INCLUDES'): - inc_path = env['XML2_INCLUDES'] - env.AppendUnique(CPPPATH = fix_path(inc_path)) -@@ -1428,8 +1431,6 @@ - else: - env['SKIPPED_DEPS'].extend(['dlfcn']) - -- OPTIONAL_LIBSHEADERS = [] -- - if env['JPEG']: - OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG']) - inc_path = env['%s_INCLUDES' % 'JPEG'] diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch b/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch deleted file mode 100644 index cb81f526568c..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/include/mapnik/text/harfbuzz_shaper.hpp 2017-10-31 17:45:30.737250086 +0100 -+++ b/include/mapnik/text/harfbuzz_shaper.hpp 2017-10-31 17:46:56.002247847 +0100 -@@ -39,10 +39,11 @@ - // harfbuzz - #include <harfbuzz/hb.h> - #include <harfbuzz/hb-ft.h> -- -+#include <unicode/uvernum.h> - // icu - #include <unicode/uscript.h> - -+ - namespace mapnik - { - -@@ -55,7 +56,8 @@ - static inline const uint16_t * uchar_to_utf16(const UChar* src) - { - static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t"); --#if defined(_MSC_VER) -+#if defined(_MSC_VER) || (U_ICU_VERSION_MAJOR_NUM >= 59) -+ // ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1 - return reinterpret_cast<const uint16_t *>(src); - #else - return src; diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch b/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch deleted file mode 100644 index 0233eb4e3fdd..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/mapnik/unicode.hpp 2017-10-31 17:53:23.507237672 +0100 -+++ b/include/mapnik/unicode.hpp 2017-10-31 17:53:47.096237053 +0100 -@@ -31,6 +31,8 @@ - // std - #include <cstdint> - #include <string> -+// icu -+#include <unicode/unistr.h> - - struct UConverter; - diff --git a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild deleted file mode 100644 index 91778820d459..000000000000 --- a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils scons-utils toolchain-funcs - -DESCRIPTION="A Free Toolkit for developing mapping applications" -HOMEPAGE="http://www.mapnik.org/" -SRC_URI="https://github.com/mapnik/mapnik/releases/download/v${PV}/mapnik-v${PV}.tar.bz2 -> ${P}.tar.bz2" -S="${WORKDIR}/mapnik-v${PV}" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cairo debug doc gdal osmfonts postgres sqlite" - -RDEPEND=" - >=dev-libs/boost-1.48:=[threads] - dev-libs/icu:= - sys-libs/zlib - media-libs/freetype - media-libs/harfbuzz - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/tiff:0= - virtual/jpeg:0= - media-libs/libwebp:= - sci-libs/proj - media-fonts/dejavu - x11-libs/agg[truetype] - cairo? ( - x11-libs/cairo - dev-cpp/cairomm - ) - osmfonts? ( - media-fonts/dejavu - media-fonts/noto - media-fonts/noto-cjk - media-fonts/unifont - ) - postgres? ( >=dev-db/postgresql-8.3:* ) - gdal? ( sci-libs/gdal ) - sqlite? ( dev-db/sqlite:3 )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-configure-only-once.patch" - "${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch" - "${FILESDIR}/${PN}-3.0.18-scons.patch" - "${FILESDIR}/${PN}-3.0.18-icu-61.patch" -) - -src_prepare() { - default - - # do not version epidoc data - sed -i \ - -e 's:-`mapnik-config --version`::g' \ - utils/epydoc_config/build_epydoc.sh || die - - # force user flags, optimization level - sed -i -e "s:\-O%s:%s:" \ - -i -e "s:env\['OPTIMIZATION'\]:'${CXXFLAGS}':" \ - SConstruct || die -} - -src_configure() { -# local PYTHONCMD="$(which python2.7)" - local PLUGINS=shape,csv,raster,geojson - use gdal && PLUGINS+=,gdal,ogr - use postgres && PLUGINS+=,postgis - use sqlite && PLUGINS+=,sqlite - - MYSCONS=( - "CC=$(tc-getCC)" - "CXX=$(tc-getCXX)" - "INPUT_PLUGINS=${PLUGINS}" - "PREFIX=/usr" - "DESTDIR=${D}" - "XMLPARSER=libxml2" - "LINKING=shared" - "RUNTIME_LINK=shared" - "PROJ_INCLUDES=/usr/include" - "PROJ_LIBS=/usr/$(get_libdir)" - "LIBDIR_SCHEMA=$(get_libdir)" - "FREETYPE_INCLUDES=/usr/include/freetype2" - "FREETYPE_LIBS=/usr/$(get_libdir)" - "XML2_INCLUDES=/usr/include/libxml2" - "XML2_LIBS=/usr/$(get_libdir)" - "SYSTEM_FONTS=/usr/share/fonts" - CAIRO="$(usex cairo 1 0)" - DEBUG="$(usex debug 1 0)" - XML_DEBUG="$(usex debug 1 0)" - DEMO="$(usex doc 1 0)" - SAMPLE_INPUT_PLUGINS="$(usex doc 1 0)" - "CUSTOM_LDFLAGS=${LDFLAGS}" - "CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)" - ) - escons "${MYSCONS[@]}" configure -} - -src_compile() { - escons "${MYSCONS[@]}" -} - -src_install() { - escons "${MYSCONS[@]}" DESTDIR="${D}" install - - dodoc AUTHORS.md README.md CHANGELOG.md -} - -pkg_postinst() { - elog "" - elog "See the home page or wiki (https://github.com/mapnik/mapnik/wiki) for more info" - elog "or the installed examples for the default mapnik ogcserver config." - elog "" -} diff --git a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild b/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild deleted file mode 100644 index 2e1d27bf19dd..000000000000 --- a/sci-geosciences/mapnik/mapnik-3.0.9-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils scons-utils toolchain-funcs - -DESCRIPTION="A Free Toolkit for developing mapping applications" -HOMEPAGE="http://www.mapnik.org/" -SRC_URI="https://github.com/mapnik/mapnik/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cairo debug doc gdal postgres sqlite" - -RDEPEND=" - >=dev-libs/boost-1.48:=[threads] - dev-libs/icu:= - sys-libs/zlib - media-libs/freetype - media-libs/harfbuzz - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/tiff:0= - virtual/jpeg:0= - media-libs/libwebp:= - sci-libs/proj - media-fonts/dejavu - x11-libs/agg[truetype] - cairo? ( - x11-libs/cairo - dev-cpp/cairomm - ) - postgres? ( >=dev-db/postgresql-8.3:* ) - gdal? ( sci-libs/gdal ) - sqlite? ( dev-db/sqlite:3 )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-configure-only-once.patch" - "${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch" - "${FILESDIR}/${P}-harbuzz_sharper-upstream.patch" # upstream patches ported from - "${FILESDIR}/${P}-unicode-upstream.patch" # https://github.com/mapnik/mapnik/commit/9e58c890430db6f0b6f1f7a1690877c9d913d92a -) - -src_prepare() { - default - - # do not version epidoc data - sed -i \ - -e 's:-`mapnik-config --version`::g' \ - utils/epydoc_config/build_epydoc.sh || die - - # force user flags, optimization level - sed -i -e "s:\-O%s:%s:" \ - -i -e "s:env\['OPTIMIZATION'\]:'${CXXFLAGS}':" \ - SConstruct || die -} - -src_configure() { - local PLUGINS=shape,csv,raster,geojson - use gdal && PLUGINS+=,gdal,ogr - use postgres && PLUGINS+=,postgis - use sqlite && PLUGINS+=,sqlite - - MYSCONS=( - "CC=$(tc-getCC)" - "CXX=$(tc-getCXX)" - "INPUT_PLUGINS=${PLUGINS}" - "PREFIX=/usr" - "DESTDIR=${D}" - "XMLPARSER=libxml2" - "LINKING=shared" - "RUNTIME_LINK=shared" - "PROJ_INCLUDES=/usr/include" - "PROJ_LIBS=/usr/$(get_libdir)" - "LIBDIR_SCHEMA=$(get_libdir)" - "SYSTEM_FONTS=/usr/share/fonts" - CAIRO="$(usex cairo 1 0)" - DEBUG="$(usex debug 1 0)" - XML_DEBUG="$(usex debug 1 0)" - DEMO="$(usex doc 1 0)" - SAMPLE_INPUT_PLUGINS="$(usex doc 1 0)" - "CUSTOM_LDFLAGS=${LDFLAGS}" - "CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)" - ) - escons "${MYSCONS[@]}" configure -} - -src_compile() { - escons "${MYSCONS[@]}" -} - -src_install() { - escons "${MYSCONS[@]}" DESTDIR="${D}" install - - dodoc AUTHORS.md README.md CHANGELOG.md -} - -pkg_postinst() { - elog "" - elog "See the home page or wiki (https://github.com/mapnik/mapnik/wiki) for more info" - elog "or the installed examples for the default mapnik ogcserver config." - elog "" -} diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml deleted file mode 100644 index 7f8d2fd981b3..000000000000 --- a/sci-geosciences/mapnik/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-geosciences@gentoo.org</email> - <name>Gentoo Geosciences Project</name> - </maintainer> - <longdescription>Mapnik is a toolkit for developing both web and desktop - mapping applications. The core libraries are written in C++, with - optional Python bindings. - </longdescription> - <use> - <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag> - <flag name="osmfonts">Enable openstreetmaps font styles</flag> - </use> - <upstream> - <remote-id type="github">downloads/mapnik</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest index 55e7e461d6e1..8f0bfa381bf8 100644 --- a/sci-geosciences/mapserver/Manifest +++ b/sci-geosciences/mapserver/Manifest @@ -1,3 +1 @@ -DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753 -DIST mapserver-7.0.7.tar.gz 2634698 BLAKE2B fadde68803d7f74b116aa23c05c25f9c52c67e0a8ea69eace2c865843d7f223c24d8c42cbed54578f2eb631cb58bae3652075872f76e9b88238d76e044d4314b SHA512 94225dbe64edf6623bb5e92649d505809f70f86c24ca06675f6277ac4a161c40c369fd1973db649e6c864fa5e2e4a8a93cbd36d1524297a0e47b96ab59c0941c -DIST mapserver-7.2.2.tar.gz 2677800 BLAKE2B 3f26517f634098fd7f005aa5a1f71fc8ba9b831b9bd0385a64272db6705ad3bd7563848bea1532c08f28177c51b104b1185fe6aa319de8c4ed95ec649a1bf7f4 SHA512 8c66a52ec04741495e0cf2bf5ec28f8e3cafac9834ab314ef998d6cf8d50b893dcc66a05d4b30f29694c357cd175a1cb28712c94bf15da4c8bcb9bfd98f0d2af +DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1 diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch deleted file mode 100644 index a22fcf4de6aa..000000000000 --- a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake -index 18055f7..2568b5e 100644 ---- a/cmake/FindOracle.cmake -+++ b/cmake/FindOracle.cmake -@@ -37,7 +37,7 @@ if(DEFINED ENV{ORACLE_HOME}) - ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows - - set(ORACLE_OCI_NAMES clntsh libclntsh oci) -- set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 ociw32) -+ set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32) - set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12) - - set(ORACLE_LIB_DIR diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch deleted file mode 100644 index f438bec9f125..000000000000 --- a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/mapwfs11.c b/mapwfs11.c -index 20ab164..4dc15fc 100755 ---- a/mapwfs11.c -+++ b/mapwfs11.c -@@ -29,12 +29,12 @@ - - #include "mapserver.h" - #include "mapows.h" -+#include "mapowscommon.h" - - - - #if defined(USE_WFS_SVR) && defined(USE_LIBXML2) - #include "maplibxml2.h" --#include "mapowscommon.h" - #include "mapogcfilter.h" - - /************************************************************************/ -diff --git a/mapwfs20.c b/mapwfs20.c -index 710d444..cf69ee3 100755 ---- a/mapwfs20.c -+++ b/mapwfs20.c -@@ -29,10 +29,10 @@ - - #include "mapserver.h" - #include "mapows.h" -+#include "mapowscommon.h" - - #if defined(USE_WFS_SVR) && defined(USE_LIBXML2) - #include "maplibxml2.h" --#include "mapowscommon.h" - #include "mapogcfilter.h" - - #define MS_OWS_11_NAMESPACE_PREFIX MS_OWSCOMMON_OWS_NAMESPACE_PREFIX diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch deleted file mode 100644 index 17016c66e67c..000000000000 --- a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/apache/mod_mapserver.c b/apache/mod_mapserver.c -index 7949ddf..c8dbde6 100644 ---- a/apache/mod_mapserver.c -+++ b/apache/mod_mapserver.c -@@ -40,7 +40,7 @@ static int - msIO_apacheError (void *cbData, void *data, int byteCount) - { - /* error reporting is done through the log file... */ -- ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, (char*) data); -+ ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "%s", (char*) data); - return strlen ((char*) data); - } - diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch deleted file mode 100644 index ee8da6ca1fe0..000000000000 --- a/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 7e4be3d354053bca65838c2c481a61d4d5c24a3b -Author: Ettore Di Giacinto <mudler@gentoo.org> -Date: Tue May 23 20:12:20 2017 +0200 - - Fix mapserver to build when TRUE macro is not defined - -diff --git a/mapserver.h b/mapserver.h -index 32182fa0..19b1075c 100644 ---- a/mapserver.h -+++ b/mapserver.h -@@ -78,6 +78,10 @@ - #include <stdint.h> - #endif - -+#ifndef TRUE -+#define TRUE 1 -+#endif -+ - #ifdef _WIN32 - #ifndef SIZE_MAX - #ifdef _WIN64 diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch deleted file mode 100644 index daf5ab1ebc7c..000000000000 --- a/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/mapserver.h b/mapserver.h -index df7eeb9..9516a6c 100644 ---- a/mapserver.h -+++ b/mapserver.h -@@ -55,6 +55,14 @@ - #include <unistd.h> - #endif - -+#ifndef TRUE -+#define TRUE 1 -+#endif -+ -+#ifndef FALSE -+#define FALSE 0 -+#endif -+ - #if defined(_WIN32) && !defined(__CYGWIN__) - # define MS_DLL_EXPORT __declspec(dllexport) - #define USE_MSFREE diff --git a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild deleted file mode 100644 index 262043174b9f..000000000000 --- a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-${PV/_/-}" - -PHP_EXT_OPTIONAL_USE="php" -PHP_EXT_NAME="php_mapscript" -PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/" -PHP_EXT_SKIP_PHPIZE="no" -USE_PHP="php5-6" - -PYTHON_COMPAT=( python2_7 ) - -#USE_RUBY="ruby18 ruby19" -#RUBY_OPTIONAL="yes" - -WEBAPP_MANUAL_SLOT=yes - -inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r3 multilib cmake-utils # ruby-ng - -DESCRIPTION="Development environment for building spatially enabled webapps" -HOMEPAGE="https://mapserver.org/" -SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl - -REQUIRED_USE=" - php? ( php_targets_php5-6 ) - xslt? ( xml )" - -RDEPEND=" - dev-libs/expat - dev-libs/fcgi - >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] - media-libs/giflib - net-misc/curl - virtual/jpeg:= - virtual/libiconv - x11-libs/agg - bidi? ( dev-libs/fribidi - media-libs/harfbuzz ) - cairo? ( x11-libs/cairo ) - gdal? ( >=sci-libs/gdal-1.8.0 ) - geos? ( sci-libs/geos ) - mysql? ( virtual/mysql ) - opengl? ( - media-libs/ftgl - media-libs/mesa - ) - perl? ( dev-lang/perl:= ) - postgis? ( dev-db/postgis ) - proj? ( sci-libs/proj net-misc/curl ) - tiff? ( - media-libs/tiff:= - sci-libs/libgeotiff - ) - xml? ( dev-libs/libxml2:2 ) - xslt? ( dev-libs/libxslt[crypt] ) -" -DEPEND="${RDEPEND} - perl? ( >=dev-lang/swig-2.0 ) - python? ( >=dev-lang/swig-2.0 )" - -need_apache2 - -PATCHES=( - "${FILESDIR}/${PN}-7.0.0-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248 - "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch" - "${FILESDIR}/${P}-missing-macro.patch" -) - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - webapp_pkg_setup - use perl && perl_set_version - #use ruby && ruby-ng_pkg_setup -} - -src_unpack() { - default - # HACK: Make symlinks for php targets - local slot - for slot in $(php_get_slots); do - ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die - done -} - -src_prepare() { - local glibdir="${EPREFIX}/usr/include/glib-2.0" - local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - - sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DCMAKE_SKIP_RPATH=ON" - "-DWITH_ORACLESPATIAL=OFF" - "-DWITH_SDE=OFF" - "-DWITH_APACHE_MODULE=ON" - "-DWITH_ICONV=ON" - "-DWITH_GD=ON" - "-DWITH_GIF=ON" - "-DWITH_CURL=ON" - "-DWITH_FCGI=ON" - "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)" - "-DWITH_PROJ=$(usex proj ON OFF)" - "-DWITH_WMS=$(usex proj ON OFF)" - "-DWITH_KML=$(usex xml ON OFF)" - "-DWITH_GEOS=$(usex geos ON OFF)" - "-DWITH_GDAL=$(usex gdal ON OFF)" - "-DWITH_OGR=$(usex gdal ON OFF)" - "-DWITH_POSTGIS=$(usex postgis ON OFF)" - "-DWITH_MYSQL=$(usex mysql ON OFF)" - "-DWITH_LIBXML2=$(usex xml ON OFF)" - "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)" - "-DWITH_FRIBIDI=$(usex bidi ON OFF)" - "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" - "-DWITH_CAIRO=$(usex cairo ON OFF)" - "-DWITH_PHP=$(usex php ON OFF)" - "-DWITH_PYTHON=$(usex python ON OFF)" - "-DWITH_PERL=$(usex perl ON OFF)" - ) - - if use gdal && use proj ; then - mycmakeargs+=( "-DWITH_WFS=ON" - "-DWITH_WCS=ON" - "-DWITH_CLIENT_WMS=ON" - "-DWITH_CLIENT_WFS=ON" - "-DWITH_SOS=$(usex xml ON OFF)" - ) - else - mycmakeargs+=( "-DWITH_WFS=OFF" - "-DWITH_WCS=OFF" - "-DWITH_CLIENT_WMS=OFF" - "-DWITH_CLIENT_WFS=OFF" - "-DWITH_SOS=OFF" - ) - fi - - if use php ; then - local slot - for slot in $(php_get_slots); do - local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" - [[ -x ${php_config} ]] \ - || die "php-config '${php_config}' not valid or not executable" - - local php_include_dir=$(${php_config} --include-dir) - [[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid" - - mycmakeargs+=( - -DPHP5_CONFIG_EXECUTABLE="${php_config}" - -DPHP5_INCLUDES="${php_include_dir}" - ) - done - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - if use php ; then - php-ext-source-r3_createinifiles - fi - webapp_src_preinst - exeinto "${MY_CGIBINDIR}" - doexe "${S}_build/mapserv" - webapp_src_install -} - -pkg_postinst() { - webapp_pkg_postinst -} - -pkg_prerm() { - webapp_pkg_prerm -} diff --git a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild deleted file mode 100644 index 3d9b414957ef..000000000000 --- a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-${PV/_/-}" - -PHP_EXT_OPTIONAL_USE="php" -PHP_EXT_NAME="php_mapscript" -PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/" -PHP_EXT_SKIP_PHPIZE="no" -USE_PHP="php5-6" - -PYTHON_COMPAT=( python2_7 ) - -#USE_RUBY="ruby18 ruby19" -#RUBY_OPTIONAL="yes" - -WEBAPP_MANUAL_SLOT=yes -WEBAPP_OPTIONAL=yes - -inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng - -DESCRIPTION="Development environment for building spatially enabled webapps" -HOMEPAGE="https://mapserver.org/" -SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="apache bidi cairo gdal geos mysql opengl oracle perl php postgis proj python threads tiff xml xslt" # ruby php tcl - -REQUIRED_USE=" - php? ( php_targets_php5-6 ) - xslt? ( xml )" - -RDEPEND=" - dev-libs/expat - >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] - media-libs/giflib - net-misc/curl - virtual/jpeg:= - virtual/libiconv - x11-libs/agg - apache? ( - dev-libs/fcgi - app-admin/webapp-config - ) - bidi? ( dev-libs/fribidi - media-libs/harfbuzz ) - cairo? ( x11-libs/cairo ) - gdal? ( sci-libs/gdal:=[oracle?] ) - geos? ( sci-libs/geos ) - mysql? ( virtual/mysql ) - opengl? ( - media-libs/ftgl - media-libs/mesa - ) - oracle? ( - dev-db/oracle-instantclient:= - ) - perl? ( dev-lang/perl:= ) - postgis? ( dev-db/postgis ) - proj? ( sci-libs/proj net-misc/curl ) - tiff? ( - media-libs/tiff:= - sci-libs/libgeotiff - ) - xml? ( dev-libs/libxml2:2 ) - xslt? ( dev-libs/libxslt[crypt] ) -" -DEPEND="${RDEPEND} - perl? ( >=dev-lang/swig-2.0 ) - python? ( >=dev-lang/swig-2.0 )" - -want_apache2 apache - -PATCHES=( - "${FILESDIR}/${PN}-7.0.0-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248 - "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch" - "${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch" - "${FILESDIR}/${P}-missing-macro.patch" -) - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if use apache ; then - webapp_pkg_setup - fi - use perl && perl_set_version - #use ruby && ruby-ng_pkg_setup -} - -src_unpack() { - default - # HACK: Make symlinks for php targets - local slot - for slot in $(php_get_slots); do - ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die - done -} - -src_prepare() { - local glibdir="${EPREFIX}/usr/include/glib-2.0" - local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - - sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - - # For enable compilation with proj-6 - if use proj ; then - append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 - fi - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DCMAKE_SKIP_RPATH=ON" - "-DWITH_SDE=OFF" - "-DWITH_ICONV=ON" - "-DWITH_GD=ON" - "-DWITH_GIF=ON" - "-DWITH_CURL=ON" - "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)" - "-DWITH_APACHE_MODULE=$(usex apache ON OFF)" - "-DWITH_PROJ=$(usex proj ON OFF)" - "-DWITH_WMS=$(usex proj ON OFF)" - "-DWITH_KML=$(usex xml ON OFF)" - "-DWITH_FCGI=$(usex apache ON OFF)" - "-DWITH_GEOS=$(usex geos ON OFF)" - "-DWITH_GDAL=$(usex gdal ON OFF)" - "-DWITH_OGR=$(usex gdal ON OFF)" - "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)" - "-DWITH_POSTGIS=$(usex postgis ON OFF)" - "-DWITH_MYSQL=$(usex mysql ON OFF)" - "-DWITH_LIBXML2=$(usex xml ON OFF)" - "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)" - "-DWITH_FRIBIDI=$(usex bidi ON OFF)" - "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" - "-DWITH_CAIRO=$(usex cairo ON OFF)" - "-DWITH_PHP=$(usex php ON OFF)" - "-DWITH_PYTHON=$(usex python ON OFF)" - "-DWITH_PERL=$(usex perl ON OFF)" - ) - - if use gdal && use proj ; then - mycmakeargs+=( "-DWITH_WFS=ON" - "-DWITH_WCS=ON" - "-DWITH_CLIENT_WMS=ON" - "-DWITH_CLIENT_WFS=ON" - "-DWITH_SOS=$(usex xml ON OFF)" - ) - else - mycmakeargs+=( "-DWITH_WFS=OFF" - "-DWITH_WCS=OFF" - "-DWITH_CLIENT_WMS=OFF" - "-DWITH_CLIENT_WFS=OFF" - "-DWITH_SOS=OFF" - ) - fi - - if use php ; then - local slot - for slot in $(php_get_slots); do - local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" - [[ -x ${php_config} ]] \ - || die "php-config '${php_config}' not valid or not executable" - - local php_include_dir=$(${php_config} --include-dir) - [[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid" - - mycmakeargs+=( - -DPHP5_CONFIG_EXECUTABLE="${php_config}" - -DPHP5_INCLUDES="${php_include_dir}" - ) - done - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - if use apache ; then - webapp_src_preinst - fi - - cmake-utils_src_install - - if use php ; then - php-ext-source-r3_createinifiles - fi - - if use apache ; then - webapp_src_install - fi -} - -pkg_postinst() { - if use apache ; then - webapp_pkg_postinst - fi -} - -pkg_prerm() { - if use apache ; then - webapp_pkg_prerm - fi -} diff --git a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild deleted file mode 100644 index 643020ee7545..000000000000 --- a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-${PV/_/-}" - -PHP_EXT_OPTIONAL_USE="php" -PHP_EXT_NAME="php_mapscript" -PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/" -PHP_EXT_SKIP_PHPIZE="no" -USE_PHP="php5-6" - -PYTHON_COMPAT=( python2_7 ) - -#USE_RUBY="ruby18 ruby19" -#RUBY_OPTIONAL="yes" - -WEBAPP_MANUAL_SLOT=yes -WEBAPP_OPTIONAL=yes - -inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng - -DESCRIPTION="Development environment for building spatially enabled webapps" -HOMEPAGE="https://mapserver.org/" -SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -SLOT="0" -# force default gdal and proj if not cause compilation problem -IUSE="apache bidi cairo +gdal geos mysql opengl oracle perl php postgis +proj python threads tiff xml xslt" # ruby php tcl - -REQUIRED_USE=" - php? ( php_targets_php5-6 ) - xslt? ( xml )" - -RDEPEND=" - dev-libs/expat - >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] - media-libs/giflib - net-misc/curl - virtual/jpeg:= - virtual/libiconv - x11-libs/agg - apache? ( - dev-libs/fcgi - app-admin/webapp-config - ) - bidi? ( dev-libs/fribidi - media-libs/harfbuzz ) - cairo? ( x11-libs/cairo ) - gdal? ( - sci-libs/gdal:=[oracle?] - dev-libs/protobuf-c - ) - geos? ( sci-libs/geos ) - mysql? ( virtual/mysql ) - opengl? ( - media-libs/ftgl - media-libs/mesa - ) - oracle? ( - dev-db/oracle-instantclient:= - ) - perl? ( dev-lang/perl:= ) - postgis? ( dev-db/postgis ) - proj? ( sci-libs/proj net-misc/curl ) - tiff? ( - media-libs/tiff:= - sci-libs/libgeotiff - ) - xml? ( dev-libs/libxml2:2 ) - xslt? ( dev-libs/libxslt[crypt] ) -" -DEPEND="${RDEPEND} - perl? ( >=dev-lang/swig-2.0 ) - python? ( >=dev-lang/swig-2.0 )" - -want_apache2 apache - -PATCHES=( - "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch" - "${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch" -) - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if use apache ; then - webapp_pkg_setup - fi - use perl && perl_set_version - #use ruby && ruby-ng_pkg_setup -} - -src_unpack() { - default - # HACK: Make symlinks for php targets - local slot - for slot in $(php_get_slots); do - ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die - done -} - -src_prepare() { - local glibdir="${EPREFIX}/usr/include/glib-2.0" - local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - - sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - - # For enable compilation with proj-6 - if use proj ; then - append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 - fi - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DCMAKE_SKIP_RPATH=ON" - "-DWITH_SDE=OFF" - "-DWITH_ICONV=ON" - "-DWITH_GD=ON" - "-DWITH_GIF=ON" - "-DWITH_CURL=ON" - "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)" - "-DWITH_APACHE_MODULE=$(usex apache ON OFF)" - "-DWITH_PROJ=$(usex proj ON OFF)" - "-DWITH_WMS=$(usex proj ON OFF)" - "-DWITH_KML=$(usex xml ON OFF)" - "-DWITH_FCGI=$(usex apache ON OFF)" - "-DWITH_GEOS=$(usex geos ON OFF)" - "-DWITH_GDAL=$(usex gdal ON OFF)" - "-DWITH_OGR=$(usex gdal ON OFF)" - "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)" - "-DWITH_POSTGIS=$(usex postgis ON OFF)" - "-DWITH_MYSQL=$(usex mysql ON OFF)" - "-DWITH_LIBXML2=$(usex xml ON OFF)" - "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)" - "-DWITH_FRIBIDI=$(usex bidi ON OFF)" - "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" - "-DWITH_CAIRO=$(usex cairo ON OFF)" - "-DWITH_PHP=$(usex php ON OFF)" - "-DWITH_PYTHON=$(usex python ON OFF)" - "-DWITH_PERL=$(usex perl ON OFF)" - "-DWITH_PROTOBUFC=$(usex gdal ON OFF)" - ) - - if use gdal && use proj ; then - mycmakeargs+=( "-DWITH_WFS=ON" - "-DWITH_WCS=ON" - "-DWITH_CLIENT_WMS=ON" - "-DWITH_CLIENT_WFS=ON" - "-DWITH_SOS=$(usex xml ON OFF)" - ) - else - mycmakeargs+=( "-DWITH_WFS=OFF" - "-DWITH_WCS=OFF" - "-DWITH_CLIENT_WMS=OFF" - "-DWITH_CLIENT_WFS=OFF" - "-DWITH_SOS=OFF" - ) - fi - - if use php ; then - local slot - for slot in $(php_get_slots); do - local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" - [[ -x ${php_config} ]] \ - || die "php-config '${php_config}' not valid or not executable" - - local php_include_dir=$(${php_config} --include-dir) - [[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid" - - mycmakeargs+=( - -DPHP5_CONFIG_EXECUTABLE="${php_config}" - -DPHP5_INCLUDES="${php_include_dir}" - ) - done - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - if use apache ; then - webapp_src_preinst - fi - - cmake-utils_src_install - - if use php ; then - php-ext-source-r3_createinifiles - fi - - if use apache ; then - webapp_src_install - fi -} - -pkg_postinst() { - if use apache ; then - webapp_pkg_postinst - fi -} - -pkg_prerm() { - if use apache ; then - webapp_pkg_prerm - fi -} diff --git a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild b/sci-geosciences/mapserver/mapserver-8.0.1.ebuild new file mode 100644 index 000000000000..060fae52b9e2 --- /dev/null +++ b/sci-geosciences/mapserver/mapserver-8.0.1.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..11} ) + +WEBAPP_MANUAL_SLOT=yes +WEBAPP_OPTIONAL=yes + +inherit cmake depend.apache 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" + +# NOTE: opengl removed for now as no support for it in upstream CMake +IUSE="apache bidi cairo geos mysql oracle perl postgis python" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# Tests: +# Included tests (tests/*) are seriously outdated +# Upstream's main test suite (msautotest/*) is not in the release tarball, +# and upstream sets 'export-ignore' for that directory. +# +# The eclasses used normally try to run test suites themselves, +# or skip if nothing was found. +# However, because of the python-r1 eclass usage, this fails and would +# cause errors running non-existent tests, so we have to restrict here. +RESTRICT="test" + +RDEPEND=" + >=dev-libs/expat-2.2.8 + dev-libs/libxml2:2= + dev-libs/libxslt[crypt] + >=dev-libs/protobuf-c-1.3.2:= + >=media-libs/freetype-2.9.1-r3 + >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] + >=media-libs/giflib-5.2.1:= + media-libs/libjpeg-turbo + >=media-libs/libpng-1.6.37:= + >=net-misc/curl-7.69.1 + >=sci-libs/gdal-3.0.4:=[oracle?] + >=sci-libs/proj-6.2.1:= + virtual/libiconv + >=x11-libs/agg-2.5-r3 + apache? ( + app-admin/webapp-config + dev-libs/fcgi + ) + bidi? ( + dev-libs/fribidi + media-libs/harfbuzz:= + ) + cairo? ( x11-libs/cairo ) + geos? ( sci-libs/geos ) + mysql? ( dev-db/mysql-connector-c:= ) + oracle? ( dev-db/oracle-instantclient:= ) + perl? ( dev-lang/perl:= ) + postgis? ( + dev-db/postgis + dev-db/postgresql:= + ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + perl? ( >=dev-lang/swig-4.0 ) + python? ( + >=dev-lang/swig-4.0 + >=dev-python/setuptools-44.1.0 + ) +" + +want_apache2 apache + +pkg_setup() { + use apache && webapp_pkg_setup + use perl && perl_set_version +} + +src_prepare() { + cmake_src_prepare + + use python && python_copy_sources +} + +_generate_cmake_args() { + # Provides a simple, bare config for bindings to build upon + # Need WITH_WMS=ON or build fails + local args=( + "-DCMAKE_SKIP_RPATH=ON" + "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" + "-DWITH_CAIRO=OFF" + "-DWITH_FCGI=OFF" + "-DWITH_FRIBIDI=OFF" + "-DWITH_GEOS=OFF" + "-DWITH_GIF=OFF" + "-DWITH_HARFBUZZ=OFF" + "-DWITH_ICONV=OFF" + "-DWITH_PROTOBUFC=OFF" + "-DWITH_POSTGIS=OFF" + "-DWITH_WMS=ON" + "-DWITH_WCS=OFF" + "-DWITH_WFS=OFF" + "-DWITH_OGCAPI=OFF" + ) + + echo "${args[@]}" +} + +src_configure() { + # 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. + # Readability and maintainability is better this way. + local mycmakeargs=( + "-DCMAKE_SKIP_RPATH=ON" + "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" + "-DWITH_CLIENT_WMS=ON" + "-DWITH_CLIENT_WFS=ON" + "-DWITH_CURL=ON" + "-DWITH_GIF=ON" + "-DWITH_ICONV=ON" + "-DWITH_KML=ON" + "-DWITH_LIBXML2=ON" + "-DWITH_PHPNG=OFF" + "-DWITH_PROTOBUFC=ON" + "-DWITH_SOS=ON" + "-DWITH_WMS=ON" + "-DWITH_WFS=ON" + "-DWITH_WCS=ON" + "-DWITH_XMLMAPFILE=ON" + "-DWITH_APACHE_MODULE=$(usex apache ON OFF)" + "-DWITH_CAIRO=$(usex cairo ON OFF)" + "-DWITH_FCGI=$(usex apache ON OFF)" + "-DWITH_GEOS=$(usex geos ON OFF)" + "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)" + "-DWITH_MYSQL=$(usex mysql ON OFF)" + "-DWITH_FRIBIDI=$(usex bidi ON OFF)" + "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" + "-DWITH_POSTGIS=$(usex postgis ON OFF)" + "-DWITH_PERL=$(usex perl ON OFF)" + ) + + use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" ) + + # Configure the standard build first + cmake_src_configure + + # Minimal build for bindings + # Note that we use _generate_cmake_args to get a clean config each time, then add + # in options as appropriate. Otherwise we'd get contamination between bindings. + if use python ; then + mycmakeargs=( + $(_generate_cmake_args) + "-DWITH_PYTHON=ON" + ) + + python_foreach_impl cmake_src_configure + python_foreach_impl python_optimize + fi +} + +src_compile() { + cmake_src_compile + + if use python ; then + python_foreach_impl cmake_src_compile + fi +} + +src_install() { + # Needs to be first + use apache && webapp_src_preinst + + if use python ; then + python_foreach_impl cmake_src_install + python_foreach_impl python_optimize + fi + + # Install this last because this build is the most "fully-featured" + cmake_src_install + + if use apache ; then + # We need a mapserver symlink available in cgi-bin + dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv + webapp_src_install + fi +} + +pkg_postinst() { + use apache && webapp_pkg_postinst +} + +pkg_prerm() { + use apache && webapp_pkg_prerm +} diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml index bc9652c1add9..c804c6ffa180 100644 --- a/sci-geosciences/mapserver/metadata.xml +++ b/sci-geosciences/mapserver/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> @@ -7,10 +7,7 @@ </maintainer> <use> <flag name="apache">Enable mapserver to run under apache</flag> - <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag> <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag> <flag name="postgis">Enable <pkg>dev-db/postgis</pkg> support</flag> - <flag name="proj">Enable <pkg>sci-libs/proj</pkg> library support (geographic projections)</flag> - <flag name="xslt">Enable xslt and exslt support xml-mapfile support</flag> </use> </pkgmetadata> diff --git a/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild b/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild index f828f7523918..e0cca9298683 100644 --- a/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild +++ b/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 inherit toolchain-funcs DESCRIPTION="MapCal to BSBchart Header Utility" HOMEPAGE="http://www.dacust.com/inlandwaters/mapcal/" SRC_URI="http://www.dacust.com/inlandwaters/mapcal/${PN}/${PN}-beta09.zip" +S="${WORKDIR}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-arch/unzip" -RDEPEND="" -S="${WORKDIR}" +BDEPEND="app-arch/unzip" src_compile() { $(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} -o ${PN} ${PN}.cpp || die diff --git a/sci-geosciences/mc2bsbh/metadata.xml b/sci-geosciences/mc2bsbh/metadata.xml index 56df135ff5a0..0885e8a081b0 100644 --- a/sci-geosciences/mc2bsbh/metadata.xml +++ b/sci-geosciences/mc2bsbh/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest index 6a49ca07d56c..eb14ca0751f1 100644 --- a/sci-geosciences/merkaartor/Manifest +++ b/sci-geosciences/merkaartor/Manifest @@ -1 +1 @@ -DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915 +DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch deleted file mode 100644 index 6c844ea3cf7a..000000000000 --- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 85ee9b1855bf3256daf4decd1f25021c1a28abdc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org> -Date: Sat, 19 May 2018 13:43:24 +0200 -Subject: [PATCH] Renamed merkaartor.desktop to - org.merkaartor.merkaartor.desktop - -A possible solution for issue #150. ---- - src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} | 0 - src/src.pro | 2 +- - 2 files changed, 1 insertion(+), 1 deletion(-) - rename src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} (100%) - -diff --git a/src/merkaartor.desktop b/src/org.merkaartor.merkaartor.desktop -similarity index 100% -rename from src/merkaartor.desktop -rename to src/org.merkaartor.merkaartor.desktop -diff --git a/src/src.pro b/src/src.pro -index 81a65f34..477c459e 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -289,7 +289,7 @@ contains(SANITIZE, 2) { - - unix:!macx { - desktop.path = $${PREFIX}/share/applications -- desktop.files = merkaartor.desktop -+ desktop.files = org.merkaartor.merkaartor.desktop - desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/ - desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png - desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/ diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch deleted file mode 100644 index 5f4f605ce5bb..000000000000 --- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch +++ /dev/null @@ -1,186 +0,0 @@ -From df515ecf4e6ce1a249af299840e82126c68fcf91 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org> -Date: Mon, 26 Sep 2016 13:02:57 +0200 -Subject: [PATCH] Updated QWeb to QWebView. - ---- - src/Layers/LicenseDisplayDialog.ui | 6 +++--- - src/QMapControl/browserimagemanager.cpp | 20 +++++++++----------- - src/QMapControl/browserimagemanager.h | 17 ++++++----------- - src/src.pro | 2 +- - 4 files changed, 19 insertions(+), 26 deletions(-) - -diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui -index 103816c6..3dabd130 100755 ---- a/src/Layers/LicenseDisplayDialog.ui -+++ b/src/Layers/LicenseDisplayDialog.ui -@@ -15,7 +15,7 @@ - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> -- <widget class="QWebView" name="webView"> -+ <widget class="QWebEngineView" name="webView"> - <property name="url"> - <url> - <string>about:blank</string> -@@ -41,9 +41,9 @@ - </widget> - <customwidgets> - <customwidget> -- <class>QWebView</class> -+ <class>QWebEngineView</class> - <extends>QWidget</extends> -- <header>QtWebKit/QWebView</header> -+ <header>QWebEngineView</header> - </customwidget> - </customwidgets> - <resources/> -diff --git a/src/QMapControl/browserimagemanager.cpp b/src/QMapControl/browserimagemanager.cpp -index 468cf2b6..4021d40f 100644 ---- a/src/QMapControl/browserimagemanager.cpp -+++ b/src/QMapControl/browserimagemanager.cpp -@@ -47,9 +47,8 @@ void BrowserWebPage::javaScriptConsoleMessage ( const QString & message, int lin - //printf("%s\n", s); - } - --void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg ) -+void BrowserWebPage::javaScriptAlert ( const QString & msg ) - { -- Q_UNUSED(frame) - //QMessageBox::information(NULL, tr("Javascript alert"), msg); - - if (msg.startsWith("Coord")) { -@@ -105,8 +104,10 @@ void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg ) - - void BrowserWebPage::launchRequest ( const QUrl & url ) - { -+ qDebug() << "Warning: you are using BrowserWebPage to render background imagery. "<< -+ "This code is not tested and may not work as expected. If you experience issues, please let us know."; - sw = sh = 0; -- mainFrame()->load(url); -+ load(url); - } - - BrowserImageManager* BrowserImageManager::m_BrowserImageManagerInstance = 0; -@@ -138,8 +139,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent) - } - - page = new BrowserWebPage(); -- page->setNetworkAccessManager(m_networkManager); -- page->setViewportSize(QSize(1024, 1024)); - - connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool))); - -@@ -220,7 +219,6 @@ void BrowserImageManager::launchRequest() - - QUrl u = QUrl( R.url); - -- page->networkAccessManager()->setProxy(M_PREFS->getProxy(u)); - page->launchRequest(u); - requestActive = true; - #ifndef BROWSERIMAGEMANAGER_IS_THREADED -@@ -246,7 +244,7 @@ void BrowserImageManager::pageLoadFinished(bool ok) - qDebug() << "BrowserImageManager::pageLoadFinished: " << " Hash: " << R.hash; - QPixmap pt(page->sw, page->sh); - QPainter P(&pt); -- page->mainFrame()->render(&P, QRegion(0,0,page->sw,page->sh)); -+ page->view()->render(&P, QPoint(), QRegion(0,0,page->sw,page->sh)); - P.end(); - - // if (page->sw != BROWSER_TILE_SIZE || page->sh != BROWSER_TILE_SIZE) { -@@ -319,7 +317,7 @@ void BrowserImageManager::loadingQueueEmpty() - void BrowserImageManager::abortLoading() - { - //qDebug() << "BrowserImageManager::abortLoading"; -- page->triggerAction(QWebPage::Stop); -+ page->triggerAction(QWebEnginePage::Stop); - if (!loadingRequests.isEmpty()) { - LoadingRequest R = loadingRequests.dequeue(); - loadingRequests.clear(); -@@ -331,7 +329,7 @@ void BrowserImageManager::abortLoading() - #ifdef BROWSERIMAGEMANAGER_IS_THREADED - void BrowserImageManager::run() - { -- page = new BrowserWebPage(); -+ page = new BrowserWebEnginePage(); - page->setViewportSize(QSize(1024, 1024)); - - QTimer theTimer; -@@ -354,7 +352,7 @@ void BrowserImageManager::checkRequests() - } else { - if ((requestDuration++) > 100) { - requestDuration = 0; -- page->triggerAction(QWebPage::Stop); -+ page->triggerAction(QWebEnginePage::Stop); - qDebug() << "BrowserImageManager Timeout"; - } - } -@@ -365,7 +363,7 @@ void BrowserImageManager::checkRequests() - void BrowserImageManager::timeout() - { - qDebug() << "BrowserImageManager::timeout"; -- page->triggerAction(QWebPage::Stop); -+ page->triggerAction(QWebEnginePage::Stop); - pageLoadFinished(false); - } - #endif // BROWSERIMAGEMANAGER_IS_THREADED -diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h -index 10f8a477..ca846e31 100644 ---- a/src/QMapControl/browserimagemanager.h -+++ b/src/QMapControl/browserimagemanager.h -@@ -24,14 +24,10 @@ - #include <QPixmap> - - #include <QtNetwork/QtNetwork> --#include <QWebFrame> --#include "qwebhistory.h" --#include "qwebhistoryinterface.h" --#include "qwebkitglobal.h" --#include "qwebpage.h" --#include "qwebpluginfactory.h" --#include "qwebsettings.h" --#include "qwebview.h" -+#include <QWebEnginePage> -+#include <QWebEngineHistory> -+#include <QWebEngineSettings> -+#include <QWebEngineView> - - #include <QThread> - -@@ -41,13 +37,13 @@ - @author Chris Browet <cbro@semperpax.com> - */ - --class BrowserWebPage : public QWebPage -+class BrowserWebPage : public QWebEnginePage - { - friend class BrowserImageManager; - - protected: - virtual void javaScriptConsoleMessage ( const QString & message, int lineNumber, const QString & sourceID ); -- virtual void javaScriptAlert ( QWebFrame * frame, const QString & msg ) ; -+ virtual void javaScriptAlert ( const QString & msg ) ; - void launchRequest ( const QUrl & url ); - - private: -@@ -116,7 +112,6 @@ class BrowserImageManager : public QObject, public IImageManager - static BrowserImageManager* m_BrowserImageManagerInstance; - - BrowserWebPage* page; -- QWebFrame *frame; - QNetworkAccessManager* qnam; - - signals: -diff --git a/src/src.pro b/src/src.pro -index eb93b263..137d7e14 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -34,7 +34,7 @@ TEMPLATE = app - - CONFIG += rtti stl exceptions - #CONFIG -= exceptions --QT += svg network xml core gui webkitwidgets concurrent printsupport -+QT += svg network xml core gui webenginewidgets concurrent printsupport - win32-msvc* { - LIBS += -lzlib - } else { diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch deleted file mode 100644 index 48c4af7b9c50..000000000000 --- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 20edcc7e85413e60ff180bd9f20e5428e5729222 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org> -Date: Mon, 26 Sep 2016 13:11:33 +0200 -Subject: [PATCH] Replaced missing QT += webkit, updated linux package list. - ---- - ci/travis-linux-install.sh | 3 +-- - src/QMapControl.pri | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/ci/travis-linux-install.sh b/ci/travis-linux-install.sh -index 79975d27..4e83c9bb 100755 ---- a/ci/travis-linux-install.sh -+++ b/ci/travis-linux-install.sh -@@ -8,6 +8,5 @@ sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - sudo apt-cache search qt - sudo apt-get -qq install gdb libgdal-dev libproj-dev --sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake --sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser -+sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webengine5{,-dev} libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser - qtchooser -list-versions -diff --git a/src/QMapControl.pri b/src/QMapControl.pri -index bbfc09b5..92769565 100644 ---- a/src/QMapControl.pri -+++ b/src/QMapControl.pri -@@ -26,7 +26,7 @@ QT += network - DEFINES += USE_WEBKIT - SOURCES += browserimagemanager.cpp - HEADERS += browserimagemanager.h -- QT += webkit -+ QT += webenginewidgets - contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED - } - } diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch deleted file mode 100644 index 97d76a187641..000000000000 --- a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 3019f1d2c76a0ae0c51e70d34bc25a49cb030845 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org> -Date: Wed, 28 Sep 2016 21:41:02 +0200 -Subject: [PATCH] Removed webengine from LicenseDisplayDialog and renamed - conditional. - -This removes the QWebEngine dependency for most build configurations. -None of the code actually uses it, but there are some plugins that do. -I expect they are all obsolete, but will keep it in until they are -replaced/deemed not working. ---- - COMPILE.md | 2 +- - src/Layers/ImageMapLayer.cpp | 2 +- - src/Layers/LicenseDisplayDialog.ui | 29 +++++++++++++++-------------- - src/QMapControl.pri | 14 ++++++-------- - src/src.pro | 2 +- - 5 files changed, 24 insertions(+), 25 deletions(-) - -diff --git a/COMPILE.md b/COMPILE.md -index 9324019d..108a2eee 100644 ---- a/COMPILE.md -+++ b/COMPILE.md -@@ -151,7 +151,7 @@ There are some parameters you can pass to qmake to customize build: - | TRANSDIR_MERKAARTOR=<path> | where will the Merkaartor translations be installed | - | TRANSDIR_SYSTEM=<path> | where your global Qt translation directory is | - | NODEBUG=1 | release target | --| NOUSEWEBKIT | disable use of WebKit (Yahoo adapter) | -+| USEWEBENGINE=1 | enable use of WebEngine (required for some external plugins) | - | SYSTEM_QTSA | use system copy of qtsingleapplication instead of internal | - - -diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp -index 31966b09..b46199b9 100644 ---- a/src/Layers/ImageMapLayer.cpp -+++ b/src/Layers/ImageMapLayer.cpp -@@ -263,7 +263,7 @@ void ImageMapLayer::setMapAdapter(const QUuid& theAdapterUid, const QString& ser - QDialog dlg; - ui.setupUi(&dlg); - dlg.setWindowTitle(tr("Licensing Terms: %1").arg(name())); -- ui.webView->load(u); -+ ui.urlLabel->setText(QString("<a href='%1'>%2</a>").arg(u.toString()).arg(u.toString())); - - bool OK = false; - while (!OK) { -diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui -index 3dabd130..dd748e41 100755 ---- a/src/Layers/LicenseDisplayDialog.ui -+++ b/src/Layers/LicenseDisplayDialog.ui -@@ -6,8 +6,8 @@ - <rect> - <x>0</x> - <y>0</y> -- <width>650</width> -- <height>400</height> -+ <width>786</width> -+ <height>171</height> - </rect> - </property> - <property name="windowTitle"> -@@ -15,11 +15,19 @@ - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> -- <widget class="QWebEngineView" name="webView"> -- <property name="url"> -- <url> -- <string>about:blank</string> -- </url> -+ <widget class="QLabel" name="label"> -+ <property name="text"> -+ <string><html><head/><body><p>The content selected is shared under a non-standard license agreement. The full text is available on the following URL. It is your reponsibility to read, understand and agree to the license.</p></body></html></string> -+ </property> -+ <property name="wordWrap"> -+ <bool>true</bool> -+ </property> -+ </widget> -+ </item> -+ <item> -+ <widget class="QLabel" name="urlLabel"> -+ <property name="text"> -+ <string>TextLabel</string> - </property> - </widget> - </item> -@@ -39,13 +47,6 @@ - </item> - </layout> - </widget> -- <customwidgets> -- <customwidget> -- <class>QWebEngineView</class> -- <extends>QWidget</extends> -- <header>QWebEngineView</header> -- </customwidget> -- </customwidgets> - <resources/> - <connections> - <connection> -diff --git a/src/QMapControl.pri b/src/QMapControl.pri -index 92769565..3491c8b1 100644 ---- a/src/QMapControl.pri -+++ b/src/QMapControl.pri -@@ -21,13 +21,11 @@ SOURCES += \ - - QT += network - --!contains(NOUSEWEBKIT,1) { -- greaterThan(QT_VER_MAJ, 3) : greaterThan(QT_VER_MIN, 3) { -- DEFINES += USE_WEBKIT -- SOURCES += browserimagemanager.cpp -- HEADERS += browserimagemanager.h -- QT += webenginewidgets -- contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED -- } -+contains(USEWEBENGINE,1) { -+ DEFINES += USE_WEBKIT -+ SOURCES += browserimagemanager.cpp -+ HEADERS += browserimagemanager.h -+ QT += webenginewidgets -+ contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED - } - -diff --git a/src/src.pro b/src/src.pro -index 137d7e14..81a65f34 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -34,7 +34,7 @@ TEMPLATE = app - - CONFIG += rtti stl exceptions - #CONFIG -= exceptions --QT += svg network xml core gui webenginewidgets concurrent printsupport -+QT += svg network xml core gui concurrent printsupport - win32-msvc* { - LIBS += -lzlib - } else { diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch b/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch new file mode 100644 index 000000000000..4f98b9a4fa36 --- /dev/null +++ b/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch @@ -0,0 +1,50 @@ +From 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org> +Date: Sat, 16 Jul 2022 12:41:33 +0200 +Subject: [PATCH] Replaced use of AutoPtr with std::unique_ptr in + GeoImageDock.cpp. + +--- + src/Docks/GeoImageDock.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp +index 02b5cdc0..e2fa1601 100644 +--- a/src/Docks/GeoImageDock.cpp ++++ b/src/Docks/GeoImageDock.cpp +@@ -457,7 +457,7 @@ void GeoImageDock::loadImages(QStringList fileNames) + Document *theDocument = Main->document(); + MapView *theView = Main->view(); + +- Exiv2::Image::AutoPtr image; ++ std::unique_ptr<Exiv2::Image> image; + Exiv2::ExifData exifData; + bool positionValid = false; + +@@ -869,7 +869,7 @@ void GeoImageDock::saveImage() + // fn = QFileDialog::getSaveFileName(0, "Specify output filename", fn, tr("JPEG Images (*.jpg)")); + qDebug() << fn; + if (!fn.isEmpty()) { +- Exiv2::Image::AutoPtr imageIn, imageOut; ++ std::unique_ptr<Exiv2::Image> imageIn, imageOut; + Exiv2::ExifData exifData; + try { + imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString()); +@@ -893,7 +893,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file) + { + Coord pos; + double lat = 0.0, lon = 0.0; +- Exiv2::Image::AutoPtr image; ++ std::unique_ptr<Exiv2::Image> image; + Exiv2::ExifData exifData; + bool positionValid = false; + +@@ -933,7 +933,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file) + + void GeoImageDock::addGeoDataToImage(Coord position, const QString & file) + { +- Exiv2::Image::AutoPtr image; ++ std::unique_ptr<Exiv2::Image> image; + + try { + image = Exiv2::ImageFactory::open(file.toStdString()); diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild deleted file mode 100644 index d3bb9dded76e..000000000000 --- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW" - -inherit gnome2-utils l10n qmake-utils xdg-utils - -DESCRIPTION="Qt based map editor for the openstreetmap.org project" -HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor" -SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug exif gps libproxy webengine" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsingleapplication[X,qt5(+)] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sci-libs/gdal - sci-libs/proj - sys-libs/zlib - exif? ( media-gfx/exiv2:= ) - gps? ( >=sci-geosciences/gpsd-3.17-r2 ) - libproxy? ( net-libs/libproxy ) - webengine? ( dev-qt/qtwebengine:5[widgets] ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826 - "${FILESDIR}"/${P}-desktopfile.patch - "${FILESDIR}"/${P}-webengine{1,2,3}.patch -) - -DOCS=( AUTHORS CHANGELOG ) - -src_prepare() { - default - - rm -r 3rdparty || die "Failed to remove bundled libs" - - my_rm_loc() { - sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die - rm "translations/${PN}_${1}.ts" || die - } - - if [[ -n "$(l10n_get_locales)" ]]; then - l10n_for_each_disabled_locale_do my_rm_loc - $(qt5_get_bindir)/lrelease src/src.pro || die - fi - - # build system expects to be building from git - sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die -} - -src_configure() { - # TRANSDIR_SYSTEM is for bug #385671 - eqmake5 \ - PREFIX="${ED%/}/usr" \ - LIBDIR="${ED%/}/usr/$(get_libdir)" \ - PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \ - SHARE_DIR_PATH="/usr/share/${PN}" \ - TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \ - TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \ - SYSTEM_QTSA=1 \ - RELEASE=1 \ - NODEBUG=$(usex debug 0 1) \ - GEOIMAGE=$(usex exif 1 0) \ - GPSDLIB=$(usex gps 1 0) \ - LIBPROXY=$(usex libproxy 1 0) \ - USEWEBENGINE=$(usex webengine 1 0) \ - ZBAR=0 \ - Merkaartor.pro -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild new file mode 100644 index 000000000000..c959fecd8c1c --- /dev/null +++ b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW" +inherit flag-o-matic plocale qmake-utils xdg + +if [[ ${PV} != *9999 ]] ; then + SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +else + EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git" + inherit git-r3 +fi + +DESCRIPTION="Qt based map editor for the openstreetmap.org project" +HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor" + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug exif gps libproxy webengine" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsingleapplication[X,qt5(+)] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sci-libs/gdal:= + sci-libs/proj:= + sys-libs/zlib + exif? ( media-gfx/exiv2:= ) + gps? ( >=sci-geosciences/gpsd-3.17-r2:= ) + libproxy? ( net-libs/libproxy ) + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # downstream, bug 621826 + "${FILESDIR}"/${P}-exiv2-0.28.patch # upstream git master, bug 906501 +) + +DOCS=( AUTHORS CHANGELOG ) + +src_prepare() { + default + + rm -r 3rdparty || die "Failed to remove bundled libs" + + my_rm_loc() { + sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die + rm "translations/${PN}_${1}.ts" || die + } + + if [[ -n "$(plocale_get_locales)" ]]; then + plocale_for_each_disabled_locale my_rm_loc + $(qt5_get_bindir)/lrelease src/src.pro || die + fi + + # build system expects to be building from git + if [[ ${PV} != *9999 ]] ; then + sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die + fi +} + +src_configure() { + if has_version "<sci-libs/proj-8.0.0" ; then + # bug #685234 + append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H + fi + + # TRANSDIR_SYSTEM is for bug #385671 + local myeqmakeargs=( + PREFIX="${EPREFIX}/usr" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" + PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" + SHARE_DIR_PATH="/usr/share/${PN}" + TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" + TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" + SYSTEM_QTSA=1 + NODEBUG=$(usex debug 0 1) + GEOIMAGE=$(usex exif 1 0) + GPSDLIB=$(usex gps 1 0) + LIBPROXY=$(usex libproxy 1 0) + USEWEBENGINE=$(usex webengine 1 0) + ) + [[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 ) + + eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro +} + +src_install() { + emake install INSTALL_ROOT="${D}" +} diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild index 4491ffa4a5cd..f0f4b1dbd195 100644 --- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild @@ -1,95 +1,101 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW" +PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW" +inherit flag-o-matic plocale qmake-utils xdg -inherit git-r3 gnome2-utils l10n qmake-utils xdg-utils +if [[ ${PV} != *9999 ]] ; then + SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +else + EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git" + inherit git-r3 +fi DESCRIPTION="Qt based map editor for the openstreetmap.org project" HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor" -SRC_URI="" -EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="debug exif gps libproxy webengine" -RDEPEND=" +DEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - sci-libs/gdal - sci-libs/proj + sci-libs/gdal:= + sci-libs/proj:= sys-libs/zlib exif? ( media-gfx/exiv2:= ) - gps? ( >=sci-geosciences/gpsd-3.17-r2 ) + gps? ( >=sci-geosciences/gpsd-3.17-r2:= ) libproxy? ( net-libs/libproxy ) - webengine? ( dev-qt/qtwebengine:5 ) + webengine? ( dev-qt/qtwebengine:5[widgets] ) " -DEPEND="${RDEPEND} +RDEPEND="${DEPEND}" +BDEPEND=" dev-qt/linguist-tools:5 virtual/pkgconfig " -PATCHES=( "${FILESDIR}/${PN}-0.18.3-sharedir-pluginsdir.patch" ) # bug 621826 +PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826 DOCS=( AUTHORS CHANGELOG ) -src_unpack() { - git-r3_src_unpack -} - src_prepare() { default + rm -r 3rdparty || die "Failed to remove bundled libs" + my_rm_loc() { sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die rm "translations/${PN}_${1}.ts" || die } - if [[ -n "$(l10n_get_locales)" ]]; then - l10n_for_each_disabled_locale_do my_rm_loc + if [[ -n "$(plocale_get_locales)" ]]; then + plocale_for_each_disabled_locale my_rm_loc $(qt5_get_bindir)/lrelease src/src.pro || die fi # build system expects to be building from git if [[ ${PV} != *9999 ]] ; then - sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die + sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die fi } src_configure() { - # TRANSDIR_SYSTEM is for bug #385671 - eqmake5 \ - PREFIX="${ED%/}/usr" \ - LIBDIR="${ED%/}/usr/$(get_libdir)" \ - PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \ - SHARE_DIR_PATH="/usr/share/${PN}" \ - TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \ - TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \ - SYSTEM_QTSA=1 \ - NODEBUG=$(usex debug 0 1) \ - GEOIMAGE=$(usex exif 1 0) \ - GPSDLIB=$(usex gps 1 0) \ - LIBPROXY=$(usex libproxy 1 0) \ - USEWEBENGINE=$(usex webengine 1 0) \ - Merkaartor.pro -} + if has_version "<sci-libs/proj-8.0.0" ; then + # bug #685234 + append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H + fi -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update + # TRANSDIR_SYSTEM is for bug #385671 + local myeqmakeargs=( + PREFIX="${EPREFIX}/usr" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" + PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" + SHARE_DIR_PATH="/usr/share/${PN}" + TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" + TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" + SYSTEM_QTSA=1 + NODEBUG=$(usex debug 0 1) + GEOIMAGE=$(usex exif 1 0) + GPSDLIB=$(usex gps 1 0) + LIBPROXY=$(usex libproxy 1 0) + USEWEBENGINE=$(usex webengine 1 0) + ) + [[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 ) + + eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro } -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update +src_install() { + emake install INSTALL_ROOT="${D}" } diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml index 47721d5d2ebd..45f8b6b3867e 100644 --- a/sci-geosciences/merkaartor/metadata.xml +++ b/sci-geosciences/merkaartor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> diff --git a/sci-geosciences/metadata.xml b/sci-geosciences/metadata.xml index ca00dbc0225d..74e3e490ba62 100644 --- a/sci-geosciences/metadata.xml +++ b/sci-geosciences/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The sci-geosciences category contains geosciences-related software. @@ -33,4 +33,3 @@ Kategoria sci-geosciences zawiera programy naukowe związane z geologią. </longdescription> </catmetadata> - diff --git a/sci-geosciences/mtkbabel/Manifest b/sci-geosciences/mtkbabel/Manifest index 9fcba4850876..c1550460ffa0 100644 --- a/sci-geosciences/mtkbabel/Manifest +++ b/sci-geosciences/mtkbabel/Manifest @@ -1,2 +1 @@ -DIST mtkbabel-0.8.2.tar.gz 27896 BLAKE2B 34c2e996fb031a5236313bcd7e07fca6fe1c24d763f5e278494b08f0060875be91fc19f58aa4e011cd5f20a5a795208d856ec125cb7d9644f205e30f3a60f355 SHA512 b3b6c0c9698c165de9d60bb4d574a174b4ee805dc1cb889770dd7c0001378d94a5722e3bf2132d8f6dd888255247fe5e5635a4ef66a6000c68d58403f9756bdd DIST mtkbabel-0.8.3.1.tar.gz 28472 BLAKE2B d17363f0b4e95360910039421a26083ab088f12b56c65b0687f7ee89dc9086f8c122ef7d62091cff9df1fd2c6f34835e6712dd0501d95517963c287e8ddfe1c4 SHA512 795d058bf622b5381600fc82a67aa32258db0ce2d1c22f148b6a1b34a6afe585f31fd0a5fccd2743602b55f53fa3b6b0f8c7269ebee1555a58374e33a80d22d7 diff --git a/sci-geosciences/mtkbabel/metadata.xml b/sci-geosciences/mtkbabel/metadata.xml index 5926eee8e353..8ac0528a54d0 100644 --- a/sci-geosciences/mtkbabel/metadata.xml +++ b/sci-geosciences/mtkbabel/metadata.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> <name>Gentoo Geosciences Project</name> </maintainer> <longdescription lang="en"> -MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger. -It should work also with other GPS devices based on the MediaTek MTK chipset. -</longdescription> + MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger. + It should work also with other GPS devices based on the MediaTek MTK chipset. + </longdescription> <upstream> <remote-id type="sourceforge">mtkbabel</remote-id> </upstream> diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild deleted file mode 100644 index 2eda677db339..000000000000 --- a/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger" -HOMEPAGE="https://sourceforge.net/projects/mtkbabel/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND=" - dev-perl/Device-SerialPort - dev-perl/TimeDate -" - -S=${WORKDIR}/${PV} - -src_install() { - doman mtkbabel.1 - dobin mtkbabel - dodoc MtkExtensionsv1.xsd README changelog -} diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r2.ebuild index 99dcd1ab97d1..550c901a1d2c 100644 --- a/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild +++ b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r2.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger" HOMEPAGE="https://sourceforge.net/projects/mtkbabel/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" +S="${WORKDIR}/${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="amd64 ~x86" -DEPEND="" RDEPEND=" dev-perl/Device-SerialPort dev-perl/TimeDate diff --git a/sci-geosciences/opencpn-plugin-aisradar/Manifest b/sci-geosciences/opencpn-plugin-aisradar/Manifest new file mode 100644 index 000000000000..d17d593b5000 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-aisradar/Manifest @@ -0,0 +1 @@ +DIST opencpn-plugin-aisradar-1.2.17.0.tar.gz 1487007 BLAKE2B 0acdee13a7557e27b0d4832da18622ac2be77056b3a84e3825d77357928e190a6161e7358b9701510b910a2549336a8499fec4b5f17547223579faaa1e5984e5 SHA512 8142607f0bd0211c7e519761521205ecf426b2300f2798e60c3d97e691849603fa6fffddcd33255da03796a3d9b43858bed649854dffaa180dbc2338a2328bf1 diff --git a/sci-geosciences/opencpn-plugin-br24radar/metadata.xml b/sci-geosciences/opencpn-plugin-aisradar/metadata.xml index 6fa59ff0bcc9..ea23384e621c 100644 --- a/sci-geosciences/opencpn-plugin-br24radar/metadata.xml +++ b/sci-geosciences/opencpn-plugin-aisradar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> @@ -10,6 +10,6 @@ <name>Gentoo Geosciences Project</name> </maintainer> <upstream> - <remote-id type="github">canboat/BR24radar_pi</remote-id> + <remote-id type="github">Verezano/radar_pi</remote-id> </upstream> </pkgmetadata> diff --git a/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-1.2.17.0.ebuild b/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-1.2.17.0.ebuild new file mode 100644 index 000000000000..0a5718ad0535 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-1.2.17.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +MY_PN="AISradar_pi" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" +else + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="AIS Radar View Plugin for OpenCPN" +HOMEPAGE="https://github.com/rgleason/AISradar_pi" + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + sci-geosciences/opencpn:=" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure +} diff --git a/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-9999.ebuild b/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-9999.ebuild new file mode 100644 index 000000000000..0a5718ad0535 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-9999.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +MY_PN="AISradar_pi" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" +else + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="AIS Radar View Plugin for OpenCPN" +HOMEPAGE="https://github.com/rgleason/AISradar_pi" + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + sci-geosciences/opencpn:=" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure +} diff --git a/sci-geosciences/opencpn-plugin-br24radar/Manifest b/sci-geosciences/opencpn-plugin-br24radar/Manifest deleted file mode 100644 index ba6a4a5e43d3..000000000000 --- a/sci-geosciences/opencpn-plugin-br24radar/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST opencpn-plugin-br24radar-2.1.tar.gz 3947426 BLAKE2B a850973caa64ba4855d97e9374a5e40e292fd0df47a783a711453c49a07f3d945e33247a6199c5c1378dcc1ae29c2e4707675a12b02d3abbd8a115eaf107470c SHA512 357553396fd020e192dbbd5a05af1cd9e06c99244b426239a1d0aac4688affc1702bc16b62010236fc3af1ec7356f1dfb49e3afe3a94cb4dd7b1e0a2ef007af3 diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild deleted file mode 100644 index d11cea941791..000000000000 --- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -MY_PN="BR24radar_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/canboat/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" -else - SRC_URI=" - https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="Navico (Simrad, Lowrance) Broadband BR24/3G/4G Radar Plugin for OpenCPN" -HOMEPAGE="https://github.com/canboat/BR24radar_pi" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="" - -RDEPEND=" - x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare -} diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild deleted file mode 100644 index d11cea941791..000000000000 --- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -MY_PN="BR24radar_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/canboat/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" -else - SRC_URI=" - https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="Navico (Simrad, Lowrance) Broadband BR24/3G/4G Radar Plugin for OpenCPN" -HOMEPAGE="https://github.com/canboat/BR24radar_pi" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="" - -RDEPEND=" - x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare -} diff --git a/sci-geosciences/opencpn-plugin-climatology/Manifest b/sci-geosciences/opencpn-plugin-climatology/Manifest index 36303242171c..b60a8d6a90f4 100644 --- a/sci-geosciences/opencpn-plugin-climatology/Manifest +++ b/sci-geosciences/opencpn-plugin-climatology/Manifest @@ -1,2 +1,2 @@ DIST opencpn-plugin-climatology-1.0-CL-DATA.tar.xz 5830716 BLAKE2B 57e781f4d86ec17456e786629ec5b82c9aba872c2f8c26ec628e4ab5314b0a3c6933cc0c7a36616830038add1f95a52b8acd7c6f03cb702c611be255a3b91f1a SHA512 5c0b724e7acbfe4a7f494d107806a3491f000f26f4a92519294975dd57a0ba68919c4bed3571ec8fa652138f26f09abd3742a1e5097fa54714564c70f84fbfd3 -DIST opencpn-plugin-climatology-1.0.20180316.tar.gz 428431 BLAKE2B ec6c2493c23eab5d08a2fc1490ea1ab112eb55743d767f7b667a8752d965269cc920459bc63458942912381400af94dc94244ce744aaf83fe4a46c0c3bc3d505 SHA512 cb65916c743729b1d51b1f39aeb62f55f4260a98117234671abeaddb8f9789e1166adc838259efb9da3002ed3143440b4a236f6d14837e0fc709472ed8c9fe3f +DIST opencpn-plugin-climatology-1.4.32.0.tar.gz 7070623 BLAKE2B fe710287cae08a511baa504af89b9ae7a5b0f23b2c6071803c7b7627917fd48353caef977c27b1f6d35febc2ab20a8df364c5c939b8702d9256ae3a8d5ed0b13 SHA512 11158e73658bd7ffa0d3726fab69afb5cedab5594507a36b3836b2806ac3e120b27c4e2669819db63e6991fae89534b6cee4dd04964c3310c4afe3901fe21f1b diff --git a/sci-geosciences/opencpn-plugin-climatology/metadata.xml b/sci-geosciences/opencpn-plugin-climatology/metadata.xml index 7fc64c64cfec..404cfa34be89 100644 --- a/sci-geosciences/opencpn-plugin-climatology/metadata.xml +++ b/sci-geosciences/opencpn-plugin-climatology/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild deleted file mode 100644 index 0f1404e579cd..000000000000 --- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -MY_PN="climatology_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" -else - SRC_URI=" - https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi -SRC_URI=" - $SRC_URI - mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz -" - -DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)" -HOMEPAGE="https://github.com/seandepagnier/climatology_pi" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="" - -RDEPEND=" - x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND="${RDEPEND}" - -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare -} -src_install() { - cmake-utils_src_install - insinto "/usr/share/opencpn/plugins/${MY_PN}/data/" - doins "${S}"/{,../}data/* -} diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.4.32.0.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.4.32.0.ebuild new file mode 100644 index 000000000000..1694b896600a --- /dev/null +++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.4.32.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +MY_PN="climatology_pi" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" +else + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)" +HOMEPAGE="https://github.com/rgleason/climatology_pi" +SRC_URI=" + ${SRC_URI} + https://downloads.sourceforge.net/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + sci-geosciences/opencpn:=" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +src_unpack() { + unpack ${A} + if [[ ${PV} == *9999 ]] ; then + git-r3_checkout + fi +} + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /usr/share/opencpn/plugins/${MY_PN}/data/ + doins -r {,../}data/. +} diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild index 0f1404e579cd..1694b896600a 100644 --- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild @@ -1,47 +1,52 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets -WX_GTK_VER="3.0" MY_PN="climatology_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" else - SRC_URI=" - https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi -SRC_URI=" - $SRC_URI - mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz -" DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)" -HOMEPAGE="https://github.com/seandepagnier/climatology_pi" +HOMEPAGE="https://github.com/rgleason/climatology_pi" +SRC_URI=" + ${SRC_URI} + https://downloads.sourceforge.net/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz" LICENSE="GPL-3+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + sci-geosciences/opencpn:=" DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +src_unpack() { + unpack ${A} + if [[ ${PV} == *9999 ]] ; then + git-r3_checkout + fi } + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure +} + src_install() { - cmake-utils_src_install - insinto "/usr/share/opencpn/plugins/${MY_PN}/data/" - doins "${S}"/{,../}data/* + cmake_src_install + + insinto /usr/share/opencpn/plugins/${MY_PN}/data/ + doins -r {,../}data/. } diff --git a/sci-geosciences/opencpn-plugin-dr/Manifest b/sci-geosciences/opencpn-plugin-dr/Manifest index e6b0099358e1..b8e4c9ec3950 100644 --- a/sci-geosciences/opencpn-plugin-dr/Manifest +++ b/sci-geosciences/opencpn-plugin-dr/Manifest @@ -1 +1 @@ -DIST opencpn-plugin-dr-1.1.tar.gz 133693 BLAKE2B 3d3356d43ca263c117511be4b4b873038f1a0493ab9b9ec4d0811da4360a38a2ec4ee2a31b54ce18741fc9ae0e3daf1a0a24b1c62493087c747b9e8720ee5a07 SHA512 2a953c7a8a491975c2b14e877364cfa736d2c410ea77bb4e0b18cf3bb3b04b19c2fcbc9debd513182f95002b483e689c4e21c30d87474e319bae7d2d840254f1 +DIST opencpn-plugin-dr-4.0.0.tar.gz 2010328 BLAKE2B 7b3d9e93edb52e6c039e759a5a4f8f85145c89c68b6c9d33ecf8fa376e4150bfe34a516bb9f278ef820fb880c2c45b13a446151c46bd9220e303c1b352010601 SHA512 0cbb87b66569451510f813a7766ca7e7e5c120861046c93b0adb0e71b90528ae83b12201635ec0e3a9286c470e0a93015c4a5a99cbc13979c894fa4be36ce71f diff --git a/sci-geosciences/opencpn-plugin-dr/files/cmake.patch b/sci-geosciences/opencpn-plugin-dr/files/cmake.patch new file mode 100644 index 000000000000..ab0bb813c321 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-dr/files/cmake.patch @@ -0,0 +1,41 @@ +diff -ur DR_pi-4.0.0.orig/CMakeLists.txt DR_pi-4.0.0/CMakeLists.txt +--- DR_pi-4.0.0.orig/CMakeLists.txt 2021-11-04 00:32:44.000000000 -1000 ++++ DR_pi-4.0.0/CMakeLists.txt 2021-11-29 00:11:03.998266321 -1000 +@@ -61,9 +61,10 @@ + ) + include(Targets) + create_targets(${FLATPAK_MANIFEST}) +-if ("${BUILD_TYPE}" STREQUAL "") +- return () +-endif () ++#if ("${BUILD_TYPE}" STREQUAL "") ++# return () ++#endif () ++include(PluginLibs) + + if (NOT ${BUILD_TYPE} STREQUAL "flatpak") + # Build package as required (flatpak already dealt with). +diff -ur DR_pi-4.0.0.orig/cmake/PluginInstall.cmake DR_pi-4.0.0/cmake/PluginInstall.cmake +--- DR_pi-4.0.0.orig/cmake/PluginInstall.cmake 2021-11-04 00:32:44.000000000 -1000 ++++ DR_pi-4.0.0/cmake/PluginInstall.cmake 2021-11-29 00:10:04.241099544 -1000 +@@ -11,7 +11,7 @@ + # the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + +-include(Metadata) ++#include(Metadata) + + if (APPLE) + install( +diff -ur DR_pi-4.0.0.orig/cmake/Targets.cmake DR_pi-4.0.0/cmake/Targets.cmake +--- DR_pi-4.0.0.orig/cmake/Targets.cmake 2021-11-04 00:32:44.000000000 -1000 ++++ DR_pi-4.0.0/cmake/Targets.cmake 2021-11-29 00:10:18.954386822 -1000 +@@ -19,7 +19,7 @@ + return() + endif () + +-include(Metadata) ++#include(Metadata) + + if (UNIX AND NOT APPLE AND NOT QT_ANDROID) + set(_LINUX ON) diff --git a/sci-geosciences/opencpn-plugin-dr/metadata.xml b/sci-geosciences/opencpn-plugin-dr/metadata.xml index 40869ffafb0a..bfcdc2c85249 100644 --- a/sci-geosciences/opencpn-plugin-dr/metadata.xml +++ b/sci-geosciences/opencpn-plugin-dr/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.1.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild index 042b47fa61ef..f8093a00ebdc 100644 --- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-1.1.ebuild +++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets -WX_GTK_VER="3.0" MY_PN="DR_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/Rasbats/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,18 @@ HOMEPAGE="https://github.com/Rasbats/DR_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + sci-geosciences/opencpn:=" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +PATCHES=( + "${FILESDIR}/cmake.patch" +) + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild index 96958e431a22..f8093a00ebdc 100644 --- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets -WX_GTK_VER="3.0" MY_PN="DR_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,18 @@ HOMEPAGE="https://github.com/Rasbats/DR_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + sci-geosciences/opencpn:=" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +PATCHES=( + "${FILESDIR}/cmake.patch" +) + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-findit/Manifest b/sci-geosciences/opencpn-plugin-findit/Manifest index 651b68af69d9..8990e2117cf8 100644 --- a/sci-geosciences/opencpn-plugin-findit/Manifest +++ b/sci-geosciences/opencpn-plugin-findit/Manifest @@ -1 +1 @@ -DIST opencpn-plugin-findit-1.1007.tar.gz 254806 BLAKE2B e76c96f67010d12ba58fa9746d2e1ca0470b6ec94d1c59615436bacfb1eca2c4cb29b3e295ffd90183a86d5717f8901b48916e0f1cd70ea098c00ba19edf1526 SHA512 d22de2541cbfb17b6dc2c88b77f9b90566b5e48638e072a2f376fff7cbc7d849548bd0fba919c0b6d11ab4b12961c79af3c136a124e6543fb4c97d088478cc42 +DIST opencpn-plugin-findit-1.2.12.0.tar.gz 860413 BLAKE2B ff116fb6c543b8a94d3b16e443d7bd015fa1acd2f668103b77efaec693588813200fe08b1357f4460cca46b1dcdfd7d0fc6c5298f290ade5776773513667d3a9 SHA512 d47a5d0b575164a1708924931e7aa7c9151a0a25bc3647b86a662b20177f434bc690b534b0255d348f64124a7affff45654bb42934c2b0ceb2086eaae213f9ec diff --git a/sci-geosciences/opencpn-plugin-findit/metadata.xml b/sci-geosciences/opencpn-plugin-findit/metadata.xml index 50efe0522e25..593e75551d7c 100644 --- a/sci-geosciences/opencpn-plugin-findit/metadata.xml +++ b/sci-geosciences/opencpn-plugin-findit/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild deleted file mode 100644 index dcfdab4eb133..000000000000 --- a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -MY_PN="FindIt_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" -else - SRC_URI=" - https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="FindIt Plugin for OpenCPN" -HOMEPAGE="https://github.com/ptulp/FindIt_pi" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - -RDEPEND=" - x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare -} diff --git a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.2.12.0.ebuild b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.2.12.0.ebuild new file mode 100644 index 000000000000..4ea63062e2ca --- /dev/null +++ b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.2.12.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +MY_PN="FindIt_pi" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" +else + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="FindIt Plugin for OpenCPN" +HOMEPAGE="https://github.com/rgleason/FindIt_pi" + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + sci-geosciences/opencpn:=" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure +} diff --git a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild index dcfdab4eb133..4ea63062e2ca 100644 --- a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild @@ -1,37 +1,35 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets -WX_GTK_VER="3.0" MY_PN="FindIt_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" else - SRC_URI=" - https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi DESCRIPTION="FindIt Plugin for OpenCPN" -HOMEPAGE="https://github.com/ptulp/FindIt_pi" +HOMEPAGE="https://github.com/rgleason/FindIt_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + sci-geosciences/opencpn:=" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-gxradar/metadata.xml b/sci-geosciences/opencpn-plugin-gxradar/metadata.xml index d8606ec694c7..6eb333eb3bb5 100644 --- a/sci-geosciences/opencpn-plugin-gxradar/metadata.xml +++ b/sci-geosciences/opencpn-plugin-gxradar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild index 9218dcc4cfca..ed4046ca4fde 100644 --- a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild +++ b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-1.1.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="gxradar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/trudK45/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-v.${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/trudK45/gxradar_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild index f6fe3791f2cc..ed4046ca4fde 100644 --- a/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-gxradar/opencpn-plugin-gxradar-9999.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="gxradar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/trudK45/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/trudK45/${MY_PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" + S="${WORKDIR}/${MY_PN}-v.${PV}" fi DESCRIPTION="Garmin xHD Radar Plugin for OpenCPN" @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/trudK45/gxradar_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-iacfleet/Manifest b/sci-geosciences/opencpn-plugin-iacfleet/Manifest index 34bf5ec959da..359143604f59 100644 --- a/sci-geosciences/opencpn-plugin-iacfleet/Manifest +++ b/sci-geosciences/opencpn-plugin-iacfleet/Manifest @@ -1 +1 @@ -DIST opencpn-plugin-iacfleet-0.9.tar.gz 218686 BLAKE2B 6c27fd57e7dc75d0a203a823ec75cacaf6fc351d58176f536542242b20e887ff58596bf114693d740258fd2c1a6af244f53825d0561ae9c396c5f556c0e1217a SHA512 f1e54fb17517dac2442de3bca85042add4a05f0b1caf144901581694403a9d9be9732a66f236f16014522b05108877b0dc530850bdf66b530e71c1b3cc010baf +DIST opencpn-plugin-iacfleet-0.21.1.tar.gz 228102 BLAKE2B eedb536e954f4534c7e256800e8888ff9f7d9eac5b26e21013f7ff519dfa9826253fef9d1f09af265fc448662551a16fbf5e5ab1a21bf3aa75234a8e5d170ee4 SHA512 86e26ca2291d36bdf8090ff03a9d1a79c263549ba7f5db34ed3e47be14f73eec35319567b76e66e6e87a21a1486b71c77964545da6ceab896bb42965c484c78d diff --git a/sci-geosciences/opencpn-plugin-iacfleet/metadata.xml b/sci-geosciences/opencpn-plugin-iacfleet/metadata.xml index b55736430c4c..549efe21a11b 100644 --- a/sci-geosciences/opencpn-plugin-iacfleet/metadata.xml +++ b/sci-geosciences/opencpn-plugin-iacfleet/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.21.1-r1.ebuild b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.21.1-r1.ebuild new file mode 100644 index 000000000000..a21dc632da69 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.21.1-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +inherit cmake flag-o-matic wxwidgets + +MY_PN="iacfleet_pi" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" +else + SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="IAC Fleetcode Plugin for OpenCPN" +HOMEPAGE="https://github.com/nohal/iacfleet_pi" + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + sci-geosciences/opencpn:=" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/927485 + # https://github.com/nohal/iacfleet_pi/issues/30 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + setup-wxwidgets unicode + cmake_src_configure +} diff --git a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild deleted file mode 100644 index 6e2c14f2c4b4..000000000000 --- a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -MY_PN="iacfleet_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" -else - SRC_URI=" - https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="IAC Fleetcode Plugin for OpenCPN" -HOMEPAGE="https://github.com/nohal/iacfleet_pi" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - -RDEPEND=" - x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare -} diff --git a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild index 6e2c14f2c4b4..a21dc632da69 100644 --- a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +inherit cmake flag-o-matic wxwidgets -WX_GTK_VER="3.0" MY_PN="iacfleet_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,22 @@ HOMEPAGE="https://github.com/nohal/iacfleet_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + sci-geosciences/opencpn:=" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/927485 + # https://github.com/nohal/iacfleet_pi/issues/30 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-launcher/Manifest b/sci-geosciences/opencpn-plugin-launcher/Manifest index 9d394806b228..07a9db0589da 100644 --- a/sci-geosciences/opencpn-plugin-launcher/Manifest +++ b/sci-geosciences/opencpn-plugin-launcher/Manifest @@ -1 +1 @@ -DIST opencpn-plugin-launcher-1.1.tar.gz 136301 BLAKE2B 4f353fdba9cd1ed15c59bb7becb95245add0ab9b21332524f6916ba08f519933a116bec9997406328bb6088db783d76d8e81d3970716dc986f7ef5f4a8980099 SHA512 67d36849b592d27af34aacb0016bddf961a2a94f7f6e5e0ec404c698bec9bdc2771671ec0772476188f6fd6733327e5e566bcff388583dc2cae578e39e279a16 +DIST opencpn-plugin-launcher-1.3.tar.gz 128022 BLAKE2B 56adbd348ea13cf28d0cb3abd3b86c36449852227515d9bdcf1e758b385b4eba339f3774f321ac62b691f5ddbf8487d78b3093c0e46cbcbf668e222b0281e821 SHA512 dae46cf310bd8ce913ea62a8e1519aa60a9f17866393fb46b50a3f3ff256bfaca80fa595acc32612ca0ee4a75af2c1ed6259c57881d702e47ed6ac8c57027ab6 diff --git a/sci-geosciences/opencpn-plugin-launcher/metadata.xml b/sci-geosciences/opencpn-plugin-launcher/metadata.xml index df7742b3737a..0013243bd2dc 100644 --- a/sci-geosciences/opencpn-plugin-launcher/metadata.xml +++ b/sci-geosciences/opencpn-plugin-launcher/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild deleted file mode 100644 index 641e27f97d5e..000000000000 --- a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -MY_PN="launcher_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" -else - SRC_URI=" - https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="Launcher Plugin for OpenCPN" -HOMEPAGE="https://github.com/nohal/launcher_pi" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - -RDEPEND=" - x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare -} diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.3.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.3.ebuild new file mode 100644 index 000000000000..7576bdb8e653 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +MY_PN="launcher_pi" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" +else + SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="Launcher Plugin for OpenCPN" +HOMEPAGE="https://github.com/nohal/launcher_pi" + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + sci-geosciences/opencpn:=" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure +} diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild index 641e27f97d5e..7576bdb8e653 100644 --- a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets -WX_GTK_VER="3.0" MY_PN="launcher_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/launcher_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + sci-geosciences/opencpn:=" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest index da9165f19f5b..f4edae270e58 100644 --- a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest +++ b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest @@ -1,2 +1 @@ -DIST opencpn-plugin-logbookkonni-1.3002.tar.gz 3810133 BLAKE2B e22d4fe15e54ce914d97bfb0c660210dddec26ba7e6867708489f042e18b04f2e4832275a7a96a31e5a4f1bc25faca1f8343ce66114751d1c37b525e749f8d15 SHA512 a539e8d01f9e81f859826477c1abbdafeacc1bd0a1e734777698eb471ddf0a1356bcd321b4b3aa27f9593e0d412e52fb8791248a0dfbc20daa7c9214152e8030 -DIST opencpn-plugin-logbookkonni-1.3002_Layouts.zip 1722887 BLAKE2B ba2b966def65930f544aabe1a617c5cc3aac69f578ffb3360388724c78d4c793719d50e577b0571933168f7f5cc55a27dcbb2e5616b90c17d0257052fd052d9f SHA512 f493d9af822a960f3b9a5d557d46b73e89c8179bfbc4d260d133c972e22d4ce5753e64b2d8ced321589a11a0a32efe1c34b574ed850af0673768896cdbb3d9c5 +DIST opencpn-plugin-logbookkonni-1.4.22.0.tar.gz 8595300 BLAKE2B ce4f1d87613ca4e5f4e4b6ea336b642ec780912395e855af5a88db0b8290b3aed796b54207c5a7776643dfa63dcdf93db711b63e5e9f95a4903c1e7e6874fbf3 SHA512 f3f50e8a7b24aca049b9495d1f3a5a303447df2fa1dc2e3c79a86a1d2be4a8b4f71e4b2ee596e721d3c2a0c9bb7138d9aed6bd28198cc91223233fa9440b827e diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch b/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch new file mode 100644 index 000000000000..4221ce9f82cd --- /dev/null +++ b/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch @@ -0,0 +1,57 @@ +diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake +--- LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake 2021-10-30 07:35:43.000000000 -1000 ++++ LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake 2021-11-29 22:31:48.755156001 -1000 +@@ -6,7 +6,7 @@ + # Installation items and layout. + # ~~~ + +-include(Metadata) ++#include(Metadata) + + if (APPLE) + install( +diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake +--- LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake 2021-10-30 07:35:43.000000000 -1000 ++++ LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake 2021-11-29 22:31:48.756156018 -1000 +@@ -8,7 +8,7 @@ + return() + endif () + +-include(Metadata) ++#include(Metadata) + + if (UNIX AND NOT APPLE AND NOT QT_ANDROID) + set(_LINUX ON) +diff -urN LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt LogbookKonni_pi-1.4.22.0/CMakeLists.txt +--- LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt 2021-10-30 07:35:43.000000000 -1000 ++++ LogbookKonni_pi-1.4.22.0/CMakeLists.txt 2021-11-29 22:42:03.398496368 -1000 +@@ -27,6 +27,7 @@ + endif () + message(STATUS "Cmake version: ${CMAKE_VERSION}.") + ++set(BUILD_TYPE "tarball") + + # -------- Build setup (mostly in PluginCompiler) -------- + # +@@ -57,6 +58,7 @@ + + option(PLUGIN_USE_SVG "Use SVG graphics" ON) + ++ + include(PluginOptions) + + # +@@ -135,9 +137,10 @@ + create_targets( + ${PROJECT_SOURCE_DIR}/flatpak/org.opencpn.OpenCPN.Plugin.logbook.yaml + ) +-if ("${BUILD_TYPE}" STREQUAL "") +- return () +-endif () ++#if ("${BUILD_TYPE}" STREQUAL "") ++# return () ++#endif () ++include(PluginLibs) + + if (NOT ${BUILD_TYPE} STREQUAL "flatpak") + # Build package as required (flatpak already dealt with). diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml b/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml index a71066b8627c..ad45721e9078 100644 --- a/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml +++ b/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild deleted file mode 100644 index 538c99cbd179..000000000000 --- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -MY_PN="LogbookKonni-1.2" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" -else - SRC_URI=" - https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip - " - inherit cmake-utils wxwidgets - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="Logbook Plugin for OpenCPN" -HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - -RDEPEND=" - x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND=" - app-arch/zip - ${RDEPEND} -" - -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare -} - -src_install() { - # install layouts as zip - cmake-utils_src_install - cd "$WORKDIR" - zip -r "$D"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts -} - -pkg_postinst() { - elog "Installation of logbook layouts" - elog "*******************************" - elog "" - elog "The default layouts zip file has been installed to:" - elog "/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip" - elog "" - elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings," - elog "click the install button and choose the above mentioned zip file" - elog "" -} diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.4.22.0.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.4.22.0.ebuild new file mode 100644 index 000000000000..37b7e7554be5 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.4.22.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +MY_PN="LogbookKonni_pi" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" +else + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="Logbook Plugin for OpenCPN" +HOMEPAGE="https://github.com/rgleason/LogbookKonni_pi" + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + sci-geosciences/opencpn:= + sys-devel/gettext" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/zip + sys-devel/gettext" + +PATCHES=( + "${FILESDIR}/cmake.patch" +) + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure +} + +pkg_postinst() { + elog "Installation of logbook layouts" + elog "*******************************" + elog + elog "The default layouts zip file has been installed to:" + elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/Layouts.zip" + elog + elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings," + elog "click the install button and choose the above mentioned zip file" + elog +} diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild index 538c99cbd179..37b7e7554be5 100644 --- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild @@ -1,61 +1,54 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -WX_GTK_VER="3.0" -MY_PN="LogbookKonni-1.2" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +MY_PN="LogbookKonni_pi" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" else - SRC_URI=" - https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi DESCRIPTION="Logbook Plugin for OpenCPN" -HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2" +HOMEPAGE="https://github.com/rgleason/LogbookKonni_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND=" + sci-geosciences/opencpn:= + sys-devel/gettext" +DEPEND="${RDEPEND}" +BDEPEND=" app-arch/zip - ${RDEPEND} -" + sys-devel/gettext" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare -} +PATCHES=( + "${FILESDIR}/cmake.patch" +) -src_install() { - # install layouts as zip - cmake-utils_src_install - cd "$WORKDIR" - zip -r "$D"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } pkg_postinst() { elog "Installation of logbook layouts" elog "*******************************" - elog "" + elog elog "The default layouts zip file has been installed to:" - elog "/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip" - elog "" + elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/Layouts.zip" + elog elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings," elog "click the install button and choose the above mentioned zip file" - elog "" + elog } diff --git a/sci-geosciences/opencpn-plugin-objsearch/metadata.xml b/sci-geosciences/opencpn-plugin-objsearch/metadata.xml index 385e7441b77c..3d9099985ab0 100644 --- a/sci-geosciences/opencpn-plugin-objsearch/metadata.xml +++ b/sci-geosciences/opencpn-plugin-objsearch/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild index bc75efdb60d4..d8a4f05a0de4 100644 --- a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild +++ b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.7.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="objsearch_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/objsearch_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild index bc75efdb60d4..d8a4f05a0de4 100644 --- a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="objsearch_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/objsearch_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/metadata.xml b/sci-geosciences/opencpn-plugin-ocpn_draw/metadata.xml index ae33cb3e72c5..03ebf568b0f1 100644 --- a/sci-geosciences/opencpn-plugin-ocpn_draw/metadata.xml +++ b/sci-geosciences/opencpn-plugin-ocpn_draw/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild index 6f814e3c1f9e..26a9865b3471 100644 --- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild +++ b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.3.14.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="ocpn_draw_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/jongough/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/jongough/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/jongough/ocpn_draw_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild index 6799ad2bc798..26a9865b3471 100644 --- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="ocpn_draw_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/jongough/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/jongough/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/jongough/ocpn_draw_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml b/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml index 145aae3bde6d..a9821ba361d1 100644 --- a/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml +++ b/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.3.ebuild b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.3.ebuild index 3ceeca86881d..3db37b30bf42 100644 --- a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.3.ebuild +++ b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.3.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="ocpndebugger_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/ocpndebugger_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-9999.ebuild b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-9999.ebuild index 3ceeca86881d..3db37b30bf42 100644 --- a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="ocpndebugger_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/nohal/ocpndebugger_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-oesenc/metadata.xml b/sci-geosciences/opencpn-plugin-oesenc/metadata.xml index 5609ab0afb6f..404774cea455 100644 --- a/sci-geosciences/opencpn-plugin-oesenc/metadata.xml +++ b/sci-geosciences/opencpn-plugin-oesenc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-1.6.0.ebuild b/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-1.6.0.ebuild index 03cae785ec0f..c920ec40e3f9 100644 --- a/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-1.6.0.ebuild +++ b/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-1.6.0.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="oesenc_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/bdbcat/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/bdbcat/oesenc_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-9999.ebuild b/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-9999.ebuild index 03cae785ec0f..c920ec40e3f9 100644 --- a/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-oesenc/opencpn-plugin-oesenc-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="oesenc_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/bdbcat/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/bdbcat/oesenc_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-otcurrent/metadata.xml b/sci-geosciences/opencpn-plugin-otcurrent/metadata.xml index 37fc2f734d5a..eb4cb234357d 100644 --- a/sci-geosciences/opencpn-plugin-otcurrent/metadata.xml +++ b/sci-geosciences/opencpn-plugin-otcurrent/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild index 03152157c982..d7fcccf5a579 100644 --- a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild +++ b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-1.2.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="otcurrent_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/Rasbats/otcurrent_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild index 03152157c982..d7fcccf5a579 100644 --- a/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-otcurrent/opencpn-plugin-otcurrent-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="otcurrent_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/Rasbats/otcurrent_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-polar/metadata.xml b/sci-geosciences/opencpn-plugin-polar/metadata.xml index 3d00c813eab8..53ba7350c278 100644 --- a/sci-geosciences/opencpn-plugin-polar/metadata.xml +++ b/sci-geosciences/opencpn-plugin-polar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-1.1007.ebuild b/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-1.1007.ebuild index 48c985b00c5f..a6688256200a 100644 --- a/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-1.1007.ebuild +++ b/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-1.1007.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="polar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/ptulp/polar_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-9999.ebuild b/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-9999.ebuild index 48c985b00c5f..a6688256200a 100644 --- a/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-polar/opencpn-plugin-polar-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="polar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/ptulp/polar_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-radar/metadata.xml b/sci-geosciences/opencpn-plugin-radar/metadata.xml index 71fc49471258..a261da21c7b7 100644 --- a/sci-geosciences/opencpn-plugin-radar/metadata.xml +++ b/sci-geosciences/opencpn-plugin-radar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> @@ -10,6 +10,6 @@ <name>Gentoo Geosciences Project</name> </maintainer> <upstream> - <remote-id type="github">Verezano/radar_pi</remote-id> + <remote-id type="github">Verezano/AISradar_pi</remote-id> </upstream> </pkgmetadata> diff --git a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild index 3b90c511621f..d232e5151a56 100644 --- a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild +++ b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-0.98.ebuild @@ -1,37 +1,35 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="radar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/Verezano/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-aisradar_pi-${PV}" fi DESCRIPTION="AIS Radar View Plugin for OpenCPN" -HOMEPAGE="https://github.com/Verezano/radar_pi" +HOMEPAGE="https://github.com/Verezano/AISradar_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild index 3b90c511621f..d232e5151a56 100644 --- a/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-radar/opencpn-plugin-radar-9999.ebuild @@ -1,37 +1,35 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="radar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/Verezano/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/Verezano/${MY_PN}/archive/aisradar_pi-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-aisradar_pi-${PV}" fi DESCRIPTION="AIS Radar View Plugin for OpenCPN" -HOMEPAGE="https://github.com/Verezano/radar_pi" +HOMEPAGE="https://github.com/Verezano/AISradar_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-route/metadata.xml b/sci-geosciences/opencpn-plugin-route/metadata.xml index 6e6d546794c3..ade380832174 100644 --- a/sci-geosciences/opencpn-plugin-route/metadata.xml +++ b/sci-geosciences/opencpn-plugin-route/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild index c81e035e1c04..a2b93f3991c2 100644 --- a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild +++ b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-1.2.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="route_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/SaltyPaws/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/SaltyPaws/route_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild index c81e035e1c04..a2b93f3991c2 100644 --- a/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-route/opencpn-plugin-route-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="route_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/SaltyPaws/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/SaltyPaws/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/SaltyPaws/route_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-squiddio/metadata.xml b/sci-geosciences/opencpn-plugin-squiddio/metadata.xml index adb0998c135b..231eec4da1e6 100644 --- a/sci-geosciences/opencpn-plugin-squiddio/metadata.xml +++ b/sci-geosciences/opencpn-plugin-squiddio/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-0.7.ebuild b/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-0.7.ebuild index 66ac6b37d7e2..2e0a3929667b 100644 --- a/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-0.7.ebuild +++ b/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-0.7.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="squiddio_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/mauroc/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/mauroc/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/mauroc/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,18 +22,17 @@ HOMEPAGE="https://github.com/mauroc/squiddio_pi" LICENSE="GPL-3+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND=" + sys-devel/gettext" +DEPEND="${RDEPEND}" +BDEPEND=" net-misc/curl - ${RDEPEND} -" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare + sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-9999.ebuild b/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-9999.ebuild index 66ac6b37d7e2..2e0a3929667b 100644 --- a/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="squiddio_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/mauroc/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/mauroc/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/mauroc/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,18 +22,17 @@ HOMEPAGE="https://github.com/mauroc/squiddio_pi" LICENSE="GPL-3+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND=" + sys-devel/gettext" +DEPEND="${RDEPEND}" +BDEPEND=" net-misc/curl - ${RDEPEND} -" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare + sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-statusbar/metadata.xml b/sci-geosciences/opencpn-plugin-statusbar/metadata.xml index 1e209f748392..77d49fe0bb55 100644 --- a/sci-geosciences/opencpn-plugin-statusbar/metadata.xml +++ b/sci-geosciences/opencpn-plugin-statusbar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild index 307e60fb53a3..8eae4a6232ad 100644 --- a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild +++ b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="statusbar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/statusbar_pi" LICENSE="GPL-3+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild index 307e60fb53a3..8eae4a6232ad 100644 --- a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="statusbar_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/statusbar_pi" LICENSE="GPL-3+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-watchdog/metadata.xml b/sci-geosciences/opencpn-plugin-watchdog/metadata.xml index 7c616379306d..8c518ba29da0 100644 --- a/sci-geosciences/opencpn-plugin-watchdog/metadata.xml +++ b/sci-geosciences/opencpn-plugin-watchdog/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-1.9.051.ebuild b/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-1.9.051.ebuild index d60086491945..aa3335fb7dcf 100644 --- a/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-1.9.051.ebuild +++ b/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-1.9.051.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="watchdog_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/watchdog_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-9999.ebuild b/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-9999.ebuild index d60086491945..aa3335fb7dcf 100644 --- a/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-watchdog/opencpn-plugin-watchdog-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="watchdog_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/watchdog_pi" LICENSE="GPL-2+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-weather_routing/Manifest b/sci-geosciences/opencpn-plugin-weather_routing/Manifest index 8ef5e1f39a73..a8d3887396a5 100644 --- a/sci-geosciences/opencpn-plugin-weather_routing/Manifest +++ b/sci-geosciences/opencpn-plugin-weather_routing/Manifest @@ -1 +1 @@ -DIST opencpn-plugin-weather_routing-1.10.1.tar.gz 845403 BLAKE2B e7cacef78f2f5567c008452c6c24eacf3acde8f8dcd78aa05f1e36248f31ab946f27c0bacdbb0882dcc1075a0fe15d6ddd62f5e24f7c38fffaf577683de6a345 SHA512 052377bc2b962b131640ecdb2e688b97325a7935f60c68652be6bdb07486278d03d09ec2c8b4b1547e5eeab1ea7613890604c800a91f185babe5bfb5221a7337 +DIST opencpn-plugin-weather_routing-1.13.1.tar.gz 893533 BLAKE2B 011eed0e6c4b463a89e83611f1b5b6dcb74edd65100a8fe444c5623ea85c20666194586964c2ed0b8a8b1d2d790026affccc034d98ea375284048fd33983a092 SHA512 43661df7b1a823f38a928a899bca58cd7451b663e23843bdf79000c0bc4e95cf9491e21e7a5ea6ad33f6a15e0a72c68058779ee241ad338a907852d048b5bc45 diff --git a/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml b/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml index 49008f4636da..c3c784e1bb10 100644 --- a/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml +++ b/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild deleted file mode 100644 index 97bf2e186459..000000000000 --- a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.10.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -MY_PN="weather_routing_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" -else - SRC_URI=" - https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="Weather Routing Plugin for OpenCPN" -HOMEPAGE="https://github.com/seandepagnier/weather_routing_pi/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="" - -RDEPEND=" - x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" -DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare -} diff --git a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.13.1.ebuild b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.13.1.ebuild new file mode 100644 index 000000000000..2d4a9d906c36 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.13.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +MY_PN="weather_routing_pi" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" +else + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="Weather Routing Plugin for OpenCPN" +HOMEPAGE="https://github.com/rgleason/weather_routing_pi/" + +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND=" + x11-libs/wxGTK:${WX_GTK_VER} + >=sci-geosciences/opencpn-4.2.0" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure +} diff --git a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild index 97bf2e186459..2d4a9d906c36 100644 --- a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-9999.ebuild @@ -1,37 +1,35 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets -WX_GTK_VER="3.0" MY_PN="weather_routing_pi" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git" else - SRC_URI=" - https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi DESCRIPTION="Weather Routing Plugin for OpenCPN" -HOMEPAGE="https://github.com/seandepagnier/weather_routing_pi/" +HOMEPAGE="https://github.com/rgleason/weather_routing_pi/" LICENSE="GPL-3+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml b/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml index 876385098e23..cd6445f1b395 100644 --- a/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml +++ b/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild index a9bec2036741..b0cb5f6225f3 100644 --- a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild +++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="weatherfax_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/weatherfax_pi" LICENSE="GPL-3+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild index a9bec2036741..b0cb5f6225f3 100644 --- a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER="3.0" +inherit cmake wxwidgets + MY_PN="weatherfax_pi" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git" - inherit git-r3 cmake-utils wxwidgets - KEYWORDS="" else - SRC_URI=" - https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - inherit cmake-utils wxwidgets + SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" fi @@ -23,15 +22,14 @@ HOMEPAGE="https://github.com/seandepagnier/weatherfax_pi" LICENSE="GPL-3+" SLOT="0" -IUSE="" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0 - sys-devel/gettext -" + >=sci-geosciences/opencpn-4.2.0" DEPEND="${RDEPEND}" -src_prepare() { - need-wxwidgets unicode - cmake-utils_src_prepare +BDEPEND="sys-devel/gettext" + +src_configure() { + setup-wxwidgets unicode + cmake_src_configure } diff --git a/sci-geosciences/opencpn-plugins-meta/metadata.xml b/sci-geosciences/opencpn-plugins-meta/metadata.xml index 49f32f114fc1..95aede5f749e 100644 --- a/sci-geosciences/opencpn-plugins-meta/metadata.xml +++ b/sci-geosciences/opencpn-plugins-meta/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r6.ebuild index 08856b3f00c9..0272118e164f 100644 --- a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild +++ b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r6.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Meta ebuild to pull in opencpn plugins" -HOMEPAGE="https://www.gentoo.org" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="metapackage" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" >=sci-geosciences/opencpn-${PV} - >=sci-geosciences/opencpn-plugin-br24radar-1.31 >=sci-geosciences/opencpn-plugin-dr-1.1 - >=sci-geosciences/opencpn-plugin-findit-1.1007 + >=sci-geosciences/opencpn-plugin-findit-1.2.12.0 >=sci-geosciences/opencpn-plugin-gxradar-1.1 >=sci-geosciences/opencpn-plugin-iacfleet-0.8 >=sci-geosciences/opencpn-plugin-launcher-1.1 - >=sci-geosciences/opencpn-plugin-logbookkonni-1.3002 + >=sci-geosciences/opencpn-plugin-logbookkonni-1.4.22.0 >=sci-geosciences/opencpn-plugin-objsearch-0.7 >=sci-geosciences/opencpn-plugin-ocpn_draw-1.0.12 >=sci-geosciences/opencpn-plugin-ocpndebugger-1.2 diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest index 798beb6b0385..94454a639566 100644 --- a/sci-geosciences/opencpn/Manifest +++ b/sci-geosciences/opencpn/Manifest @@ -1,5 +1,3 @@ -DIST opencpn-4.8.0.tar.gz 53008393 BLAKE2B 79184b678db329e98c704f4f1a132e5d3af4a65b104c6eab1c37738cbbf98d88c21647ce654077a8f4b781221d7e3766c35d7450b81befdad7f269b636263c09 SHA512 1f1ea666566e98ee3af24423985119c1b14e184d4310dbc588b00065878b1dcb8fe73a7331e4ad3f75a905774fff187203fb31253faea7238f3d783a6729ad75 -DIST opencpn-4.8.2.tar.gz 59164504 BLAKE2B fbfa86051845a922a7c642194cd0672fbccd6a75e3897e8b0b3f9b08c091d0933a146060f83265c9a85d0bacf18f57a0f9ba55aa4f26e035a77d39d73e5e5a7d SHA512 231f8ba29f8a0343cb3807e52e8535bdade221de65a169b57e94816b4b464407ba90b605dcec21a5c45c742de076b644f076fee88616ec2867a8ae182105102d -DIST opencpn-4.8.8.tar.gz 59140674 BLAKE2B a03fd28b26bee46d559d16bf061eac409ca9395fdf1595162a51fe4cdfb30c3151c23b30f3396b645c4b177b3fd3b0f2ea03a850d0ea3fe2258f1abc4956a3db SHA512 4fa94655d7b9d389f5f335c15898e7138c792c71b824720fedd762ccd71c01481e5a24598b85211dba0c7d89d0ad0b2ebc2afc38301235829d4aa6f499c6f9b2 -DIST opencpn-doc_4.1.1329.1.orig.tar.xz 8739872 BLAKE2B 1d0b1538230488586318212d371669d0dfd6fefb45a49c1405c8749cfc2d5b1ced39c03ad7814954db42644ab5c21a37177e0f315b8d6d49c2200508f27a9899 SHA512 652a932edbf8a6f05fd3c64ddf566f817405cf44697035f58ddbf1a99bf92269b7fd9ee83b7ee065aa60db15b6030d8c5c9a4a4001049ed2def9962bc51746c2 +DIST opencpn-5.6.2.tar.gz 82919992 BLAKE2B a45e19d293d63262f2bb6bd0bd5d18723cadd0b93af8e64484b55d246cebbe623dccbb6a1d257eccd74fb9111953d9cdd4b44d6f3fb38c3a9f40fa253718f337 SHA512 6d90b21448b2d2a58685592e92647108978012cbaa25999d98855dca222e013784ca4e351eb08efd0a18980cccffb28b0d3c171ea9207e5fb37889e3a3b377e3 +DIST opencpn-5.8.4.tar.gz 82696698 BLAKE2B 0235d87daec97008b58dc9916d4250b33c0c4158be6ba4853bf30c5876af7d382eb1c02e2cd3748229775305cc90f86d5743b9951909043588e2096fcd207af5 SHA512 08231d95ca80a5e6b85b279be2912d3e9f390f879a780823f8ee9c64371eb0605484f697328217027c7caf18cb1151b617d42d22951672c1a9508750e97f109a DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb diff --git a/sci-geosciences/opencpn/metadata.xml b/sci-geosciences/opencpn/metadata.xml index 5e5fb62ddabd..6d3ea5cafd03 100644 --- a/sci-geosciences/opencpn/metadata.xml +++ b/sci-geosciences/opencpn/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mschiff@gentoo.org</email> diff --git a/sci-geosciences/opencpn/opencpn-4.8.0-r1.ebuild b/sci-geosciences/opencpn/opencpn-4.8.0-r1.ebuild deleted file mode 100644 index a846188eb7d6..000000000000 --- a/sci-geosciences/opencpn/opencpn-4.8.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets - -DOC_VERSION="4.1.1329.1" - -DESCRIPTION="a free, open source software for marine navigation" -HOMEPAGE="https://opencpn.org/" -SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz -doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz ) -" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gps opengl" - -RDEPEND=" - app-arch/bzip2 - dev-libs/tinyxml - media-libs/freetype:2 - media-libs/portaudio - sys-libs/zlib - opengl? ( virtual/opengl ) - x11-libs/gtk+:2 - x11-libs/wxGTK:${WX_GTK_VER}[X] - gps? ( sci-geosciences/gpsd ) - !sci-geosciences/opencpn-plugin-wmm -" -DEPEND="${RDEPEND} - sys-devel/gettext" - -S="${WORKDIR}/OpenCPN-${PV}" - -src_configure() { - need-wxwidgets unicode - local mycmakeargs=( - $(cmake-utils_use_use gps GPSD) - -DUSE_S57=ON - -DUSE_GARMINHOST=ON - -DBUNDLE_GSHHS=CRUDE - -DBUNDLE_TCDATA=ON - ) - - cmake-utils_src_configure -} - -src_install() { - if use doc; then - dohtml -r "${S}"/../${PN}/doc/* - fi - cmake-utils_src_install -} - -pkg_postinst() { - if use doc; then - einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html" - fi -} diff --git a/sci-geosciences/opencpn/opencpn-4.8.2.ebuild b/sci-geosciences/opencpn/opencpn-4.8.2.ebuild deleted file mode 100644 index 4488d324a16b..000000000000 --- a/sci-geosciences/opencpn/opencpn-4.8.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets - -DOC_VERSION="4.1.1329.1" - -DESCRIPTION="a free, open source software for marine navigation" -HOMEPAGE="https://opencpn.org/" -SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz -doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz ) -" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gps opengl" - -RDEPEND=" - app-arch/bzip2 - dev-libs/tinyxml - media-libs/freetype:2 - media-libs/portaudio - sys-libs/zlib - opengl? ( virtual/opengl ) - x11-libs/gtk+:2 - x11-libs/wxGTK:${WX_GTK_VER}[X] - gps? ( sci-geosciences/gpsd ) - !sci-geosciences/opencpn-plugin-wmm -" -DEPEND="${RDEPEND} - sys-devel/gettext" - -S="${WORKDIR}/OpenCPN-${PV}" - -src_configure() { - setup-wxwidgets - local mycmakeargs=( - $(cmake-utils_use_use gps GPSD) - -DUSE_S57=ON - -DUSE_GARMINHOST=ON - -DBUNDLE_GSHHS=CRUDE - -DBUNDLE_TCDATA=ON - ) - - cmake-utils_src_configure -} - -src_install() { - if use doc; then - dohtml -r "${S}"/../${PN}/doc/* - fi - cmake-utils_src_install -} - -pkg_postinst() { - if use doc; then - einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html" - fi -} diff --git a/sci-geosciences/opencpn/opencpn-4.8.8.ebuild b/sci-geosciences/opencpn/opencpn-5.6.2-r3.ebuild index bd242464255b..cb75281d7cff 100644 --- a/sci-geosciences/opencpn/opencpn-4.8.8.ebuild +++ b/sci-geosciences/opencpn/opencpn-5.6.2-r3.ebuild @@ -1,43 +1,48 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets +WX_GTK_VER="3.0-gtk3" +inherit wxwidgets xdg cmake DOC_VERSION="4.8.2.0" DESCRIPTION="a free, open source software for marine navigation" HOMEPAGE="https://opencpn.org/" -SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz -doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz ) -" +SRC_URI=" + https://github.com/OpenCPN/OpenCPN/archive/refs/tags/Release_${PV}.tar.gz -> ${P}.tar.gz + doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )" +S="${WORKDIR}/OpenCPN-Release_${PV}" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc lzma opengl" +IUSE="doc lzma" RDEPEND=" app-arch/bzip2 - lzma? ( app-arch/xz-utils ) dev-libs/tinyxml + lzma? ( app-arch/xz-utils ) media-libs/freetype:2 media-libs/portaudio net-misc/curl sys-libs/zlib - opengl? ( virtual/opengl ) - x11-libs/gtk+:2 - x11-libs/wxGTK:${WX_GTK_VER}[X] - !sci-geosciences/opencpn-plugin-wmm -" -DEPEND="${RDEPEND} - sys-devel/gettext" - -S="${WORKDIR}/OpenCPN-${PV}" + virtual/libusb:1 + virtual/opengl + x11-base/xorg-proto + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X] + " +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext + sys-apps/lsb-release + " src_configure() { + use doc && HTML_DOCS=( "${S}"/../${PN}/doc/. ) + setup-wxwidgets local mycmakeargs=( -DUSE_S57=ON @@ -46,17 +51,12 @@ src_configure() { -DBUNDLE_TCDATA=ON ) - cmake-utils_src_configure -} - -src_install() { - if use doc; then - dohtml -r "${S}"/../${PN}/doc/* - fi - cmake-utils_src_install + cmake_src_configure } pkg_postinst() { + xdg_pkg_postinst + if use doc; then einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html" fi diff --git a/sci-geosciences/opencpn/opencpn-5.8.4.ebuild b/sci-geosciences/opencpn/opencpn-5.8.4.ebuild new file mode 100644 index 000000000000..694939aded12 --- /dev/null +++ b/sci-geosciences/opencpn/opencpn-5.8.4.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +inherit flag-o-matic wxwidgets xdg cmake toolchain-funcs + +DOC_VERSION="4.8.2.0" + +DESCRIPTION="a free, open source software for marine navigation" +HOMEPAGE="https://opencpn.org/" +SRC_URI=" + https://github.com/OpenCPN/OpenCPN/archive/refs/tags/Release_${PV}.tar.gz -> ${P}.tar.gz + doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )" +S="${WORKDIR}/OpenCPN-Release_${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc lzma" + +RDEPEND=" + app-arch/bzip2 + dev-libs/openssl:= + dev-libs/tinyxml + lzma? ( app-arch/xz-utils ) + media-libs/freetype:2 + media-libs/glew:0 + media-libs/jasper + media-libs/portaudio + net-misc/curl + sys-libs/zlib + virtual/libusb:1 + virtual/opengl + x11-base/xorg-proto + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X] + " +DEPEND="${RDEPEND}" +BDEPEND=" + dev-cpp/gtest + dev-libs/rapidjson + sys-apps/lsb-release + sys-devel/gettext + " + +src_prepare() { + # see bug #907759 + sed -i "s/ cc / $(tc-getBUILD_CC) /" "${S}"/CMakeLists.txt + cmake_src_prepare +} + +src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/927484 + # https://github.com/OpenCPN/OpenCPN/issues/3782 + filter-lto + + use doc && HTML_DOCS=( "${S}"/../${PN}/doc/. ) + + setup-wxwidgets + local mycmakeargs=( + -DUSE_GARMINHOST=ON + ) +# -DUSE_S57=ON +# -DBUNDLE_TCDATA=ON +# -DBUNDLE_GSHHS=CRUDE + + cmake_src_configure +} + +src_install() { + cmake_src_install + mv "${D}/usr/share/doc/${PN}"/* "${D}/usr/share/doc/${PF}" || die + rmdir "${D}/usr/share/doc/${PN}" +} + +pkg_postinst() { + xdg_pkg_postinst + + if use doc; then + einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html" + fi +} diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest index 3cf0cce095b1..7b91a9b1b854 100644 --- a/sci-geosciences/osm-gps-map/Manifest +++ b/sci-geosciences/osm-gps-map/Manifest @@ -1 +1 @@ -DIST osm-gps-map-1.1.0.tar.gz 440480 BLAKE2B d1847937b4f9691c2ba14908f3cbca3c9911f76e05a6f8e96cd741ca291b74e238a06b6d01fbd8bac9c43bdd73788e8ef0c035d75290ffb631a15ee0b9f749e5 SHA512 74924e5caa0b2bac822f678236d94203b34d9af1dce24cfcd44e1fb9f7551558137dd02b35ca970e36472748acfd611c6251ff5c52d998bfaffccb9821cc0fe0 +DIST osm-gps-map-1.2.0.tar.gz 466817 BLAKE2B 727c5969b1ca1c681a6629cc0d35f5124e99de7116267e3135dc5dd926df4431b16045df3e1441eb1f7a68252b3bb451c26585b9907f16aec7800b9531631eaa SHA512 7d19a3f2afcaab6dd5d2fcf62a552f4f4481d494a8ce6a88f3db94d0037ade0679d1618107859c63cdc0cf72eb8c9380b435a4c3d9af68cd3f2595cc66bba747 diff --git a/sci-geosciences/osm-gps-map/metadata.xml b/sci-geosciences/osm-gps-map/metadata.xml index fb62bce3d4d6..357b2be6f0cc 100644 --- a/sci-geosciences/osm-gps-map/metadata.xml +++ b/sci-geosciences/osm-gps-map/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?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> diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild index fda2bd508a4f..7851b7837315 100644 --- a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild +++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild @@ -1,34 +1,32 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools gnome2 DESCRIPTION="A GTK+ widget for displaying OpenStreetMap tiles" -HOMEPAGE="http://nzjrs.github.io/osm-gps-map/" +HOMEPAGE="https://nzjrs.github.io/osm-gps-map/" SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 arm64 ~ppc64 ~x86" IUSE="static-libs" -RDEPEND=" - >=dev-libs/glib-2.16.0:2 +RDEPEND=">=dev-libs/glib-2.16.0:2 >=net-libs/libsoup-2.4.0:2.4 >=x11-libs/cairo-1.8.0 >=x11-libs/gtk+-3.0:3[introspection] dev-libs/gobject-introspection" - DEPEND="${RDEPEND} - dev-util/gtk-doc-am - gnome-base/gnome-common:3 + gnome-base/gnome-common:3" +BDEPEND="dev-build/gtk-doc-am virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-gtk-doc-module.patch" - "${FILESDIR}/${P}-no-maintainer-mode.patch" + "${FILESDIR}/${PN}-1.1.0-gtk-doc-module.patch" + "${FILESDIR}/${PN}-1.1.0-no-maintainer-mode.patch" ) src_prepare() { @@ -37,7 +35,5 @@ src_prepare() { } src_configure() { - gnome2_src_configure \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable static-libs static) + gnome2_src_configure $(use_enable static-libs static) } diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest index f698e617569d..bfae50571f56 100644 --- a/sci-geosciences/osm2pgsql/Manifest +++ b/sci-geosciences/osm2pgsql/Manifest @@ -1,2 +1 @@ -DIST osm2pgsql-0.94.0.tar.gz 1203310 BLAKE2B df9af84aab13bfd79763238e89dfc216401be2460be468a2f5467513dfcbd48650d779586f9cefd4100d6404f430a2401326919e9a1c72d86b80c6526881f206 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e -DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372 +DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e diff --git a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch new file mode 100644 index 000000000000..d7f35345ef52 --- /dev/null +++ b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,7 +185,7 @@ + include_directories(SYSTEM ${LUAJIT_INCLUDE_DIR}) + set(HAVE_LUAJIT 1) + else() +- find_package(Lua REQUIRED) ++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED) + include_directories(SYSTEM ${LUA_INCLUDE_DIR}) + endif() + set(HAVE_LUA 1) diff --git a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch new file mode 100644 index 000000000000..054624d02d62 --- /dev/null +++ b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -193,7 +193,7 @@ + add_definitions(-DHAVE_LUAJIT=1) + else() + message(STATUS "Building with Lua support") +- find_package(Lua REQUIRED) ++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED) + include_directories(SYSTEM ${LUA_INCLUDE_DIR}) + endif() + add_definitions(-DHAVE_LUA=1) diff --git a/sci-geosciences/osm2pgsql/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml index 5c2215ccfe52..133a781279f1 100644 --- a/sci-geosciences/osm2pgsql/metadata.xml +++ b/sci-geosciences/osm2pgsql/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild deleted file mode 100644 index f6ef3e3fbfc4..000000000000 --- a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db" -HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql https://github.com/openstreetmap/osm2pgsql" -SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+lua" - -COMMON_DEPEND=" - app-arch/bzip2 - dev-db/postgresql:= - dev-libs/expat - sci-libs/proj - sys-libs/zlib - lua? ( dev-lang/lua:= ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - dev-db/postgis -" - -# Tries to connect to local postgres server and other shenanigans -RESTRICT="test" - -src_configure() { - local mycmakeargs=( - -DWITH_LUA=$(usex lua) - -DBUILD_TESTS=OFF - ) - cmake-utils_src_configure -} diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild deleted file mode 100644 index 990f5c9422a8..000000000000 --- a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db" -HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql - https://github.com/openstreetmap/osm2pgsql" -SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+lua" - -COMMON_DEPEND=" - app-arch/bzip2 - dev-db/postgresql:= - dev-libs/expat - sci-libs/proj - sys-libs/zlib - lua? ( dev-lang/lua:= ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - dev-db/postgis -" - -# Tries to connect to local postgres server and other shenanigans -RESTRICT="test" - -src_configure() { - local mycmakeargs=( - -DWITH_LUA=$(usex lua) - -DBUILD_TESTS=OFF - ) - cmake-utils_src_configure -} diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild new file mode 100644 index 000000000000..accfe28a233f --- /dev/null +++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit cmake lua-single + +DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database" +HOMEPAGE="https://osm2pgsql.org/" +SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="+lua" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +COMMON_DEPEND=" + app-arch/bzip2 + dev-db/postgresql:= + dev-libs/expat + sci-libs/proj:= + sys-libs/zlib + lua? ( ${LUA_DEPS} ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost:= +" +RDEPEND="${COMMON_DEPEND} + dev-db/postgis +" + +# Tries to connect to local postgres server and other shenanigans +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.0-cmake_lua_version.patch +) + +src_configure() { + # Setting WITH_LUAJIT without "if use lua" guard is safe, upstream + # CMakeLists.txt only evaluates it if WITH_LUA is true. + local mycmakeargs=( + -DWITH_LUA=$(usex lua) + -DWITH_LUAJIT=$(usex lua_single_target_luajit) + -DBUILD_TESTS=OFF + ) + # To prevent the "unused variable" QA warning + if use lua && ! use lua_single_target_luajit; then + mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" ) + fi + cmake_src_configure +} diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild index 44e16db48041..b8c509281a26 100644 --- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild +++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild @@ -1,31 +1,35 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils git-r3 +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit cmake git-r3 lua-single EGIT_REPO_URI="https://github.com/openstreetmap/${PN}.git" DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database" -HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql" +HOMEPAGE="https://osm2pgsql.org/" SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE="+lua" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" COMMON_DEPEND=" app-arch/bzip2 dev-db/postgresql:= dev-libs/expat - sci-libs/proj + sci-libs/proj:= sys-libs/zlib - lua? ( dev-lang/lua:= ) + lua? ( ${LUA_DEPS} ) " DEPEND="${COMMON_DEPEND} - dev-libs/boost + dev-cpp/nlohmann_json + dev-libs/boost:= " RDEPEND="${COMMON_DEPEND} dev-db/postgis @@ -34,10 +38,21 @@ RDEPEND="${COMMON_DEPEND} # Tries to connect to local postgres server and other shenanigans RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-cmake_lua_version.patch +) + src_configure() { + # Setting WITH_LUAJIT without "if use lua" guard is safe, upstream + # CMakeLists.txt only evaluates it if WITH_LUA is true. local mycmakeargs=( -DWITH_LUA=$(usex lua) + -DWITH_LUAJIT=$(usex lua_single_target_luajit) -DBUILD_TESTS=OFF ) - cmake-utils_src_configure + # To prevent the "unused variable" QA warning + if use lua && ! use lua_single_target_luajit; then + mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" ) + fi + cmake_src_configure } diff --git a/sci-geosciences/osmctools/Manifest b/sci-geosciences/osmctools/Manifest new file mode 100644 index 000000000000..b5cdd1682f59 --- /dev/null +++ b/sci-geosciences/osmctools/Manifest @@ -0,0 +1 @@ +DIST osmctools-0.9.tar.bz2 127337 BLAKE2B c31596e2465d299b11637664e994177072b4cec4ee83c2043a45251d5a097f7215f55dde5d92bfc0fbe9f1816a7906e5bbe30b17ef752a65ba1a4243ca86ed06 SHA512 6b7068796e15d31c8bab5016ed7245d161889d84cf88566ffa71c145b7d93c428b3b83232098b6283b651e7dad4a761fd1ccdebc14c95617f23598cc3281e4a6 diff --git a/sci-geosciences/osmctools/metadata.xml b/sci-geosciences/osmctools/metadata.xml new file mode 100644 index 000000000000..e2de9488672f --- /dev/null +++ b/sci-geosciences/osmctools/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + Fast OpenStreetMap data tools: + * osmconvert - reads and converts OSM data to the selected output file format + * osmfilter - filters OSM data + * osmupdate - cares about updating an .osm, .o5m or .pbf file + </longdescription> + <upstream> + <remote-id type="gitlab">osm-c-tools/osmctools</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-geosciences/osmctools/osmctools-0.9-r2.ebuild b/sci-geosciences/osmctools/osmctools-0.9-r2.ebuild new file mode 100644 index 000000000000..e096bec36d61 --- /dev/null +++ b/sci-geosciences/osmctools/osmctools-0.9-r2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A few really fast tools to convert, filter and update OSM data files" +HOMEPAGE="https://gitlab.com/osm-c-tools" +SRC_URI="https://gitlab.com/osm-c-tools/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="amd64 ~x86" + +DEPEND="sys-libs/zlib" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} diff --git a/sci-geosciences/owntracks-recorder/Manifest b/sci-geosciences/owntracks-recorder/Manifest new file mode 100644 index 000000000000..d8518500b08f --- /dev/null +++ b/sci-geosciences/owntracks-recorder/Manifest @@ -0,0 +1 @@ +DIST owntracks-recorder-0.9.7.tar.gz 4492791 BLAKE2B 008a75c52e381345b8a5d7fb8e1da808a66c6f94b367ef6bf937737e45ea7022cac4cfcf4632ffd8d87b682121b0ef59b007515d20cc163a8d3532a937c4d156 SHA512 e68e61ffeec864c46355e21e08656097a8b9828152fcf897da29ecbc8035f9a8d038580f230d6ab0f4d48289072545c7fb20f03d25bf8c3266af425db8bb4a65 diff --git a/sci-geosciences/owntracks-recorder/files/ot-recorder.initd b/sci-geosciences/owntracks-recorder/files/ot-recorder.initd new file mode 100644 index 000000000000..3a45349f5169 --- /dev/null +++ b/sci-geosciences/owntracks-recorder/files/ot-recorder.initd @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net +} + +name="OwnTracks Recorder" +pidfile="/run/${RC_SVCNAME}.pid" +command="/usr/sbin/ot-recorder" +command_user="owntracks" +command_background="yes" diff --git a/sci-geosciences/owntracks-recorder/metadata.xml b/sci-geosciences/owntracks-recorder/metadata.xml new file mode 100644 index 000000000000..2292ec7fa9c4 --- /dev/null +++ b/sci-geosciences/owntracks-recorder/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">owntracks/recorder</remote-id> + </upstream> + <use> + <flag name="crypt">Enable support for payload encryption with <pkg>dev-libs/libsodium</pkg></flag> + <flag name="greenwich">Enable support for the OwnTracks Greenwich firmware</flag> + <flag name="http">Enable support for the built-in HTTP REST API</flag> + <flag name="kill">Enable support removing data via the API (dangerous)</flag> + <flag name="lua">Enable support for Lua hook integration</flag> + <flag name="mqtt">Enable MQTT support</flag> + <flag name="ping">Enable support for the "pingping" monitoring feature</flag> + <flag name="tours">Enable recorder support for shared views</flag> + </use> +</pkgmetadata> diff --git a/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.7.ebuild b/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.7.ebuild new file mode 100644 index 000000000000..07e05344ddb2 --- /dev/null +++ b/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.7.ebuild @@ -0,0 +1,113 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3..4} ) + +inherit lua-single prefix systemd toolchain-funcs + +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" +LICENSE="GPL-2+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64" +IUSE="crypt +http greenwich kill lua +mqtt +ping +tours" + +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + tours? ( http ) +" + +IDEPEND=" + acct-group/owntracks + acct-user/owntracks +" + +DEPEND=" + dev-db/lmdb:= + dev-libs/libconfig:= + net-misc/curl + crypt? ( dev-libs/libsodium:= ) + lua? ( ${LUA_DEPS} ) + mqtt? ( app-misc/mosquitto ) + tours? ( sys-apps/util-linux ) +" + +RDEPEND=" + ${IDEPEND} + ${DEPEND} +" + +BDEPEND=" + virtual/pkgconfig +" + +S="${WORKDIR}/${P#*-}" + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + hprefixify etc/${MY_PN}.service + mv $(prefixify_ro config.mk.in) config.mk || die +} + +src_configure() { + myconf=( + WITH_MQTT=$(usex mqtt) + WITH_PING=$(usex ping) + WITH_LUA=$(usex lua) + WITH_ENCRYPT=$(usex crypt) + WITH_KILL=$(usex kill) + WITH_HTTP=$(usex http) + WITH_TOURS=$(usex tours) + WITH_GREENWICH=$(usex greenwich) + WITH_TZ=yes + + CC="$(tc-getCC)" + CPP="$(tc-getCPP)" + PKG_CONFIG="$(tc-getPKG_CONFIG)" + INSTALLDIR="${EPREFIX}/usr" + STORAGEDEFAULT="${EPREFIX}/var/db/${MY_PN}" + DOCROOT="${EPREFIX}/var/www/${MY_PN}/htdocs" + CONFIGFILE="${EPREFIX}/etc/${MY_PN}.conf" + + # The .pc file currently hardcodes "lib". + MOSQUITTO_LIBS=-lmosquitto + + # Allow further customisation by users. + "${OTR_CONF[@]}" + ) + + use lua && myconf+=( + LUA_CFLAGS="$(lua_get_CFLAGS)" + LUA_LIBS="$(lua_get_LIBS)" + ) +} + +src_compile() { + emake "${myconf[@]}" +} + +src_install() { + emake install "${myconf[@]}" DESTDIR="${ED}" + dodoc *.md doc/*.md + + newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN} + systemd_dounit etc/${MY_PN}.service + + keepdir /var/db/${MY_PN} +} + +pkg_preinst() { + fowners owntracks:owntracks /var/db/${MY_PN} + fperms 750 /var/db/${MY_PN} + + fowners root:owntracks /etc/${MY_PN}.conf + fperms 0640 /etc/${MY_PN}.conf +} diff --git a/sci-geosciences/pymap3d/Manifest b/sci-geosciences/pymap3d/Manifest new file mode 100644 index 000000000000..b072109dc868 --- /dev/null +++ b/sci-geosciences/pymap3d/Manifest @@ -0,0 +1,2 @@ +DIST pymap3d-2.9.1.tar.gz 47889 BLAKE2B 5f070a8155719215f6a2b7a8a2585fdf855b47ff610ea86511e4e270eecd3d1c866aadf125f2f2a847f059678fe10e75c61e7c6edeaca78f62dfac43beacaa54 SHA512 ea294d5d9f9ae2b949f281c64023cd2bf4b3667ad9c76e794ac242ae833d70ed45a5a422561aede1d734108c3accbf5fda2aaadb00d27885754a8244e4fc4cb3 +DIST pymap3d-3.0.1.tar.gz 50752 BLAKE2B 98e522d92e8f4e42e59822e31340600c5f59f01576e7459425da2f38bdd74016b514ec2dbec56c39e960c1ee17b7b7271672824435f6ef5b3b96a239dce9722e SHA512 841fccae3c88f699ae19f5f4bd7d755c2065fd6e5b76f6aceb4933b6a093d34bc7b16ca88178c94f571c1a0248ca18265cdb5e580bf420314609768c871aea50 diff --git a/sci-geosciences/pymap3d/metadata.xml b/sci-geosciences/pymap3d/metadata.xml new file mode 100644 index 000000000000..83943bd9d184 --- /dev/null +++ b/sci-geosciences/pymap3d/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <upstream> + <remote-id type="github">geospace-code/pymap3d</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-geosciences/pymap3d/pymap3d-2.9.1-r1.ebuild b/sci-geosciences/pymap3d/pymap3d-2.9.1-r1.ebuild new file mode 100644 index 000000000000..7592077385f1 --- /dev/null +++ b/sci-geosciences/pymap3d/pymap3d-2.9.1-r1.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_{9..12} ) +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/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 7619af993276..e2761b3b0e7a 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,3 +1,3 @@ -DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22 -DIST qgis-3.4.7.tar.bz2 74373862 BLAKE2B 9b3a9987df406c703b0cdac36bc5267cca23b77e1c9f142e74b5170018c7c1ccdca738908412803a6703b0d2e64ef7733f2f4e986188cf90ce79a65e72113a55 SHA512 3977a49378ecaa27556ce76c6755281e477cea4a29a6a2ab496ef8e7b9b488cb31f9a124eece6f8a4974c98f0ae5396061e8c14fd577655bb4d428b818d1e1db +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_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch deleted file mode 100644 index 5a1e8fcd9551..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/PyQtMacros.cmake 2016-08-26 05:58:37.000000000 -0600 -+++ b/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600 -@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles ) - ELSE(WIN32) - # TODO osx - SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh") -- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib") -+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}") - ENDIF(WIN32) - - FOREACH(it ${ARGN}) diff --git a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch deleted file mode 100644 index 9e56bf5ae959..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 55473e7e21a068dec904fd4146642c33a44ce22a Mon Sep 17 00:00:00 2001 -From: Denis Rouzaud <denis.rouzaud@gmail.com> -Date: Wed, 8 Aug 2018 13:40:04 +0200 -Subject: [PATCH] fix build without webkit - ---- - src/gui/qgsmaptip.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp -index d9fe4a32607..7af6f97672c 100644 ---- a/src/gui/qgsmaptip.cpp -+++ b/src/gui/qgsmaptip.cpp -@@ -155,12 +155,16 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer, - - void QgsMapTip::resizeContent() - { -+#if WITH_QTWEBKIT - // Get the content size - QWebElement container = mWebView->page()->mainFrame()->findFirstElement( - QStringLiteral( "#QgsWebViewContainer" ) ); - int width = container.geometry().width() + MARGIN_VALUE * 2; - int height = container.geometry().height() + MARGIN_VALUE * 2; - mWidget->resize( width, height ); -+#else -+ mWebView->adjustSize(); -+#endif - } - - void QgsMapTip::clear( QgsMapCanvas * )
\ No newline at end of file diff --git a/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch b/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch new file mode 100644 index 000000000000..db76ec041d1f --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch @@ -0,0 +1,27 @@ +From 3754e386b38e84e50fffde5bab00af0512eb62ba Mon Sep 17 00:00:00 2001 +From: Blottiere Paul <blottiere.paul@gmail.com> +Date: Thu, 27 Jul 2023 06:20:26 +0200 +Subject: [PATCH] Fix build on Arch with recent version of protobuf + +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e43125b6a39b..7008b2bde246 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -370,7 +370,12 @@ if(WITH_CORE) + message (SEND_ERROR "sqlite3 dependency was not found!") + endif() + +- find_package(Protobuf REQUIRED) # for decoding of vector tiles in MVT format ++ find_package(Protobuf CONFIG) ++ find_package(Protobuf REQUIRED) ++ if((${Protobuf_VERSION} GREATER 4.23) OR (${Protobuf_VERSION} EQUAL 4.23)) ++ set(Protobuf_LITE_LIBRARY protobuf::libprotobuf-lite) ++ endif() ++ + message(STATUS "Found Protobuf: ${Protobuf_LIBRARIES}") + if (NOT Protobuf_PROTOC_EXECUTABLE) + message (SEND_ERROR "Protobuf library's 'protoc' tool was not found!") diff --git a/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch new file mode 100644 index 000000000000..b41ba70003c1 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch @@ -0,0 +1,41 @@ +From 4de207e0ca26067146ac58133e64c17fdf755c6a Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +Date: Sun, 9 Jul 2023 10:01:49 +0200 +Subject: [PATCH] Fix build with exiv2 0.28 + +(cherry picked from commit 32f5418fc4f7bb2ee986dee1824ff2989c113a94) +--- + src/core/raster/qgsexiftools.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/core/raster/qgsexiftools.cpp b/src/core/raster/qgsexiftools.cpp +index 1fbd6a84a8c..f64e07e9165 100644 +--- a/src/core/raster/qgsexiftools.cpp ++++ b/src/core/raster/qgsexiftools.cpp +@@ -94,7 +94,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it + case Exiv2::signedLong: + case Exiv2::unsignedLongLong: + case Exiv2::signedLongLong: ++#if EXIV2_TEST_VERSION (0, 28, 0) ++ val = QVariant::fromValue( it->toUint32() ); ++#else + val = QVariant::fromValue( it->toLong() ); ++#endif + break; + + case Exiv2::tiffDouble: +@@ -108,7 +112,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it + case Exiv2::signedByte: + case Exiv2::tiffIfd: + case Exiv2::tiffIfd8: ++#if EXIV2_TEST_VERSION (0, 28, 0) ++ val = QVariant::fromValue( static_cast< int >( it->toUint32() ) ); ++#else + val = QVariant::fromValue( static_cast< int >( it->toLong() ) ); ++#endif + break; + + case Exiv2::date: +-- +2.41.0 + diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch deleted file mode 100644 index 97f8ac12858c..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 28 Apr 2019 12:41:51 +0200 -Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4626042ca4..fe93ff3c4f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -660,7 +660,7 @@ IF (WITH_CORE) - SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis) - SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins) - SET (DEFAULT_INCLUDE_SUBDIR include/qgis) -- SET (DEFAULT_QML_SUBDIR qml) -+ SET (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml) - - SET (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server) - ENDIF (APPLE) --- -2.21.0 - diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch deleted file mode 100644 index ec971cef7792..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 28 Apr 2019 00:10:21 +0200 -Subject: [PATCH] cmake: Use FeatureSummary - ---- - CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4dff8ea0f4..4626042ca4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -71,6 +71,8 @@ IF(NOT MSVC) - endif(USE_CCACHE) - endif(NOT MSVC) - -+include(FeatureSummary) -+ - # in generated makefiles use relative paths so the project dir is moveable - # Note commented out since it cause problems but it would be nice to resolve these and enable - # -@@ -937,3 +939,5 @@ ENDIF (WITH_CORE) - IF (UNIX AND NOT APPLE) - ADD_SUBDIRECTORY(linux) - ENDIF (UNIX AND NOT APPLE) -+ -+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.21.0 - diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index 56b0fd7a351e..6a7c8a916f27 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> @@ -16,12 +16,16 @@ <use> <flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag> <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag> - <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag> + <flag name="grass">Add support for grass</flag> <flag name="hdf5">Enable MDAL support for <pkg>sci-libs/hdf5</pkg></flag> <flag name="mapserver">Determines whether mapserver should be built</flag> <flag name="netcdf">Enable MDAL support for GRIB and XMDF formats</flag> - <flag name="opencl">Enable OpenCL support</flag> + <flag name="pdal">Enable support for PDAL for point clouds via <pkg>sci-libs/pdal</pkg></flag> <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> </use> + <upstream> + <remote-id type="github">qgis/QGIS</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-geosciences/qgis/qgis-3.2.3.ebuild b/sci-geosciences/qgis/qgis-3.2.3.ebuild deleted file mode 100644 index 7c4de2ebd699..000000000000 --- a/sci-geosciences/qgis/qgis-3.2.3.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -PYTHON_REQ_USE="sqlite" -QT_MIN_VER="5.9.4" - -if [[ ${PV} != *9999 ]]; then - 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" -else - GIT_ECLASS="git-r3" - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" -fi -inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils -unset GIT_ECLASS - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/" - -LICENSE="GPL-2+ GPL-3+" -SLOT="0" -IUSE="3d examples georeferencer grass mapserver oracle polar postgres python +webkit" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" - -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] - >=dev-db/spatialite-4.2.0 - dev-db/sqlite:3 - dev-libs/expat - dev-libs/libzip:= - dev-libs/qtkeychain[qt5(+)] - >=dev-qt/designer-${QT_MIN_VER}:5 - >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 - >=dev-qt/qtcore-${QT_MIN_VER}:5 - >=dev-qt/qtgui-${QT_MIN_VER}:5 - >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] - >=dev-qt/qtpositioning-${QT_MIN_VER}:5 - >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 - >=dev-qt/qtsvg-${QT_MIN_VER}:5 - >=dev-qt/qtsql-${QT_MIN_VER}:5 - >=dev-qt/qtwidgets-${QT_MIN_VER}:5 - >=dev-qt/qtxml-${QT_MIN_VER}:5 - >=sci-libs/gdal-2.2.3:=[geos] - sci-libs/geos - sci-libs/libspatialindex:= - sci-libs/proj - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) - georeferencer? ( sci-libs/gsl:= ) - grass? ( =sci-geosciences/grass-7*:= ) - mapserver? ( dev-libs/fcgi ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${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/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ) - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/linguist-tools-${QT_MIN_VER}:5 - >=dev-qt/qttest-${QT_MIN_VER}:5 - >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 - sys-devel/bison - sys-devel/flex - python? ( ${PYTHON_DEPS} ) -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -PATCHES=( - # git master - "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" - "${FILESDIR}/${PN}-3.2.1-qtwebkit-optional.patch" # bug 663394 -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \ - -i CMakeLists.txt || die "Failed to fix lrelease path" - - sed -e "/QT_LRELEASE_EXECUTABLE/d" \ - -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \ - -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \ - -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake" - - cd src/plugins || die -} - -src_configure() { - local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=/share/man/ - -DBUILD_SHARED_LIBS=ON - -DQGIS_LIB_SUBDIR=$(get_libdir) - -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis - -DQWT_INCLUDE_DIR=/usr/include/qwt6 - -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so - -DPEDANTIC=OFF - -DWITH_APIDOC=OFF - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DWITH_3D=$(usex 3d) - -DWITH_GEOREFERENCER=$(usex georeferencer) - -DWITH_GRASS7=$(usex grass) - -DWITH_SERVER=$(usex mapserver) - -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QTWEBKIT=$(usex webkit) - ) - - if use grass; then - mycmakeargs+=( - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 - ) - fi - - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) - - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - domenu debian/qgis.desktop - - local size type - for size in 16 22 24 32 48 64 96 128 256; do - newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png - newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png - for type in qgs qml qlr qpt; do - newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png - done - done - newicon -s scalable images/icons/qgis_icon.svg qgis.svg - - 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 "${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 - if has_version "<sci-geosciences/qgis-3"; then - elog "QGIS is now based on PyQt5. Old scripts may not work anymore." - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild new file mode 100644 index 000000000000..6b2233260c1e --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild @@ -0,0 +1,284 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +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 ~x86" +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 polar postgres python qml serial test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + mapserver? ( python ) + 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] + >=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/qtnetwork:5[ssl] + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-gfx/exiv2:= + >=sci-libs/gdal-3.0.4:=[geos] + 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 ) + 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:= ) + polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) + postgres? ( dev-db/postgresql:= ) + python? ( + ${PYTHON_DEPS} + >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/owslib[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + ') + ) + qml? ( dev-qt/qtdeclarative:5 ) + serial? ( dev-qt/qtserialport:5 ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/qttest:5 +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" +BDEPEND="${PYTHON_DEPS} + dev-qt/linguist-tools:5 + 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}] + ') + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.28.9-exiv2-0.28.patch" # 3.34.0; bug 906470 + "${FILESDIR}/${P}-protobuf-23.patch" # git master; bug 912846 +) + +src_prepare() { + cmake_src_prepare + # Tests want to be run inside a git repo + if [[ ${PV} != *9999* ]]; then + if use test; then + git init -q || die + git config user.email "larry@gentoo.org" || die + git config 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 + -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=$(usex polar) + -DWITH_PDAL=$(usex pdal) + -DWITH_POSTGRESQL=$(usex postgres) + -DWITH_BINDINGS=$(usex python) + -DWITH_CUSTOM_WIDGETS=$(usex python) + -DWITH_QUICK=$(usex qml) + -DWITH_QT5SERIALPORT=$(usex serial) + -DWITH_QTWEBKIT=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 + + # 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$)' + + --output-on-failure + ) + + virtx cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + insinto /usr/share/mime/packages + doins debian/qgis.xml + + if use examples; then + docinto examples + dodoc -r "${WORKDIR}"/qgis_sample_data/. + docompress -x /usr/share/doc/${PF}/examples + fi + + if use python; then + python_optimize + python_optimize "${ED}"/usr/share/qgis/python + fi + + if use grass; then + python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts + fi +} + +pkg_postinst() { + if use postgres; then + elog "If you don't intend to use an external PostGIS server" + elog "you should install:" + elog " dev-db/postgis" + elif use python; then + elog "Support of PostgreSQL is disabled." + elog "But some installed python-plugins import the psycopg2 module." + elog "If you do not need these plugins just disable them" + elog "in the Plugins menu, else you need to set USE=\"postgres\"" + fi + + xdg_pkg_postinst +} diff --git a/sci-geosciences/qgis/qgis-3.36.1.ebuild b/sci-geosciences/qgis/qgis-3.36.1.ebuild new file mode 100644 index 000000000000..f0cc12843e19 --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.36.1.ebuild @@ -0,0 +1,285 @@ +# 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 ~x86" +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 polar postgres python qml test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + mapserver? ( python ) + 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] + >=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 + 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 ) + 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:= ) + polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) + 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/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/requests[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + ') + ) + qml? ( dev-qt/qtdeclarative:5 ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/qttest:5 +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" +BDEPEND="${PYTHON_DEPS} + dev-qt/linguist-tools:5 + 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}] + ') + ) +" + +src_prepare() { + cmake_src_prepare + # Tests want to be run inside a git repo + if [[ ${PV} != *9999* ]]; then + if use test; then + git init -q || die + git config user.email "larry@gentoo.org" || die + git config 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 + -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=$(usex polar) + -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 + + # 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$)' + + --output-on-failure + ) + + virtx cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + insinto /usr/share/mime/packages + doins debian/qgis.xml + + if use examples; then + docinto examples + dodoc -r "${WORKDIR}"/qgis_sample_data/. + docompress -x /usr/share/doc/${PF}/examples + fi + + if use python; then + python_optimize + python_optimize "${ED}"/usr/share/qgis/python + fi + + if use grass; then + python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts + fi +} + +pkg_postinst() { + if use postgres; then + elog "If you don't intend to use an external PostGIS server" + elog "you should install:" + elog " dev-db/postgis" + elif use python; then + elog "Support of PostgreSQL is disabled." + elog "But some installed python-plugins import the psycopg2 module." + elog "If you do not need these plugins just disable them" + elog "in the Plugins menu, else you need to set USE=\"postgres\"" + fi + + xdg_pkg_postinst +} diff --git a/sci-geosciences/qgis/qgis-3.4.7.ebuild b/sci-geosciences/qgis/qgis-3.4.7.ebuild deleted file mode 100644 index c4b4335cecb7..000000000000 --- a/sci-geosciences/qgis/qgis-3.4.7.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6} ) -PYTHON_REQ_USE="sqlite" -QT_MIN_VER="5.9.4" - -if [[ ${PV} = *9999 ]]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" - inherit git-r3 -else - SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 - examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" -fi -inherit cmake-utils desktop python-single-r1 qmake-utils xdg - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/" - -LICENSE="GPL-2+ GPL-3+" -SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" - -BDEPEND=" - >=dev-qt/linguist-tools-${QT_MIN_VER}:5 - sys-devel/bison - sys-devel/flex -" -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] - >=dev-db/spatialite-4.2.0 - dev-db/sqlite:3 - dev-libs/expat - dev-libs/libzip:= - dev-libs/qtkeychain[qt5(+)] - >=dev-qt/designer-${QT_MIN_VER}:5 - >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 - >=dev-qt/qtcore-${QT_MIN_VER}:5 - >=dev-qt/qtgui-${QT_MIN_VER}:5 - >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] - >=dev-qt/qtpositioning-${QT_MIN_VER}:5 - >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 - >=dev-qt/qtserialport-${QT_MIN_VER}:5 - >=dev-qt/qtsvg-${QT_MIN_VER}:5 - >=dev-qt/qtsql-${QT_MIN_VER}:5 - >=dev-qt/qtwidgets-${QT_MIN_VER}:5 - >=dev-qt/qtxml-${QT_MIN_VER}:5 - >=sci-libs/gdal-2.2.3:=[geos] - sci-libs/geos - sci-libs/libspatialindex:= - sci-libs/proj - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) - georeferencer? ( sci-libs/gsl:= ) - grass? ( =sci-geosciences/grass-7*:= ) - hdf5? ( sci-libs/hdf5:= ) - mapserver? ( dev-libs/fcgi ) - netcdf? ( sci-libs/netcdf:= ) - opencl? ( virtual/opencl ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${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/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ) - qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qttest-${QT_MIN_VER}:5 - >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 - python? ( ${PYTHON_DEPS} ) -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -PATCHES=( - # git master - "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" - # TODO upstream - "${FILESDIR}/${P}-featuresummary.patch" - "${FILESDIR}/${P}-default-qmldir.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \ - -i CMakeLists.txt || die # TODO fixed in master -} - -src_configure() { - local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=share/man/ - -DQGIS_LIB_SUBDIR=$(get_libdir) - -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis - -DQWT_INCLUDE_DIR=/usr/include/qwt6 - -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so - -DPEDANTIC=OFF - -DUSE_CCACHE=OFF - -DWITH_APIDOC=OFF - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DWITH_3D=$(usex 3d) - -DWITH_GEOREFERENCER=$(usex georeferencer) - -DWITH_GRASS7=$(usex grass) - $(cmake-utils_use_find_package hdf5 HDF5) - -DWITH_SERVER=$(usex mapserver) - $(cmake-utils_use_find_package netcdf NetCDF) - -DUSE_OPENCL=$(usex opencl) - -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=$(usex webkit) - ) - - if use grass; then - mycmakeargs+=( - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 - ) - fi - - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) - - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop - - local size type - for size in 16 22 24 32 48 64 96 128 256; do - newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png - newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png - for type in qgs qml qlr qpt; do - newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png - done - done - newicon -s scalable images/icons/qgis_icon.svg qgis.svg - - 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 "${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 - if has_version "<sci-geosciences/qgis-3"; then - elog "QGIS is now based on PyQt5. Old scripts may not work anymore." - fi - - xdg_pkg_postinst -} diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index a541d6c46fd2..1c5971b726cc 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -1,13 +1,16 @@ -# Copyright 1999-2019 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_{5,6} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" -QT_MIN_VER="5.9.4" -if [[ ${PV} = *9999 ]]; then +# 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 @@ -15,50 +18,58 @@ else examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" KEYWORDS="~amd64 ~x86" fi -inherit cmake-utils desktop python-single-r1 qmake-utils xdg +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 examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" -BDEPEND=" - >=dev-qt/linguist-tools-${QT_MIN_VER}:5 - sys-devel/bison - sys-devel/flex +REQUIRED_USE="${PYTHON_REQUIRED_USE} + mapserver? ( python ) + 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] >=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-${QT_MIN_VER}:5 - >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 - >=dev-qt/qtcore-${QT_MIN_VER}:5 - >=dev-qt/qtgui-${QT_MIN_VER}:5 - >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] - >=dev-qt/qtpositioning-${QT_MIN_VER}:5 - >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 - >=dev-qt/qtserialport-${QT_MIN_VER}:5 - >=dev-qt/qtsvg-${QT_MIN_VER}:5 - >=dev-qt/qtsql-${QT_MIN_VER}:5 - >=dev-qt/qtwidgets-${QT_MIN_VER}:5 - >=dev-qt/qtxml-${QT_MIN_VER}:5 - >=sci-libs/gdal-2.2.3:=[geos] + 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 + media-gfx/exiv2:= + >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= - sci-libs/proj + >=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-${QT_MIN_VER}:5 ) + 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) - grass? ( =sci-geosciences/grass-7*:= ) + grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) @@ -67,91 +78,151 @@ COMMON_DEPEND=" dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) + pdal? ( sci-libs/pdal:= ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${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/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + >=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/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/requests[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + ') ) - qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) + qml? ( dev-qt/qtdeclarative:5 ) " DEPEND="${COMMON_DEPEND} - >=dev-qt/qttest-${QT_MIN_VER}:5 - >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 - python? ( ${PYTHON_DEPS} ) + dev-qt/qttest:5 " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -PATCHES=( - # git master - "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" - # TODO upstream - "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" - "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} +BDEPEND="${PYTHON_DEPS} + dev-qt/linguist-tools:5 + 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}] + ') + ) +" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare + # Tests want to be run inside a git repo + if [[ ${PV} != *9999* ]]; then + if use test; then + git init -q || die + git config user.email "larry@gentoo.org" || die + git config 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 - -DWITH_APIDOC=OFF + -DWITH_ANALYSIS=ON + -DWITH_APIDOC=$(usex doc) + -DWITH_GUI=ON -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF + -DENABLE_TESTS=$(usex test) -DWITH_3D=$(usex 3d) - -DWITH_GEOREFERENCER=$(usex georeferencer) - -DWITH_GRASS7=$(usex grass) - $(cmake-utils_use_find_package hdf5 HDF5) + -DWITH_GSL=$(usex georeferencer) + $(cmake_use_find_package hdf5 HDF5) -DWITH_SERVER=$(usex mapserver) - $(cmake-utils_use_find_package netcdf NetCDF) + $(cmake_use_find_package netcdf NetCDF) -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) -DWITH_QWTPOLAR=$(usex polar) + -DWITH_PDAL=$(usex pdal) -DWITH_POSTGRESQL=$(usex postgres) -DWITH_BINDINGS=$(usex python) -DWITH_CUSTOM_WIDGETS=$(usex python) -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=$(usex webkit) + -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 - mycmakeargs+=( - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 - ) + # 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 ) @@ -160,23 +231,22 @@ src_configure() { addpredict /dev/dri/renderD128 addpredict /dev/dri/renderD129 - cmake-utils_src_configure + cmake_src_configure } -src_install() { - cmake-utils_src_install +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$)' - newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop + --output-on-failure + ) - local size type - for size in 16 22 24 32 48 64 96 128 256; do - newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png - newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png - for type in qgs qml qlr qpt; do - newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png - done - done - newicon -s scalable images/icons/qgis_icon.svg qgis.svg + virtx cmake_src_test -j1 +} + +src_install() { + cmake_src_install insinto /usr/share/mime/packages doins debian/qgis.xml @@ -188,6 +258,7 @@ src_install() { fi if use python; then + python_optimize python_optimize "${ED}"/usr/share/qgis/python fi @@ -207,9 +278,6 @@ pkg_postinst() { elog "If you do not need these plugins just disable them" elog "in the Plugins menu, else you need to set USE=\"postgres\"" fi - if has_version "<sci-geosciences/qgis-3"; then - elog "QGIS is now based on PyQt5. Old scripts may not work anymore." - fi xdg_pkg_postinst } diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index 11b1647491a8..14aa90976ed8 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,4 +1 @@ -DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5 -DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9 SHA512 c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713 -DIST qmapshack-1.12.3.tar.gz 12029443 BLAKE2B 8d7f117c8379f7181ce68f79f460f59342cf654179c8b85839fe003e06167765e3e2292e14b4bc71c3ba1aeb388fcbb77faccdd57748335c1df8500f9e52ba41 SHA512 01a2b73f2f432a24b614c4a325e0b0a2aaf5b6ef75c5a7fbeb2be341adc7c46faa71cf7e9f4fdeb769d546b7a760be553a38ac6cc1c5c2c2d044edd37f550a85 -DIST qmapshack-1.13.0.tar.gz 12323773 BLAKE2B ea9cc15376546af442c6874e9321dfda268f523edb9908418baa4b3286339b4274f3c4694bebe036fb24ea3af82da1195d323c5e7484ca49039b9a526c29fa12 SHA512 cdc876a73d855573854691e3ef1d685499c9da381eb028e4a6e80dcd243df68caa66c92057fc1b896fce2be20e6d2ca43499b0e6827f804f27a0e8cc3749a100 +DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c diff --git a/sci-geosciences/qmapshack/files/FindPROJ4.cmake b/sci-geosciences/qmapshack/files/FindPROJ4.cmake deleted file mode 100644 index 093deaa79aed..000000000000 --- a/sci-geosciences/qmapshack/files/FindPROJ4.cmake +++ /dev/null @@ -1,152 +0,0 @@ -#.rst: -# FindPROJ4 -# -------- -# -# Find the proj includes and library. -# -# IMPORTED Targets -# ^^^^^^^^^^^^^^^^ -# -# This module defines :prop_tgt:`IMPORTED` target ``PROJ4::proj``, -# if Proj.4 has been found. -# -# Result Variables -# ^^^^^^^^^^^^^^^^ -# -# This module defines the following variables: -# -# :: -# -# PROJ4_INCLUDE_DIRS - where to find proj_api.h, etc. -# PROJ4_LIBRARIES - List of libraries when using libproj. -# PROJ4_FOUND - True if libproj found. -# -# :: -# -# PROJ4_VERSION - The version of libproj found (x.y.z) -# PROJ4_VERSION_MAJOR - The major version of libproj -# PROJ4_VERSION_MINOR - The minor version of libproj -# PROJ4_VERSION_PATCH - The patch version of libproj -# PROJ4_VERSION_TWEAK - always 0 -# PROJ4_VERSION_COUNT - The number of version components, always 3 -# -# Hints -# ^^^^^ -# -# A user may set ``PROJ4_ROOT`` to a libproj installation root to tell this -# module where to look exclusively. - -#============================================================================= -# Copyright 2016 Kai Pastor -# -# -# This file was derived from CMake 3.5's module FindZLIB.cmake -# which has the following terms: -# -# Copyright 2001-2011 Kitware, Inc. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# * The names of Kitware, Inc., the Insight Consortium, or the names of -# any consortium members, or of any contributors, may not be used to -# endorse or promote products derived from this software without -# specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#============================================================================= - -# Search PROJ4_ROOT exclusively if it is set. -if(PROJ4_ROOT) - set(_PROJ4_SEARCH PATHS ${PROJ4_ROOT} NO_DEFAULT_PATH) -else() - set(_PROJ4_SEARCH) -endif() - -find_path(PROJ4_INCLUDE_DIR NAMES proj_api.h ${_PROJ4_SEARCH} PATH_SUFFIXES include) -mark_as_advanced(PROJ4_INCLUDE_DIR) - -if(PROJ4_INCLUDE_DIR AND EXISTS "${PROJ4_INCLUDE_DIR}/proj_api.h") - file(STRINGS "${PROJ4_INCLUDE_DIR}/proj_api.h" PROJ4_H REGEX "^#define PJ_VERSION [0-9]+$") - - string(REGEX REPLACE "^.*PJ_VERSION ([0-9]).*$" "\\1" PROJ4_VERSION_MAJOR "${PROJ4_H}") - string(REGEX REPLACE "^.*PJ_VERSION [0-9]([0-9]).*$" "\\1" PROJ4_VERSION_MINOR "${PROJ4_H}") - string(REGEX REPLACE "^.*PJ_VERSION [0-9][0-9]([0-9]).*$" "\\1" PROJ4_VERSION_PATCH "${PROJ4_H}") - set(PROJ4_VERSION "${PROJ4_VERSION_MAJOR}.${PROJ4_VERSION_MINOR}.${PROJ4_VERSION_PATCH}") - set(PROJ4_VERSION_COUNT 3) -endif() - -# Allow PROJ4_LIBRARY to be set manually, as the location of the proj library -if(NOT PROJ4_LIBRARY) - set(PROJ4_NAMES proj) - set(PROJ4_NAMES_DEBUG projd) - if(WIN32 AND DEFINED PROJ4_VERSION_MAJOR AND DEFINED PROJ4_VERSION_MINOR) - list(APPEND PROJ4_NAMES proj_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR}) - list(APPEND PROJ4_NAMES projd_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR}) - endif() - find_library(PROJ4_LIBRARY_RELEASE NAMES ${PROJ4_NAMES} ${_PROJ4_SEARCH} PATH_SUFFIXES lib) - find_library(PROJ4_LIBRARY_DEBUG NAMES ${PROJ4_NAMES_DEBUG} ${_PROJ4_SEARCH} PATH_SUFFIXES lib) - include(SelectLibraryConfigurations) - select_library_configurations(PROJ4) -endif() - -# handle the QUIETLY and REQUIRED arguments and set PROJ4_FOUND to TRUE if -# all listed variables are TRUE -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(PROJ4 - REQUIRED_VARS - PROJ4_LIBRARY - PROJ4_INCLUDE_DIR - VERSION_VAR - PROJ4_VERSION -) - -if(PROJ4_FOUND) - set(PROJ4_INCLUDE_DIRS ${PROJ4_INCLUDE_DIR}) - - if(NOT PROJ4_LIBRARIES) - set(PROJ4_LIBRARIES ${PROJ4_LIBRARY}) - endif() - - if(NOT TARGET PROJ4::proj) - add_library(PROJ4::proj UNKNOWN IMPORTED) - set_target_properties(PROJ4::proj PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${PROJ4_INCLUDE_DIRS}") - - if(PROJ4_LIBRARY_RELEASE) - set_property(TARGET PROJ4::proj APPEND PROPERTY - IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties(PROJ4::proj PROPERTIES - IMPORTED_LOCATION_RELEASE "${PROJ4_LIBRARY_RELEASE}") - endif() - - if(PROJ4_LIBRARY_DEBUG) - set_property(TARGET PROJ4::proj APPEND PROPERTY - IMPORTED_CONFIGURATIONS DEBUG) - set_target_properties(PROJ4::proj PROPERTIES - IMPORTED_LOCATION_DEBUG "${PROJ4_LIBRARY_DEBUG}") - endif() - - if(NOT PROJ4_LIBRARY_RELEASE AND NOT PROJ4_LIBRARY_DEBUG) - set_property(TARGET PROJ4::proj APPEND PROPERTY - IMPORTED_LOCATION "${PROJ4_LIBRARY}") - endif() - endif() -endif() diff --git a/sci-geosciences/qmapshack/files/qmapshack-positioning.patch b/sci-geosciences/qmapshack/files/qmapshack-positioning.patch deleted file mode 100644 index c0f13fc884e5..000000000000 --- a/sci-geosciences/qmapshack/files/qmapshack-positioning.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -U2 qmapshack-1.13.0.orig/CMakeLists.txt qmapshack-1.13.0/CMakeLists.txt ---- qmapshack-1.13.0.orig/CMakeLists.txt 2019-04-08 18:08:10.000000000 +0200 -+++ qmapshack-1.13.0/CMakeLists.txt 2019-05-06 23:19:15.330580322 +0200 -@@ -131,4 +131,5 @@ - find_package(Qt5LinguistTools REQUIRED) - find_package(Qt5PrintSupport REQUIRED) -+find_package(Qt5Positioning REQUIRED) - find_package(Qt5UiTools REQUIRED) - find_package(Qt5Network REQUIRED) diff --git a/sci-geosciences/qmapshack/metadata.xml b/sci-geosciences/qmapshack/metadata.xml index 1ba0b96f82a1..e3fe199e1bb2 100644 --- a/sci-geosciences/qmapshack/metadata.xml +++ b/sci-geosciences/qmapshack/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>grozin@gentoo.org</email> @@ -14,8 +14,9 @@ all the GPS recordings of your past exciting adventures. QMapShack is the next generation of the famous QLandkarte GT application. And of course it's even better and easier to use. -</longdescription> + </longdescription> <upstream> + <remote-id type="github">Maproom/qmapshack</remote-id> <remote-id type="bitbucket">maproom/qmapshack</remote-id> </upstream> </pkgmetadata> diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild deleted file mode 100644 index 29267c1a3828..000000000000 --- a/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils xdg-utils gnome2-utils - -DESCRIPTION="GPS mapping utility" -HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home" -SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz" -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="dev-qt/qtwebengine:5[widgets] - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtprintsupport:5 - dev-qt/qtdbus:5 - dev-qt/qttest:5 - dev-qt/designer:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-libs/quazip - >=sci-geosciences/routino-3.1.1 - sci-libs/gdal - sci-libs/proj - sci-libs/alglib" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild deleted file mode 100644 index d7cc3ab65fff..000000000000 --- a/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils xdg-utils gnome2-utils - -DESCRIPTION="GPS mapping utility" -HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home" -SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz" -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwebengine:5[widgets] - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtprintsupport:5 - dev-qt/qtdbus:5 - dev-qt/qttest:5 - dev-qt/designer:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-libs/quazip - >=sci-geosciences/routino-3.1.1 - sci-libs/gdal - sci-libs/proj - sci-libs/alglib" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild deleted file mode 100644 index 6dfd76c879ad..000000000000 --- a/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils xdg-utils gnome2-utils - -DESCRIPTION="GPS mapping utility" -HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home" -SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz" -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwebengine:5[widgets] - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtprintsupport:5 - dev-qt/qtdbus:5 - dev-qt/qttest:5 - dev-qt/designer:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-libs/quazip - >=sci-geosciences/routino-3.1.1 - sci-libs/gdal - sci-libs/proj - sci-libs/alglib" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/qmapshack/qmapshack-1.13.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.13.0.ebuild deleted file mode 100644 index a1e08508c620..000000000000 --- a/sci-geosciences/qmapshack/qmapshack-1.13.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils xdg-utils gnome2-utils - -DESCRIPTION="GPS mapping utility" -HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home" -SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz" -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwebengine:5[widgets] - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtprintsupport:5 - dev-qt/qtpositioning:5 - dev-qt/qtdbus:5 - dev-qt/qttest:5 - dev-qt/designer:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-libs/quazip - >=sci-geosciences/routino-3.1.1 - sci-libs/gdal - >=sci-libs/proj-5.0.0 - sci-libs/alglib" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -PATCHES=( "${FILESDIR}"/${PN}-positioning.patch ) - -src_prepare() { - default - cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1.ebuild new file mode 100644 index 000000000000..6df2a19e36ff --- /dev/null +++ b/sci-geosciences/qmapshack/qmapshack-1.17.1.ebuild @@ -0,0 +1,45 @@ +# 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" +SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + dev-libs/quazip:0=[qt5(+)] + dev-qt/designer:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5[widgets] + dev-qt/qthelp:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtwebengine:5[widgets] + >=sci-geosciences/routino-3.1.1 + sci-libs/alglib + sci-libs/gdal:= + >=sci-libs/proj-8:= +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +S="${WORKDIR}"/${PN}-V_${PV} + +src_prepare() { + cmake_src_prepare + xdg_environment_reset +} + +src_install() { + docompress -x /usr/share/doc/${PF}/html + cmake_src_install + mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed" +} diff --git a/sci-geosciences/readosm/Manifest b/sci-geosciences/readosm/Manifest index ffc5bb750e1c..1cb3a357e0b8 100644 --- a/sci-geosciences/readosm/Manifest +++ b/sci-geosciences/readosm/Manifest @@ -1 +1 @@ -DIST readosm-1.0.0e.tar.gz 1096062 BLAKE2B 4f105dd3db158ea48d40e7ee826467e493595ebb1e8edc2f592c7390e7a7f708e8834d52c4d3ffbc8094ba64553a4d95bb2865798dd48ef0591e9dbdb6a18222 SHA512 fde22e66b8ed80de168ff9302e8f9312a1a3111c7326f2db45d3176df98030f77e6590416ec5a5d0aef445f707a62cb091a47ee7533bede65eebf8ebf0fa4c28 +DIST readosm-1.1.0a.tar.gz 1099129 BLAKE2B 28062238333fac9cff41aa30cdb606ee2ae3873bd4c251aa3d1abc31aca5003bda1898d8c651dfac499fe1d3e17b7a82bd16028aa873147719ad7c285a0264d6 SHA512 ec8516cdd0b02027cef8674926653f8bc76e2082c778b02fb2ebcfa6d01e21757aaa4fd5d5104059e2f5ba97190183e60184f381bfd592a635805aa35cd7a682 diff --git a/sci-geosciences/readosm/metadata.xml b/sci-geosciences/readosm/metadata.xml index 2761b1b9e5c0..080560a80ec2 100644 --- a/sci-geosciences/readosm/metadata.xml +++ b/sci-geosciences/readosm/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-geosciences@gentoo.org</email> diff --git a/sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild b/sci-geosciences/readosm/readosm-1.1.0a.ebuild index 84172b249675..2ef7cd525d42 100644 --- a/sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild +++ b/sci-geosciences/readosm/readosm-1.1.0a.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Library to extract valid data from an Open Street Map input file" -HOMEPAGE="https://www.gaia-gis.it/spatialite" +HOMEPAGE="https://www.gaia-gis.it/fossil/readosm" SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz" -LICENSE="MPL-1.1" +LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="static-libs" RDEPEND=" dev-libs/expat @@ -19,11 +18,11 @@ RDEPEND=" DEPEND="${RDEPEND}" src_configure() { - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { default - find "${D}" -name '*.la' -delete || die + + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest index c07830274f8c..51cece8a0bd0 100644 --- a/sci-geosciences/routino/Manifest +++ b/sci-geosciences/routino/Manifest @@ -1,2 +1 @@ -DIST routino-3.1.1.tgz 1795118 BLAKE2B 4b8a44d917f2f71e333eb233eebee37de6d19adac7b31111f9b244e125d9a9a54bbbec5e166d53f3ac435f27dcb5633c9626e0ffc4025d5e8dc0cbaed6274800 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede -DIST routino-3.2.tgz 2463662 BLAKE2B 4be17e83105d95052a9fbe0158b15bf5d64b4f720fb1bb61cbbb5fcd61451b933507e4dcc8867bff5e8602c6e681e916e45328d2a0ce766e9ab37366984cf378 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf +DIST routino-3.4.1.tgz 2591859 BLAKE2B cdc2018cb735c190258c9f4ebf09ad14d27923fcc520b3c58fb910e63d93e280bbad345ca1c82b31284827cf914f5da45b8f5a69c9ac1721b3f056dfd9d2e918 SHA512 c9e6dea5c60a265f7a5c7217711d2c880f201d1102740d756e10f731ace785a7afd7b84cdfb8485ee3af58b5a0f1b0e8e273dab1deedd319b27c77d400b30baa diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch deleted file mode 100644 index ac54fcf9f887..000000000000 --- a/sci-geosciences/routino/files/routino-3.1.1.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- routino-3.1.1/Makefile.conf 2017-10-22 15:55:10.420531850 +0200 -+++ routino-3.1.1/Makefile.conf.new 2017-10-22 15:55:32.180533067 +0200 -@@ -45,11 +45,11 @@ - # Installation locations (edit if required) - - ifneq ($(HOST),MINGW) --prefix=/usr/local -+prefix=/usr - bindir=$(prefix)/bin - incdir=$(prefix)/include - libdir=$(prefix)/lib --docdir=$(prefix)/doc/routino -+docdir=$(prefix)/share/doc/$(PF) - datadir=$(prefix)/share/routino - else - prefix="c:/Program Files/Routino" -@@ -74,16 +74,16 @@ - - - # Maths library --LDFLAGS=-lm -+LDFLAGS+=-lm - - # Language dialect selection --CFLAGS=-std=c99 -+CFLAGS+=-std=c99 - - # Warning options - CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic - - # Optimisation options --CFLAGS+=-O3 -+#CFLAGS+=-O3 - CFLAGS+=-ffast-math - - # Optimisation option (only works if compilation and execution use exactly the same CPU architecture). -@@ -118,7 +118,7 @@ - endif - - # Put the current directory in the shared library path for the router using libroutino --LDFLAGS_LDSO=-Wl,-R. -+#LDFLAGS_LDSO=-Wl,-R. - - - # Required for multi-threaded support (comment these two lines out if not required) -@@ -139,8 +139,8 @@ - - - # Required for xz support (uncomment these two lines if required) --#CFLAGS+=-DUSE_XZ --#LDFLAGS+=-llzma -+CFLAGS+=-DUSE_XZ -+LDFLAGS+=-llzma - - - # Required to use stdio with files > 2GiB on 32-bit system. diff --git a/sci-geosciences/routino/files/routino-3.2.patch b/sci-geosciences/routino/files/routino-3.2.patch deleted file mode 100644 index 81b6c4d938c9..000000000000 --- a/sci-geosciences/routino/files/routino-3.2.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- routino-3.2/Makefile.conf 2017-10-22 16:03:29.917559780 +0200 -+++ routino-3.2/Makefile.conf.new 2017-10-22 16:04:23.877562797 +0200 -@@ -45,11 +45,11 @@ - # Installation locations (edit if required) - - ifneq ($(HOST),MINGW) --prefix=/usr/local -+prefix=/usr - bindir=$(prefix)/bin - incdir=$(prefix)/include - libdir=$(prefix)/lib --docdir=$(prefix)/doc/routino -+docdir=$(prefix)/share/doc/$(PF) - datadir=$(prefix)/share/routino - else - prefix="c:/Program Files/Routino" -@@ -74,16 +74,16 @@ - - - # Maths library --LDFLAGS=-lm -+LDFLAGS+=-lm - - # Language dialect selection --CFLAGS=-std=c99 -+CFLAGS+=-std=c99 - - # Warning options - CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic - - # Optimisation options --CFLAGS+=-O3 -+#CFLAGS+=-O3 - CFLAGS+=-ffast-math - - # Optimisation option (only works if compilation and execution use exactly the same CPU architecture). -@@ -118,7 +118,7 @@ - endif - - # Put the current directory in the shared library path for the router using libroutino --LDFLAGS_LDSO=-Wl,-R. -+#LDFLAGS_LDSO=-Wl,-R. - - - # Required for multi-threaded support (comment these two lines out if not required) -@@ -139,8 +139,8 @@ - - - # Required for xz support (uncomment these two lines if required) --#CFLAGS+=-DUSE_XZ --#LDFLAGS+=-llzma -+CFLAGS+=-DUSE_XZ -+LDFLAGS+=-llzma - - - # Required to use stdio with files > 2GiB on 32-bit system. diff --git a/sci-geosciences/routino/files/routino-3.3.2.patch b/sci-geosciences/routino/files/routino-3.3.2.patch new file mode 100644 index 000000000000..46c2986eea16 --- /dev/null +++ b/sci-geosciences/routino/files/routino-3.3.2.patch @@ -0,0 +1,71 @@ +diff -r -U3 routino-3.3.2.orig/Makefile routino-3.3.2/Makefile +--- routino-3.3.2.orig/Makefile 2018-10-31 02:27:41.000000000 +0700 ++++ routino-3.3.2/Makefile 2020-04-29 20:59:05.239931544 +0700 +@@ -24,7 +24,7 @@ + + # Sub-directories and sub-makefiles + +-SUBDIRS=src xml doc web extras python ++SUBDIRS=src xml doc web extras + + ######## + +diff -r -U3 routino-3.3.2.orig/Makefile.conf routino-3.3.2/Makefile.conf +--- routino-3.3.2.orig/Makefile.conf 2019-04-13 17:52:02.000000000 +0700 ++++ routino-3.3.2/Makefile.conf 2020-04-29 20:58:35.352930803 +0700 +@@ -45,11 +45,11 @@ + # Installation locations (edit if required) + + ifneq ($(HOST),MINGW) +- prefix=/usr/local ++ prefix=/usr + bindir=$(prefix)/bin + incdir=$(prefix)/include + libdir=$(prefix)/lib +- docdir=$(prefix)/doc/routino ++ docdir=$(prefix)/share/doc/${PF} + datadir=$(prefix)/share/routino + else + prefix="c:/Program Files/Routino" +@@ -82,10 +82,10 @@ + endif + + # Maths library +-LDFLAGS=-lm ++LDFLAGS+=-lm + + # Language dialect selection +-CFLAGS=-std=c99 ++CFLAGS+=-std=c99 + + # Warning options + CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic +@@ -97,7 +97,7 @@ + endif + + # Optimisation options +-CFLAGS+=-O3 ++#CFLAGS+=-O3 + + # Fast maths option - makes test cases fail slightly + CFLAGS+=-ffast-math +@@ -138,7 +138,7 @@ + endif + + # Put the current directory in the shared library path for the router using libroutino +-LDFLAGS_LDSO=-Wl,-R. ++#LDFLAGS_LDSO=-Wl,-R. + + + # Required for multi-threaded support (comment these two lines out if not required) +@@ -159,8 +159,8 @@ + + + # Required for xz support (uncomment these two lines if required) +-#CFLAGS+=-DUSE_XZ +-#LDFLAGS+=-llzma ++CFLAGS+=-DUSE_XZ ++LDFLAGS+=-llzma + + + # Required to use stdio with files > 2GiB on 32-bit system. diff --git a/sci-geosciences/routino/metadata.xml b/sci-geosciences/routino/metadata.xml index 4b9330ffe671..42758c787c2d 100644 --- a/sci-geosciences/routino/metadata.xml +++ b/sci-geosciences/routino/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>grozin@gentoo.org</email> diff --git a/sci-geosciences/routino/routino-3.1.1.ebuild b/sci-geosciences/routino/routino-3.1.1.ebuild deleted file mode 100644 index 724e40b20799..000000000000 --- a/sci-geosciences/routino/routino-3.1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Routing application based on openstreetmap data" -HOMEPAGE="http://www.routino.org/" -SRC_URI="http://www.routino.org/download/${P}.tgz" -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -DEPEND="" - -src_prepare() { - eapply "${FILESDIR}"/${P}.patch - - sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \ - -e "s@CC=gcc@CC=$(tc-getCC)@" \ - -e "s@LD=gcc@LD=$(tc-getCC)@" \ - Makefile.conf || die "failed sed" - - eapply_user -} - -src_compile() { - emake -j1 - rm README.txt - mv doc/rm README.txt . -} diff --git a/sci-geosciences/routino/routino-3.2.ebuild b/sci-geosciences/routino/routino-3.2.ebuild deleted file mode 100644 index 0420304cb506..000000000000 --- a/sci-geosciences/routino/routino-3.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Routing application based on openstreetmap data" -HOMEPAGE="http://www.routino.org/" -SRC_URI="http://www.routino.org/download/${P}.tgz" -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -DEPEND="" - -src_prepare() { - eapply "${FILESDIR}"/${P}.patch - - sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \ - -e "s@CC=gcc@CC=$(tc-getCC)@" \ - -e "s@LD=gcc@LD=$(tc-getCC)@" \ - Makefile.conf || die "failed sed" - - eapply_user -} - -src_compile() { - emake -j1 - rm README.txt || die "rm README.txt failed" - mv doc/README.txt . || die "mv doc/README.txt . failed" -} diff --git a/sci-geosciences/routino/routino-3.4.1-r1.ebuild b/sci-geosciences/routino/routino-3.4.1-r1.ebuild new file mode 100644 index 000000000000..53109cdbf056 --- /dev/null +++ b/sci-geosciences/routino/routino-3.4.1-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) +inherit toolchain-funcs distutils-r1 + +DESCRIPTION="Routing application based on openstreetmap data" +HOMEPAGE="https://routino.org/" +SRC_URI="https://routino.org/download/${P}.tgz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="python test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +BDEPEND=" + python? ( + ${PYTHON_DEPS} + dev-lang/swig[pcre] + ) +" +RDEPEND="python? ( ${PYTHON_DEPS} )" + +PATCHES=( "${FILESDIR}"/${PN}-3.3.2.patch ) + +src_prepare() { + default + + sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \ + -e "s@CC=gcc@CC=$(tc-getCC)@" \ + -e "s@LD=gcc@LD=$(tc-getCC)@" \ + Makefile.conf || die "failed sed" +} + +src_compile() { + emake -j1 + + rm README.txt || die "rm README.txt failed" + mv doc/README.txt . || die "mv doc/README.txt . failed" + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi +} + +python_compile() { + rm -f build/.timestamp || die + emake PYTHON=${EPYTHON} src/_router.c src/_database.cc || die + distutils-r1_python_compile +} + +src_test() { + emake test + + # Need to fix import issues with these + #if use python; then + # pushd python > /dev/null || die + # distutils-r1_src_test + # popd > /dev/null || die + #fi +} + +python_test() { + emake PYTHON=${EPYTHON} test +} + +src_install() { + default + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_install + newdoc README.txt README_python.txt + popd > /dev/null || die + fi +} diff --git a/sci-geosciences/routino/routino-3.4.1.ebuild b/sci-geosciences/routino/routino-3.4.1.ebuild new file mode 100644 index 000000000000..642e56f2b7a5 --- /dev/null +++ b/sci-geosciences/routino/routino-3.4.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit toolchain-funcs distutils-r1 + +DESCRIPTION="Routing application based on openstreetmap data" +HOMEPAGE="https://routino.org/" +SRC_URI="https://routino.org/download/${P}.tgz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="python test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +BDEPEND=" + python? ( + ${PYTHON_DEPS} + dev-lang/swig[pcre] + ) +" +RDEPEND="python? ( ${PYTHON_DEPS} )" + +PATCHES=( "${FILESDIR}"/${PN}-3.3.2.patch ) + +src_prepare() { + default + + sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \ + -e "s@CC=gcc@CC=$(tc-getCC)@" \ + -e "s@LD=gcc@LD=$(tc-getCC)@" \ + Makefile.conf || die "failed sed" +} + +src_compile() { + emake -j1 + + rm README.txt || die "rm README.txt failed" + mv doc/README.txt . || die "mv doc/README.txt . failed" + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi +} + +python_compile() { + rm -f build/.timestamp || die + emake PYTHON=${EPYTHON} src/_router.c src/_database.cc || die + distutils-r1_python_compile +} + +src_test() { + emake test + + # Need to fix import issues with these + #if use python; then + # pushd python > /dev/null || die + # distutils-r1_src_test + # popd > /dev/null || die + #fi +} + +python_test() { + emake PYTHON=${EPYTHON} test +} + +src_install() { + default + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_install + newdoc README.txt README_python.txt + popd > /dev/null || die + fi +} diff --git a/sci-geosciences/seawater/Manifest b/sci-geosciences/seawater/Manifest deleted file mode 100644 index f75fc8b1fb1c..000000000000 --- a/sci-geosciences/seawater/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST seawater-2.0.1.tar.gz 2680741 BLAKE2B 5c1e8f5bd3cdc7a093732657d8d774f13d9a00785ea736617b8837076e740eab384caa61ae11b6f429db7bcf57f0ee1af8fd0c6dc917f3c3b50b25ee93a88920 SHA512 9d59d5c41f46311240934e18b8727514babc4e714553ba595017a17b95edf040c10ac7161f607c7e262c751e238a909d55a639a94fab4d4ce004a4c297af1e79 -DIST seawater-3.3.4.tar.gz 22899 BLAKE2B 1f3af9e1d592b2c7075711f0431dc9198c41047e46cefcbc2466eaad92bad1e9894e63e6d3846d08df00ad21df8dc773cd1822915896658fe06e298ed36b83ef SHA512 1e448c0473809ae5022eda6b695d67db85a22767d068d7a025bdb1ad49a09f0f336e5f43b6a2fd869d39082895e45e7fa4ae2af98c1f2d613d28393f88ef27af diff --git a/sci-geosciences/seawater/metadata.xml b/sci-geosciences/seawater/metadata.xml deleted file mode 100644 index d505d3a8646a..000000000000 --- a/sci-geosciences/seawater/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="pypi">seawater</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-geosciences/seawater/seawater-2.0.1.ebuild b/sci-geosciences/seawater/seawater-2.0.1.ebuild deleted file mode 100644 index 324d8ac5d09c..000000000000 --- a/sci-geosciences/seawater/seawater-2.0.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 - -DESCRIPTION="Calculate properties of sea water. Similar to SEAWATER 3.2 for MATLAB" -HOMEPAGE="https://pypi.org/project/seawater/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" - -DOCS=( "${S}"/docs/. ) diff --git a/sci-geosciences/seawater/seawater-3.3.4.ebuild b/sci-geosciences/seawater/seawater-3.3.4.ebuild deleted file mode 100644 index 87c3c03d00c0..000000000000 --- a/sci-geosciences/seawater/seawater-3.3.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -inherit distutils-r1 - -DESCRIPTION="Calculate properties of sea water. Similar to SEAWATER 3.2 for MATLAB" -HOMEPAGE="https://pypi.org/project/seawater/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="test" # seems there are files missing - -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/oct2py[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - )" - -python_test() { - esetup.py test -} diff --git a/sci-geosciences/swmm/Manifest b/sci-geosciences/swmm/Manifest deleted file mode 100644 index 25a31b604469..000000000000 --- a/sci-geosciences/swmm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST swmm50022_engine.zip 338011 BLAKE2B a3fba4a480130903fe576ed1521cb94f54dbf350ec4200d96def10bca6842d55a1de2d17911d35b59acff70d13a31012554ca09b0cb7ac7e60f0f4ebc2e0ea98 SHA512 aa424d36c062656611bc6d6e4ced3108b6fd05806bf47ace30b44cc631860423073ad4fcafb523b2bf0ce7c73c5edc4386e5129009984d3d34f34e9260c69006 diff --git a/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch b/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch deleted file mode 100644 index c84d50f5f6b3..000000000000 --- a/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile -+++ Makefile -@@ -7,9 +7,10 @@ - rain.o rdii.o report.o routing.o runoff.o shape.o snow.o stats.o \ - statsrpt.o subcatch.o table.o toposort.o transect.o treatmnt.o xsect.o - -+LIBS += -lm - - swmm5 : $(objs) -- cc -o swmm5 -lm $(objs) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o swmm5 $(objs) $(LIBS) - - swmm5.o : consts.h macros.h enums.h error.h datetime.h objects.h funcs.h text.h globals.h swmm5.h - climate.o : headers.h diff --git a/sci-geosciences/swmm/metadata.xml b/sci-geosciences/swmm/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/sci-geosciences/swmm/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/sci-geosciences/swmm/swmm-5.0.022.ebuild b/sci-geosciences/swmm/swmm-5.0.022.ebuild deleted file mode 100644 index defeb38e3854..000000000000 --- a/sci-geosciences/swmm/swmm-5.0.022.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator toolchain-funcs - -MY_PV=$(delete_all_version_separators) -MY_SRC="swmm${MY_PV}_engine.zip" -DESCRIPTION="Storm Water Management Model-SWMM, hydrology, hydraulics, water quality model" -HOMEPAGE="http://www.epa.gov/ednnrmrl/models/swmm/index.htm" -SRC_URI="http://www.epa.gov/nrmrl/wswrd/wq/models/swmm/${MY_SRC}" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="app-arch/unzip" - -S=${WORKDIR} - -pkg_setup() { - tc-export CC -} - -src_unpack() { - unpack ${MY_SRC} - # Need to delete Readme.txt, because it is in makefiles.zip - rm Readme.txt || die - unpack ./makefiles.zip - unpack ./GNU_CON.zip - unpack ./source*.ZIP -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-QA.patch -} - -src_compile(){ - # 'sed' command has to accomodate DOS formatted file. - sed -i \ - -e 's;^#define DLL;//#define DLL;' \ - -e 's;^//#define CLE;#define CLE;' \ - swmm5.c || die - emake -} - -src_install(){ - newbin swmm5 swmm - dodoc Roadmap.txt -} diff --git a/sci-geosciences/tappy/Manifest b/sci-geosciences/tappy/Manifest deleted file mode 100644 index cc6b620242af..000000000000 --- a/sci-geosciences/tappy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tappy-0.9.0.tar.gz 1250867 BLAKE2B e88a4744d29dfbf8f225b0167e845e9df57ad9f81d4edb840d59f05d28f99f26df7d9feb278d0ad6eedcc538fee112aae266c52aca27a3c8c780c8b1b43f1a3c SHA512 2f3c7676c166dbfe88436cac9a0c4e3d3d4c027e17c39617c45eb02c1c2eda9276afb1ceaa16afd54bb6de130248f83c8c66aeb3509483cce642d2eb631fb9df diff --git a/sci-geosciences/tappy/metadata.xml b/sci-geosciences/tappy/metadata.xml deleted file mode 100644 index 77c02458b0a4..000000000000 --- a/sci-geosciences/tappy/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">tappy</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-geosciences/tappy/tappy-0.9.0.ebuild b/sci-geosciences/tappy/tappy-0.9.0.ebuild deleted file mode 100644 index cf6423bcefa9..000000000000 --- a/sci-geosciences/tappy/tappy-0.9.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" -inherit distutils-r1 - -DESCRIPTION="Tidal Analysis in Python breaks hourly water level into tidal components" -HOMEPAGE="http://tappy.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/pywavelets - sci-libs/scipy[${PYTHON_USEDEP}]" diff --git a/sci-geosciences/tcd-utils/metadata.xml b/sci-geosciences/tcd-utils/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/sci-geosciences/tcd-utils/metadata.xml +++ b/sci-geosciences/tcd-utils/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/sci-geosciences/tcd-utils/tcd-utils-20120115-r1.ebuild b/sci-geosciences/tcd-utils/tcd-utils-20120115-r2.ebuild index 381e74768f3b..3d8b09c28e6e 100644 --- a/sci-geosciences/tcd-utils/tcd-utils-20120115-r1.ebuild +++ b/sci-geosciences/tcd-utils/tcd-utils-20120115-r2.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Utilities for working with Tidal Constituent Databases" -HOMEPAGE="http://www.flaterco.com/xtide/" +HOMEPAGE="https://flaterco.com/xtide/" SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" +KEYWORDS="amd64 ~x86" DEPEND=">=sci-geosciences/libtcd-2.2.4" RDEPEND="${DEPEND}" diff --git a/sci-geosciences/tilecache/Manifest b/sci-geosciences/tilecache/Manifest deleted file mode 100644 index d8654ce44e63..000000000000 --- a/sci-geosciences/tilecache/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tilecache-2.11.tar.gz 68705 BLAKE2B dcde237082c87605fbf5d78f1b1aea9699ebfc0d4285b9a25376156dbf0ed7eb590d78d540c168eaf9d6f679fd47dd753a8d3e48beeca101c914f3f37a575a47 SHA512 234fdba3465b9f940b4bf45a4427c61a803f4458266c59ac08d52bdaace4a186d7bf37cce7af6f273ba0ade9e8d6118fa58ce6dd37645a0667230dc507ee991a diff --git a/sci-geosciences/tilecache/files/tilecache-2.11-pil.patch b/sci-geosciences/tilecache/files/tilecache-2.11-pil.patch deleted file mode 100644 index b596ae449ff7..000000000000 --- a/sci-geosciences/tilecache/files/tilecache-2.11-pil.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nuar tilecache-2.11.orig/TileCache/Layer.py tilecache-2.11/TileCache/Layer.py ---- tilecache-2.11.orig/TileCache/Layer.py 2010-10-15 04:00:18.000000000 -0700 -+++ tilecache-2.11/TileCache/Layer.py 2013-11-09 11:05:17.620475332 -0800 -@@ -391,7 +391,7 @@ - return MetaTile(self, x, y, tile.z) - - def renderMetaTile (self, metatile, tile): -- import StringIO, Image -+ import StringIO, PIL.Image as Image - - data = self.renderTile(metatile) - image = Image.open( StringIO.StringIO(data) ) -@@ -444,7 +444,7 @@ - return self.renderTile(tile) - - def watermark (self, img): -- import StringIO, Image, ImageEnhance -+ import StringIO, PIL.Image as Image, PIL.ImageEnhance as ImageEnhance - tileImage = Image.open( StringIO.StringIO(img) ) - wmark = Image.open(self.watermarkimage) - assert self.watermarkopacity >= 0 and self.watermarkopacity <= 1 diff --git a/sci-geosciences/tilecache/metadata.xml b/sci-geosciences/tilecache/metadata.xml deleted file mode 100644 index 1c984f64751f..000000000000 --- a/sci-geosciences/tilecache/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>sci-geosciences@gentoo.org</email> - <name>Gentoo Geosciences Project</name> -</maintainer> -</pkgmetadata> diff --git a/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild b/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild deleted file mode 100644 index f52323268ed3..000000000000 --- a/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Web map tile caching system" -HOMEPAGE="http://tilecache.org/" -SRC_URI="http://${PN}.org/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-python/pillow - dev-python/paste" -DEPEND="${RDEPEND} - dev-python/setuptools -" - -PATCHES=( "${FILESDIR}/tilecache-2.11-pil.patch" ) - -src_install() { - distutils-r1_src_install "--debian" -} - -python_test() { - python setup.py test || die "Failed tests" -} diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest index 3660ff02b1e0..7218e68ea4eb 100644 --- a/sci-geosciences/viking/Manifest +++ b/sci-geosciences/viking/Manifest @@ -1,3 +1,2 @@ -DIST viking-1.6.2.tar.bz2 3324897 BLAKE2B ef3ab1d60d6cdca514776aaf59d01dedd063c8850ad842d7cbd23c321304b51ccceaa9e5c4f702afc56819e557b28a7ca2b3242ae2fa207e172f7cfdfbba0c45 SHA512 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8 -DIST viking-1.7.tar.bz2 3438343 BLAKE2B 2fbf154c94a0bc745e353dd07e67424b5dd27fab1e0158cac4afe2bf8e7d0d9e1d452b3275219fdd8599ebf2044c17267899f2b0508fc36f274557c1db253320 SHA512 ff26cd808b407af5cb7c3cebed4c550e0c28ac1871497c2cedd09f7e1e72bd24ef0048e6e5d587aa9b03cb1860c3d3afcbe62308ade2179dea4b5f9668d05600 +DIST viking-1.10.tar.gz 6014926 BLAKE2B 667a5cd854449f54c6f5969118a445903cafae4e8f046f14b6802f53a76c217cf960dd11876ed237112026f96da2906bb68b2474ba4e72696bd8b8a082cf7189 SHA512 8d0b3b46e139b8c03730140d89e8eaf6f1dbcde504011710d122e5239d11d1115464b087edd531228be199286605df0deb3f4b75fae0222128b0f5098344527e DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml index b43ae0fa4280..d113d8a61afa 100644 --- a/sci-geosciences/viking/metadata.xml +++ b/sci-geosciences/viking/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>graaff@gentoo.org</email> @@ -15,18 +15,9 @@ <flag name="libexif"> Use <pkg>media-libs/libexif</pkg> for EXIF support </flag> - <flag name="magic"> - Use libmagic to determine mimetypes - </flag> - <flag name="mapnik"> - Enable a layer based on <pkg>sci-geosciences/mapnik</pkg> - </flag> <flag name="oauth"> Enable OAuth authentication for OSM </flag> - <flag name="sqlite"> - Enable MBTiles support based on <pkg>dev-db/sqlite</pkg> - </flag> </use> <upstream> <remote-id type="sourceforge">viking</remote-id> diff --git a/sci-geosciences/viking/viking-1.7.ebuild b/sci-geosciences/viking/viking-1.10.ebuild index 2669e50c3bae..35fb8f0196c1 100644 --- a/sci-geosciences/viking/viking-1.7.ebuild +++ b/sci-geosciences/viking/viking-1.10.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit gnome2-utils +inherit autotools xdg-utils DESCRIPTION="GPS data editor and analyzer" -HOMEPAGE="https://sourceforge.net/projects/viking/" -IUSE="doc +exif libexif geoclue gps +magic mapnik nls oauth sqlite" +HOMEPAGE="https://github.com/viking-gps/viking/" +IUSE="doc +exif libexif geoclue gps +magic nls oauth" SRC_URI=" - mirror://sourceforge/${PN}/${P}.tar.bz2 - doc? ( mirror://sourceforge/${PN}/${PN}.pdf )" + https://github.com/viking-gps/${PN}/archive/${P}.tar.gz + doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )" LICENSE="GPL-2" SLOT="0" @@ -19,34 +19,43 @@ KEYWORDS="~amd64 ~x86" COMMONDEPEND=" app-arch/bzip2 >=dev-tcltk/expect-5.45.4 + dev-db/sqlite:3 dev-libs/expat - dev-libs/glib:2 + >=dev-libs/glib-2.44:2 + >=dev-libs/json-glib-0.16 dev-libs/nettle net-misc/curl sys-libs/zlib - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - geoclue? ( app-misc/geoclue:2.0 ) - gps? ( >=sci-geosciences/gpsd-2.96 ) + >=x11-libs/gdk-pixbuf-2.26:2 + >=x11-libs/gtk+-3.22:3 + geoclue? ( >=app-misc/geoclue-2.4.4:2.0 ) + gps? ( >=sci-geosciences/gpsd-3.20 ) exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) ) magic? ( sys-apps/file ) - mapnik? ( sci-geosciences/mapnik ) oauth? ( net-libs/liboauth ) - sqlite? ( dev-db/sqlite:3 ) " RDEPEND="${COMMONDEPEND} sci-geosciences/gpsbabel " DEPEND="${COMMONDEPEND} - app-text/gnome-doc-utils + app-text/yelp-tools dev-util/intltool - dev-util/gtk-doc-am - app-text/rarian + dev-util/gtk-doc + dev-build/gtk-doc-am dev-libs/libxslt virtual/pkgconfig sys-devel/gettext " +S="${WORKDIR}/${PN}-${P}" + +src_prepare() { + default + eautoreconf + + sed -i -e '/Avoid creator line/isrcdir=test' test/check_gpx.sh || die +} + src_configure() { econf \ --disable-deprecations \ @@ -61,31 +70,30 @@ src_configure() { --enable-geonames \ --enable-geocaches \ --disable-dem24k \ + --disable-mapnik \ + --enable-mbtiles \ $(use_enable exif geotag) \ $(use_with libexif ) \ $(use_enable geoclue) \ $(use_enable gps realtime-gps-tracking) \ $(use_enable magic) \ - $(use_enable mapnik) \ $(use_enable nls) \ - $(use_enable oauth) \ - $(use_enable sqlite mbtiles ) + $(use_enable oauth) } src_install() { default if use doc; then - insinto /usr/share/doc/${PF} - doins "${DISTDIR}"/${PN}.pdf + dodoc "${DISTDIR}"/${PN}.pdf fi } pkg_postinst() { + xdg_icon_cache_update xdg_desktop_database_update - gnome2_icon_cache_update } pkg_postrm() { + xdg_icon_cache_update xdg_desktop_database_update - gnome2_icon_cache_update } diff --git a/sci-geosciences/viking/viking-1.6.2-r2.ebuild b/sci-geosciences/viking/viking-1.6.2-r2.ebuild deleted file mode 100644 index 365f8b560b11..000000000000 --- a/sci-geosciences/viking/viking-1.6.2-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2-utils - -DESCRIPTION="GPS data editor and analyzer" -HOMEPAGE="https://sourceforge.net/projects/viking/" -IUSE="doc +exif libexif gps +magic mapnik nls sqlite" -SRC_URI=" - mirror://sourceforge/${PN}/${P}.tar.bz2 - doc? ( mirror://sourceforge/${PN}/${PN}.pdf )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -COMMONDEPEND=" - app-arch/bzip2 - >=dev-tcltk/expect-5.45.4 - dev-libs/expat - dev-libs/glib:2 - net-misc/curl - sys-libs/zlib - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - gps? ( >=sci-geosciences/gpsd-2.96 ) - exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) ) - magic? ( sys-apps/file ) - mapnik? ( sci-geosciences/mapnik ) - sqlite? ( dev-db/sqlite:3 ) -" -RDEPEND="${COMMONDEPEND} - sci-geosciences/gpsbabel -" -DEPEND="${COMMONDEPEND} - app-text/gnome-doc-utils - dev-util/intltool - dev-util/gtk-doc-am - app-text/rarian - dev-libs/libxslt - virtual/pkgconfig - sys-devel/gettext -" - -src_configure() { - econf \ - --disable-deprecations \ - --with-libcurl \ - --with-expat \ - --enable-google \ - --enable-terraserver \ - --enable-expedia \ - --enable-openstreetmap \ - --enable-bluemarble \ - --enable-geonames \ - --enable-geocaches \ - --disable-dem24k \ - $(use_enable exif geotag) \ - $(use_with libexif ) \ - $(use_enable gps realtime-gps-tracking) \ - $(use_enable magic) \ - $(use_enable mapnik) \ - $(use_enable nls) \ - $(use_enable sqlite mbtiles ) -} - -src_install() { - default - if use doc; then - insinto /usr/share/doc/${PF} - doins "${DISTDIR}"/${PN}.pdf - fi -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest index 8a0d05ae3763..13d163d93a6e 100644 --- a/sci-geosciences/xtide/Manifest +++ b/sci-geosciences/xtide/Manifest @@ -1 +1 @@ -DIST xtide-2.15.1.tar.bz2 710182 BLAKE2B 31c336c16d855615bb3b33571f71cf47ff4ae524c1ca987e4b29a1c0a88844d9de7fa9f0340a07360c6e0299826e47d0c448dec074a3755a929300cc72cb6462 SHA512 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448 +DIST xtide-2.15.5.tar.xz 574972 BLAKE2B b03a2d0b4c2616b0a81fc745a7781dba74e0d7977c84790ab5fc3aebaf3a04ae51fa9bd5b79166195e0b6cbe736efa3e31b5203a25bb6f60df385c0f357294f9 SHA512 314c3d256a873ae5862e83050937c72983e5ac0bc9dc2c1a9264d0285f73f681eae1451706c5c6c2829d980423044e83adff3fcf8975b33eb03eed8cb72f1f43 diff --git a/sci-geosciences/xtide/metadata.xml b/sci-geosciences/xtide/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/sci-geosciences/xtide/metadata.xml +++ b/sci-geosciences/xtide/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/sci-geosciences/xtide/xtide-2.15.1.ebuild b/sci-geosciences/xtide/xtide-2.15.1.ebuild deleted file mode 100644 index 1cd2b9694ce7..000000000000 --- a/sci-geosciences/xtide/xtide-2.15.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop gnome2-utils - -DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats" -HOMEPAGE="http://www.flaterco.com/xtide/" -SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=" - media-libs/libpng:0= - sci-geosciences/gpsd - >=sci-geosciences/libtcd-2.2.5_p2 - x11-libs/libX11 - x11-libs/libXaw3d[unicode] - x11-libs/libXaw3dXft - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXt -" -RDEPEND="${DEPEND} - media-fonts/font-schumacher-misc -" - -src_install() { - default - - echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm - doenvd 50xtide_harm - - newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png - make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science' -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sci-geosciences/xtide/xtide-2.15.5.ebuild b/sci-geosciences/xtide/xtide-2.15.5.ebuild new file mode 100644 index 000000000000..3a83ea5ebb4b --- /dev/null +++ b/sci-geosciences/xtide/xtide-2.15.5.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg + +DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats" +HOMEPAGE="https://flaterco.com/xtide/" +SRC_URI="https://flaterco.com/files/xtide/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~x86" + +DEPEND="media-libs/libpng:= + sci-geosciences/gpsd:= + >=sci-geosciences/libtcd-2.2.5_p2:= + x11-libs/libX11 + x11-libs/libXaw3dXft + x11-libs/libXft + x11-libs/libXpm + x11-libs/libXt + sys-libs/zlib" +RDEPEND="${DEPEND} + media-fonts/font-schumacher-misc" + +src_install() { + default + + echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm || die + doenvd 50xtide_harm + + newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png + make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science' + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-geosciences/xyzservices/Manifest b/sci-geosciences/xyzservices/Manifest new file mode 100644 index 000000000000..d14c2c24183a --- /dev/null +++ b/sci-geosciences/xyzservices/Manifest @@ -0,0 +1,2 @@ +DIST xyzservices-2023.10.1.tar.gz 1113019 BLAKE2B c239c244c7ffea836acfc2fdba284c2b2b0b8fbd7e915ddcc004f7735898760f8bac626c7f58329d5c5555753dbbfe13731494ef5948ffaf2cd36d1eb28e014d SHA512 5ab57caa160bbf926014da83f81108c7ae6c509831a94d38c2dde73067cb2cd624697902166eb5a0af5f55faef1b8f1d0786db4766f80b1bfe5cad889d9dc627 +DIST xyzservices-2024.4.0.tar.gz 1126163 BLAKE2B d725799b668ac0cbdc88fbd8a9f14db70d45b5ca665fe899b4cc57197321b6639590c29f47fb10e420b9f8ccfbfe4b867a9a9c8e090403f0c023c0e69295f5f9 SHA512 1fb991578275914a7b3ef8202dcb049116a423f2b645bbc52717485c76089615f988f9eb592e13399c30b2901630089188c4ed30276c68015a7f12661ac62331 diff --git a/sci-geosciences/xyzservices/metadata.xml b/sci-geosciences/xyzservices/metadata.xml new file mode 100644 index 000000000000..a7ab53c665a8 --- /dev/null +++ b/sci-geosciences/xyzservices/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <upstream> + <remote-id type="github">geopandas/xyzservices</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-geosciences/xyzservices/xyzservices-2023.10.1.ebuild b/sci-geosciences/xyzservices/xyzservices-2023.10.1.ebuild new file mode 100644 index 000000000000..14e1cb70572f --- /dev/null +++ b/sci-geosciences/xyzservices/xyzservices-2023.10.1.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 diff --git a/sci-geosciences/xyzservices/xyzservices-2024.4.0.ebuild b/sci-geosciences/xyzservices/xyzservices-2024.4.0.ebuild new file mode 100644 index 000000000000..14e1cb70572f --- /dev/null +++ b/sci-geosciences/xyzservices/xyzservices-2024.4.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 |