diff options
Diffstat (limited to 'sci-geosciences')
39 files changed, 1269 insertions, 843 deletions
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.52-r1.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.52-r1.ebuild new file mode 100644 index 000000000000..18ac53badef6 --- /dev/null +++ b/sci-geosciences/GeographicLib/GeographicLib-1.52-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake distutils-r1 + +MY_PN="${PN,,}" + +DESCRIPTION="C++ library for converting geographic coordinate systems" +HOMEPAGE="https://sourceforge.net/projects/geographiclib/" +SRC_URI="mirror://sourceforge/${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-doc/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/Manifest b/sci-geosciences/GeographicLib/Manifest index a96c7ae6ef6c..6f47c7b7b4ea 100644 --- a/sci-geosciences/GeographicLib/Manifest +++ b/sci-geosciences/GeographicLib/Manifest @@ -1,3 +1,4 @@ DIST GeographicLib-1.52.tar.gz 2432658 BLAKE2B 87328de1774ab9aec05355362c9a1760cf62864135b97a3e9cb1382b0ec9825b032f6c67a5e02b762c3009a3876a9cd995e3a49a3ad3c051dcd36446b55d0191 SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859 +EBUILD GeographicLib-1.52-r1.ebuild 2126 BLAKE2B de3551d0c5cdcaf98897eee5b0042c113fbae11a0c719ca66c77249bf5df810fbd86e3ccd03369d2504e0f51420236b0df0ceefa63f970cf7fa203275db8dbae SHA512 cd5ae878f64bb422d0f0e4be4f9b003bcd03194f3893102898b3cc1f645ca34869637983678d05edb59f4c25bc7c82b4e874614a95d57908fa511dd348fe4a0b EBUILD GeographicLib-1.52.ebuild 2182 BLAKE2B 1840313b9b73175c1c73b765b789f26105d29aa7ba615b287264216ac11a793f35c94980790702031161af06411378d5e107b1d24d3ed54616fdb9fc5470c069 SHA512 1a52c4c4dae62bbcac21f0f2dcdb06332f0729c51b14c370b1190714079943985fc0166427d97ffeb2a1c8cea187378e3efd555b3d4a4199c775538237149ed9 MISC metadata.xml 875 BLAKE2B c383ecf94641b3ebdcb225b61eaec0077f83a03647306af59142fa633e8865ec46e809bd75410258dd9141cdca1141efd94f0a005ab273dfa2039811d419db24 SHA512 800b4153192b66e848a79a3e5ce915b21d61008d4b43e0f8c5da34142823af15367220589db1a04a8e3cddeb3ad0d300f002c2264e71408200595c67bcc7a625 diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex ce2c643b08ee..302777eea970 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/geopy/Manifest b/sci-geosciences/geopy/Manifest index 30a95fb337ec..513a7957b0b0 100644 --- a/sci-geosciences/geopy/Manifest +++ b/sci-geosciences/geopy/Manifest @@ -1,3 +1,3 @@ DIST geopy-2.2.0.tar.gz 289811 BLAKE2B f876a867a19e5178eba1fa6b7389159e820fc6a9c9a6ac4beb807e2b1b121612a526b5f7290d5fd6db3e259cbd03a86695775d4cad39662126d5f5b7194b19bd SHA512 78b6c2e4726dd50ad97e3425a0459b4611eed54c06c16a2b397db9c3fd9878d76f9eba26ce353908315fea469a76b4044401f5ba37aab3752e9649fd35db16cd -EBUILD geopy-2.2.0.ebuild 560 BLAKE2B 8f40ec9dfa51a46ddc2ba97fd879d2993c9824554701f8eb069eaf88e450f7975749eea7b6bfa405ae663694f06c05804c240a68fb5e41c318bb0dc172983b2f SHA512 7cf2a45ea650387dd25cfc5c840b1a7c744e99df03707a4fbb3f0e992bc7aa583c6dbb6f38eebbe3f86d2d770c9aff93ba11f2a796a73130463b07a532adaf21 +EBUILD geopy-2.2.0.ebuild 568 BLAKE2B f25325966dd78c679fbc1354f3ee208954516698a5aa620c2a03d55a2b9af6cc78bcb59702af292f7141337cf79e573d657c2704a5cd452c37a05f8d6e679cf0 SHA512 cc59769df340e62fbf45ae9ae6febe10de7c9294af65205dc17790de3b7ca4020ca977729ed6a28a9e4502d4bbaec703c160abda970553d443a3b4c38e280968 MISC metadata.xml 634 BLAKE2B fbb38a6646d84c1c9849403f00ac08a6420bd1a6b691d836b97285cb9ab98d19bcc43250cfaeefcd51be32100571e21b77ab943454e9ecbe34a72d06b7b276ce SHA512 37a5779945ccf10eeba0f03131a66783e72363765549d56c26dce6272d267c6b61940beded8be930a1a503c76f8e23327c155ee4af4413870b9c59cef089856d diff --git a/sci-geosciences/geopy/geopy-2.2.0.ebuild b/sci-geosciences/geopy/geopy-2.2.0.ebuild index 0eca56b94d75..d93cf6234d90 100644 --- a/sci-geosciences/geopy/geopy-2.2.0.ebuild +++ b/sci-geosciences/geopy/geopy-2.2.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit distutils-r1 DESCRIPTION="Python client for several popular geocoding web services" diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest index 1fda9f3b4eeb..76e0827f4e00 100644 --- a/sci-geosciences/gnome-maps/Manifest +++ b/sci-geosciences/gnome-maps/Manifest @@ -1,7 +1,5 @@ -DIST gnome-maps-41.4.tar.xz 2187076 BLAKE2B bb35925d1b69d50c65e3ffe68386242b776c2089bea3b2bfe88383f1a8fba4045474a1c8fc1c5d07a5b207ad953396d3a76af77fbdf984d286b5e242f9eea78f SHA512 605de671f85ae38a8dc79e58594f2170215e8a070377b1d9ebded9891425898bb40613f6acee1c95f5ea2e0d95e6a8c25757665a5aa890831325701b1abbc8fa -DIST gnome-maps-42.0.tar.xz 2315828 BLAKE2B dca0f7845b257780701186adf3408cf41797b235969dadf1fe73003b9e52b3ab26d39f8190336616d697bf87eafb2e1abd05a4da9de4837153237fd08e382854 SHA512 888caa6418a8afea6d334b90f28eb865e3955c0534df25d458e6b3a063944d09c46a3775a3d4953a968980446f2be69bd0c5c4183b3fc8419ed1f7bbb812429c DIST gnome-maps-42.1.tar.xz 2315924 BLAKE2B a2bf6eb8bef69c80febeffc29294840b701a207d5b6479dabae4daa13de4b5325319314bb755d44fa5ec41bae397af1e642950553b6c36be29f8a68109c15b3f SHA512 a01bf5eefa541542930e53750ac216cd93e4b409a171b57ed18525020cd2dc55db596ab68885ab9d607999c971f8e4ec2b746507157aab32b863a17a222a6fc2 -EBUILD gnome-maps-41.4-r1.ebuild 1510 BLAKE2B 3a928ead826d4e54969b224c9f59da2239b542bf2f6e9f364e3bfc185717473aec4a1563174852fbefaec37fa20e3f8cee42eaf88e3a5ef25d80d7b7461c0f04 SHA512 f29d8940faa247f70ac479bf6dd3c968a5552c7e7a1d57831e9765e0716fa180794fec79932a3d5d46caed3c32d8a999ceb368fd9d1aee281a6fa988266fffcf -EBUILD gnome-maps-42.0.ebuild 1513 BLAKE2B efa10f438002651620d1bdbeb8660de33491e3b888ea7bc8a0c253e2ca1d7d63544f7f9514d0602e34b2cf74b9a7591ee1a54631caf76e7a3c95887a07de77c0 SHA512 f4d5a4a18964f4548f9337b6d7b1ea6f10db9766a7966b8473d3c266d7bdbe3764a7ce1f80273c1c022dced4d388b74c0240f09ce593e94aab1372a4d26f70b4 -EBUILD gnome-maps-42.1.ebuild 1513 BLAKE2B ea65e2fd1c25a8ff539973e2e41a15934a269d357fdb17920bb96ec5307d62ec55754b1d00b62be454db5c1fd0d38e2463ec4b78e8209a27842fbd4fecd4fe4b SHA512 083dff1fed5296d3553b93bc7b3159ef8d8df61ee7eb932b4a081b41c2dc5972814b21e254a1205be5c0122fb7f22c0de17efd0454922c75d3803ed3757dd09e +DIST gnome-maps-42.2.tar.xz 2317216 BLAKE2B 2a485c15ad203fb4518541a60231a0ed756ca3cf7abc524911a2294b3503077d0974ecc8690073e3967241a8769687a1524506a42bea8c473192128cd2ae9bb7 SHA512 87da3b6850d1a7ca4d90781089800f082026406555773ea1a9bac376b41e480eb4b5a10ec3f0a2f85de521e847489f4e761117a08e7125447aab7acf05720c1f +EBUILD gnome-maps-42.1.ebuild 1511 BLAKE2B c0edb29177474b6e13a7ca394e06e758bb75b07cb39a89a1dfddd3269b620b47574d05ddcdbb372ddc3f8bc449abb95e648ffe9f34b484570be1a2806e1c9ae8 SHA512 31c4e0a5883c18e4550d8e4aaa59fcfee2887dcf268f6e53fbc8ae1f2c059ae910f48d54860988a2e000bb32ceffe4862b3fdf37f5dd28a5609a703a61f884cd +EBUILD gnome-maps-42.2.ebuild 1513 BLAKE2B 0cae9b16d9347a46f0c532e674ae8f4fdf1ae749bbd0c3d0cca2b3fe7d8101255d1fbc18b9e130f2bdfdfae6c57db251bcb3f80545eaff58bf52c46561fe13c4 SHA512 215014a6ef523fe778a1e7a49401b8b23d51f61e0e2378577bfe732c5945b7ddb4d97be3b823dd0f7cede2a350ee19898a7b7111cfef89fddffb5b0606c1a011 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.4-r1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.4-r1.ebuild deleted file mode 100644 index 85aac7b81b42..000000000000 --- a/sci-geosciences/gnome-maps/gnome-maps-41.4-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -inherit gnome.org gnome2-utils meson python-any-r1 xdg - -DESCRIPTION="A map application for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Maps" - -LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" - -# Pure introspection dependencies found by grepping imports.gi in ${S} -RDEPEND=" - >=dev-libs/glib-2.66.0:2 - x11-libs/pango[introspection] - >=dev-libs/gjs-1.66.0 - >=dev-libs/gobject-introspection-0.10.1:= - >=x11-libs/gtk+-3.22:3[introspection] - >=app-misc/geoclue-0.12.99:2.0[introspection] - >=gui-libs/libhandy-0.84:1= - >=dev-libs/libgee-0.16:0.8[introspection] - >=dev-libs/folks-0.10:= - >=sci-geosciences/geocode-glib-3.15.2[introspection] - >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] - dev-libs/libxml2:2 - >=net-libs/rest-0.7.90:0.7[introspection] - - app-crypt/libsecret[introspection] - dev-libs/libgweather:2=[introspection] - media-libs/clutter-gtk:1.0[introspection] - media-libs/clutter:1.0[introspection] - net-libs/gnome-online-accounts[introspection] - net-libs/libgfbgraph[introspection] - net-libs/libsoup:2.4[introspection] - net-libs/webkit-gtk:4[introspection] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postinst() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild index 6115d59c93ab..1a317dee669c 100644 --- a/sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild +++ b/sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps" LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" # Pure introspection dependencies found by grepping imports.gi in ${S} RDEPEND=" diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.0.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild index 918462359832..a8c7b50184bb 100644 --- a/sci-geosciences/gnome-maps/gnome-maps-42.0.ebuild +++ b/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) inherit gnome.org gnome2-utils meson python-any-r1 xdg DESCRIPTION="A map application for GNOME" @@ -29,7 +29,7 @@ RDEPEND=" >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] - dev-libs/libgweather:2=[introspection] + dev-libs/libgweather:4=[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index 7144c0e390fd..5860e9b815f8 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,8 +1,6 @@ AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc -DIST gpxsee-10.5.tar.gz 5123489 BLAKE2B 9e7155adc340d3e8af708563cf2aba2e03a47c4180a144d79521913339020f20be416bd14d95b33041653135167d8123899f6008474beef8e1665924eaa0c339 SHA512 ee24a1555fc18f2aa21307e4fe255312d5e166b107bf0a9e10104cb977cb5d59888e7ec99aad83adf5fc36e7a9eb04a039450d96b4248ad52c08fce0dd76c035 -DIST gpxsee-10.6.tar.gz 5122274 BLAKE2B bf76c9928267b3d6f07fcdc807512a9ab3b2ba2bdcef0294414c3aadf7d2b89b8f5fbb7a793ff04976ec16afdc5f33fcb54f5cc5c19bd1bdac97ebce7e4edc48 SHA512 143340f31863c82d3336fd4bd03e99edfdb0324ccf80ccd7a423f5a815ecda8b5220766f02e53b9f4d5098fabaad33f9da5d4a3de250711214c6923821008e76 DIST gpxsee-10.7.tar.gz 5122383 BLAKE2B 5625f40b799e67ac7b4801e358021657b2ef4f2279e8ac94f8c85724b9e27dad2d0e244f931b6c2f7204abfb45a8dde1a07dcbbbfba780c8a07aa541ba944473 SHA512 0cb4a3e71c8141d8b0a039cd51ddbfb159c28dc9d6f724dc8605f52aaf90379b9fa3d21741993fbf754bd329d835118b3b67c87673ee97fdc29f61440c3e8624 -EBUILD gpxsee-10.5.ebuild 1168 BLAKE2B 62157c1b485abad4017a83ada065c88bcf6aa58338c68e7d612623eb2821afef4901077806f2f02b8ae31f6d42d53393f3941082313289f47cd41b89cb1a1de2 SHA512 085eb752f90d58a3b16555a378eb109a2bfd864bfb3cc91613623ebebc9c2e52d1448ce5986ed48096c97162258d961c8658b1fdcbb09db618132ef103e8cc6f -EBUILD gpxsee-10.6.ebuild 1170 BLAKE2B bcf8ac93a22ada88f988bdff316d6d5af22e67589cde8c97df987323892fd2c6e653e38165ee8d75ec1824308dd054ebe49e07cb4972707fd9fa5372207ace30 SHA512 306deb433881654925d9c519e8f48c2e6eb863c7c1731ef6fa90797512c2dd451a33c7a795c83f3e7df2e78e29329a5321635dcdd82a1c039f3d908368d97db7 -EBUILD gpxsee-10.7.ebuild 1162 BLAKE2B 3410c6bfa0a2ac3a41778b8dbcdeb93f133e9b1846e0abadff9b494e0ee6eb166935dddb5873aa1ebd6c5fee99bfb6ffff00ed74a94c06bc3c8a88c74484ebfd SHA512 d5c23a3c90c0a309abc238dddb0aec7fe6a1fc14b50e309cd27819cecb76327c5c3692d8ed8b7f67de1662f7d7f8644b246d24246fd8d25feb9f259598f7e9f1 +DIST gpxsee-11.1.tar.gz 5168310 BLAKE2B f8a5de5f3907f09ae8cf860aa14a8a8d98c739a6b4b605cfa3f31bf7493f2cf6ff1a7aaf89687ab4dbe3e829460fc54cd52d0ae344c9c833c0b9ef13837931a2 SHA512 90efa8291c2a5671d1d5e54fead094ede6d93710751edf6c71babda5d3e432ceb70159695d1fb2b6589a75deec18f3e26003b042aa8f2060d80d8dbbbf5e4c96 +EBUILD gpxsee-10.7.ebuild 1160 BLAKE2B fd51e2104bcc34cf1f450e0fecb1703e6dc15b45afc7ff07b16a5f841d82fc3f25c195aeef53d7cd611a337652fb75adc2a5f44b5ccde3119eb8f1c30e7873c6 SHA512 08988262203c5e2819206f61e38f6264562dd36d1193d8dd3d0bd4cce3eb77ae64905aa26cdbf149ee2ce47f70798f1821e9c34014402003f3495a615a17f4e1 +EBUILD gpxsee-11.1-r1.ebuild 1181 BLAKE2B 82ed3481200f47e8a1a561c1900feec424c53c21305392b6272c035d52373bc656b0614d4c27bad2ae4037bccb8a706c228894736423b4eb66f60c778350f2ae SHA512 b96b703698da9b123f32248074c4ecfd709c70617ae55461f923738fa6f7a54e9d3107122cd59caec375ae7a897abd0ab94582a34c95b947a1950f06a7ffc1e0 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3 diff --git a/sci-geosciences/gpxsee/gpxsee-10.5.ebuild b/sci-geosciences/gpxsee/gpxsee-10.5.ebuild deleted file mode 100644 index 8777e1588391..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-10.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk zh" -inherit desktop 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/" -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/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtconcurrent:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtpositioning:5" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -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-10.7.ebuild b/sci-geosciences/gpxsee/gpxsee-10.7.ebuild index 60edf5a4c3e5..fe887204a934 100644 --- a/sci-geosciences/gpxsee/gpxsee-10.7.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-10.7.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://www.gpxsee.org/" SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-qt/qtcore:5 dev-qt/qtgui:5 diff --git a/sci-geosciences/gpxsee/gpxsee-10.6.ebuild b/sci-geosciences/gpxsee/gpxsee-11.1-r1.ebuild index f37db04afe41..ca4a7a75cd2b 100644 --- a/sci-geosciences/gpxsee/gpxsee-10.6.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-11.1-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk zh" -inherit desktop plocale qmake-utils xdg +PLOCALES="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}" @@ -23,7 +23,8 @@ RDEPEND="dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 - dev-qt/qtpositioning:5" + dev-qt/qtpositioning:5 + dev-qt/qtsvg:5" DEPEND="${RDEPEND}" BDEPEND="dev-qt/linguist-tools:5" diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index ebeb0f7299f7..abc63235731c 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,14 +1,11 @@ -AUX grass-8.0.0-mkhtml.patch 10339 BLAKE2B 39b55a1c33b751508128533bcfb513d3aab9227985ff142eb346c02997599afc228274a7aa8b02258def491816b98fb52b307007facfcb00b79657afd42a88c7 SHA512 a4eca79ccadf77b863b254a83fab8eaa096bbf977bfe54cd4de3ee914f55e3499fe42615904b1717ffbb0da06334306543f0562203793adaa0770926498dfece -AUX grass-8.0.1-lib_imagery.patch 340 BLAKE2B f71e447c87a373f16780002206e9b77f0d276de24df51f43a9601a638a4761de131287df35361eaba73e423c03fe9c0562d30d933c425d76d9b683b837e24520 SHA512 a211391372af17417a18e7ff4c32d0fc0e4d33a5baff4f4ad77b5aa389637fee12d9436c3240668231ac66c2c5d0922f5b3dec4fd6d08f396acc7e6fda07bd97 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303 -DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42 -DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f +DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 496dab376b38c74d2206096f8b1bf848888c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f SHA512 fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c +DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930 EBUILD grass-7.8.6-r1.ebuild 7055 BLAKE2B e38aeec61d89be4a584760e6af906e8ff1e080176110a05a27fe8610b3b87109a49a2ab7160c2f7fe47047d203cdb52ac7be917982e744b4e827e746c34ff7d2 SHA512 3bf3595b0f1a1dc296f6c2f8a05eef8b6621ef6609e4f207d1710a916f9b8b6791e4424b0806b032fc3f925d7b714f43a48e9750aa700075e4c99a955d0ad930 EBUILD grass-7.8.7.ebuild 7037 BLAKE2B 6c49c86b9360199a2b47340241d6ba7d350e91dcedf9d5e8f732e97ec624b312b75a36e520949a38a9c5684c0fac3fd85113fcebb0ea0886ec815045566cb3a0 SHA512 e24b41c9754db9edc469d9095d9f97303ad703e047e0ab6810afb5f7b42e28c453a5c0f2292f71b6bc2acd0fa4157e172fbae7966f456ef2eb7fb938f747bb75 -EBUILD grass-8.0.0.ebuild 7138 BLAKE2B 3a28346c1ea888baa94e3b8c4b2b8028ee69f3d8f1caa671c1d9d11c8d65ca27ce8ce3c99c525d75f8dd06eee2f2bde54c6dc4ef666f0fe5691d7d2b1f4143a5 SHA512 3f755b7f3d077d4a4e003b88d08e541cb8efcca07a9864b73e858db1917867ebcb284928e55207c89ebdc800586bfc4cab32ad75d3b01e408c48eea77a8b69ff -EBUILD grass-8.0.1-r1.ebuild 7294 BLAKE2B 8ae093187946ff42510d0f891fcdc98547bd4c01061c27eb1635af2d14c02d7f4547e9a92d316ed0cdd1c45c96dfb565bfafa229c7e0ffad50c04b25f94659b1 SHA512 2dab8480e003051848df87a6989eb3fb5aa6c5f8f676e81e007d60ac8b2b3cd125cb3b70eb92e9ec8112414a6520bc04b5111334b423ecce6d765b4e4119692e -EBUILD grass-8.0.1.ebuild 7254 BLAKE2B 8f3108175b283249d0168cff29adef6371ea01f50d0fa618e0e6b6a8c0c9c6c2a74cdea51d4c44d8af614d58a25f53f1ade91aeaa68764dd6783ffce1d54874a SHA512 7e2bbfa06148c10fc1e08062820c335e2ceb96d54f12d65d508876249647acd5fe92d2e35a9a8e08ed737e88ed58d1df1185f5514a15653a5b066d8d3e0cb63d -EBUILD grass-9999.ebuild 7196 BLAKE2B f895558bb5ab4779e48d5ceb0e10dfb83160d57a9407d6ccec0ace03b8a9c2e48a398a66dc615070320e92005d4c28a41fbaaf841e701e36b690d0f71b44d21e SHA512 1d6d747956c124d59c4afadd1053c4f649d4fa3e939d56754d3f8ad1220572bdbeb28bb2930f3891022a66ad8ac1e22ebaee314e0d597b47808de1855540322d -MISC metadata.xml 1166 BLAKE2B ae97d82be74c6782d74f256a40fbdb13590f5434f19f9980dbd51f182c687f24bd6068ab37a23958f583b299a3b4a5949526c0a9791a5620e1774db768f46f07 SHA512 c9b5cc9316da6e3fe396550bb1216f8a3376b6e6a088b6a289b0b008b0c34b0486dc357893ec19868023e800533f5e354addfca1a07d5e070dd4a556b96cd446 +EBUILD grass-8.0.2.ebuild 7395 BLAKE2B 26056fd3435579cd5c3582eb161a5555480da272f451c079eda08682d1b4c9abd2bf8c1dc0d0f03f9339c39357d91850a27317101fe4f50599da04df327609be SHA512 d3dfdcc2e453fbf902418bb0f6240e1a9abcbade55b9419ec0e5cc75ec1949219c2e411b1512d1e0a5e876366fb0bfd2fc34f7c3bb9d8428f67366b6fafae9a8 +EBUILD grass-8.2.0.ebuild 7397 BLAKE2B a6bb4a9721446eaf6ee91fe5f29153b7d7326d2d0c1eb5aeaa3bac6245e53c3c07abe0be711289981ce7a5e69a716b4a1086de948b80711e75048b132931c6f7 SHA512 2af79f67086685086cdf3b838f985a93e95543ceb3784fdaee48b30de85360722f83bb7075082637dbdeb500bc3a84b91b39adee7467e0dffc9bd65d435929b8 +EBUILD grass-9999.ebuild 7337 BLAKE2B 9e735ae65498174408f482f8f5f568c57c351113390a1836227f9787a5c5cde9fbcd22191ecda0dc1078e3ec7cb3b4a39bf75d087d6d23dfd36c892d479ac525 SHA512 364c581b765c13026d59f41123c34943b40e87307102a41f3b2906232cc70c7dad423c2fcc2bd3ebddd77bb8c36be78d206a218665365804a16567578fb0c43d +MISC metadata.xml 1286 BLAKE2B 0f08cfaa427449162c2820db80f4d306c73bdf6a9edd337be482df034e40ace5fad0ab2f7acb08b3bde5e1db54ed9f9ac38669ab689968c30964aae15b4134a7 SHA512 2adc25985ec839ba9d1b9b15a196b3477f4a92cda7d83dfafa9259d88768bcc57ab559f45820314b9ad7dc8ce3d25332eb6a8e7500ce26d7b53011a90bc99211 diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch deleted file mode 100644 index 1eb46012f6a4..000000000000 --- a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch +++ /dev/null @@ -1,316 +0,0 @@ ---- a/lib/init/variables.html -+++ b/lib/init/variables.html -@@ -234,12 +234,7 @@ PERMANENT - <dt>GRASS_PERL</dt> - <dd>[used during install process for generating man pages]<br> - set Perl with path.</dd> -- -- <dt>GRASS_PROXY</dt> -- <dd>[used during addon install/reinstall process for generating man -- pages (download commit from GitHub API server and remote modules.xml file)]<br> -- set the proxy with: <tt>GRASS_PROXY="http=<value>,ftp=<value>"</tt>.</dd> -- -+ - <dt>GRASS_SKIP_MAPSET_OWNER_CHECK</dt> - <dd>By default it is not possible to work with MAPSETs that are - not owned by current user. Setting this variable to any non-empty value ---- a/scripts/g.extension/g.extension.py -+++ b/scripts/g.extension/g.extension.py -@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format, *args, **kwargs): - ), - ) - return response -+ - except HTTPError as err: - if err.code == 403 and err.msg == "rate limit exceeded": - gscript.warning( -@@ -2588,8 +2589,6 @@ def main(): - proxy = urlrequest.ProxyHandler(PROXIES) - opener = urlrequest.build_opener(proxy) - urlrequest.install_opener(opener) -- # Required for mkhtml.py script (get addon git commit from GitHub API server) -- os.environ["GRASS_PROXY"] = options["proxy"] - - # define path - options["prefix"] = resolve_install_prefix( ---- a/utils/mkhtml.py -+++ b/utils/mkhtml.py -@@ -16,7 +16,6 @@ - # - ############################################################################# - --import http - import sys - import os - import string -@@ -25,9 +24,6 @@ from datetime import datetime - import locale - import json - import pathlib --import shutil --import subprocess --import time - - try: - # Python 2 import -@@ -35,26 +31,11 @@ try: - except ImportError: - # Python 3 import - from html.parser import HTMLParser -- --from six.moves.urllib import request as urlrequest --from six.moves.urllib.error import HTTPError, URLError -- - try: - import urlparse - except ImportError: - import urllib.parse as urlparse - --try: -- import grass.script as gs --except ImportError: -- # During compilation GRASS GIS -- gs = None -- --HEADERS = { -- "User-Agent": "Mozilla/5.0", --} --HTTP_STATUS_CODES = list(http.HTTPStatus) -- - if sys.version_info[0] == 2: - PY2 = True - else: -@@ -65,24 +46,6 @@ if not PY2: - unicode = str - - --grass_version = os.getenv("VERSION_NUMBER", "unknown") --trunk_url = "" --addons_url = "" --if grass_version != "unknown": -- major, minor, patch = grass_version.split(".") -- grass_git_branch = "releasebranch_{major}_{minor}".format( -- major=major, -- minor=minor, -- ) -- base_url = "https://github.com/OSGeo" -- trunk_url = "{base_url}/grass/tree/{branch}/".format( -- base_url=base_url, branch=grass_git_branch -- ) -- addons_url = "{base_url}/grass-addons/tree/grass{major}/".format( -- base_url=base_url, major=major -- ) -- -- - def _get_encoding(): - encoding = locale.getdefaultlocale()[1] - if not encoding: -@@ -105,151 +68,6 @@ def decode(bytes_): - return unicode(bytes_) - - --def urlopen(url, *args, **kwargs): -- """Wrapper around urlopen. Same function as 'urlopen', but with the -- ability to define headers. -- """ -- request = urlrequest.Request(url, headers=HEADERS) -- return urlrequest.urlopen(request, *args, **kwargs) -- -- --def set_proxy(): -- """Set proxy""" -- proxy = os.getenv("GRASS_PROXY") -- if proxy: -- proxies = {} -- for ptype, purl in (p.split("=") for p in proxy.split(",")): -- proxies[ptype] = purl -- urlrequest.install_opener( -- urlrequest.build_opener(urlrequest.ProxyHandler(proxies)) -- ) -- -- --set_proxy() -- -- --def download_git_commit(url, response_format, *args, **kwargs): -- """Download module/addon last commit from GitHub API -- -- :param str url: url address -- :param str response_format: content type -- -- :return urllib.request.urlopen or None response: response object or -- None -- """ -- try: -- response = urlopen(url, *args, **kwargs) -- if not response.code == 200: -- index = HTTP_STATUS_CODES.index(response.code) -- desc = HTTP_STATUS_CODES[index].description -- gs.fatal( -- _( -- "Download commit from <{url}>, return status code " -- "{code}, {desc}".format( -- url=url, -- code=response.code, -- desc=desc, -- ), -- ), -- ) -- if response_format not in response.getheader("Content-Type"): -- gs.fatal( -- _( -- "Wrong downloaded commit file format. " -- "Check url <{url}>. Allowed file format is " -- "{response_format}.".format( -- url=url, -- response_format=response_format, -- ), -- ), -- ) -- return response -- except HTTPError as err: -- gs.warning( -- _( -- "The download of the commit from the GitHub API " -- "server wasn't successful, <{}>. Commit and commit " -- "date will not be included in the <{}> addon html manual " -- "page.".format(err.msg, pgm) -- ), -- ) -- except URLError: -- gs.warning( -- _( -- "Download file from <{url}>, failed. Check internet " -- "connection. Commit and commit date will not be included " -- "in the <{pgm}> addon manual page.".format(url=url, pgm=pgm) -- ), -- ) -- -- --def get_last_git_commit(src_dir, is_addon, addon_path): -- """Get last module/addon git commit -- -- :param str src_dir: module/addon source dir -- :param bool is_addon: True if it is addon -- :param str addon_path: addon path -- -- :return dict git_log: dict with key commit and date, if not -- possible download commit from GitHub API server -- values of keys have "unknown" string -- """ -- unknown = "unknown" -- git_log = {"commit": unknown, "date": unknown} -- datetime_format = "%A %b %d %H:%M:%S %Y" # e.g. Sun Jan 16 23:09:35 2022 -- if is_addon: -- grass_addons_url = ( -- "https://api.github.com/repos/osgeo/grass-addons/commits?path={path}" -- "&page=1&per_page=1&sha=grass{major}".format( -- path=addon_path, -- major=major, -- ) -- ) # sha=git_branch_name -- else: -- core_module_path = os.path.join( -- *(set(src_dir.split(os.path.sep)) ^ set(topdir.split(os.path.sep))) -- ) -- grass_modules_url = ( -- "https://api.github.com/repos/osgeo/grass/commits?path={path}" -- "&page=1&per_page=1&sha={branch}".format( -- branch=grass_git_branch, -- path=core_module_path, -- ) -- ) # sha=git_branch_name -- -- if shutil.which("git"): -- if os.path.exists(src_dir): -- git_log["date"] = time.ctime(os.path.getmtime(src_dir)) -- stdout, stderr = subprocess.Popen( -- args=["git", "log", "-1", src_dir], -- stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -- ).communicate() -- stdout = decode(stdout) -- stderr = decode(stderr) -- -- if stderr and "fatal: not a git repository" in stderr: -- response = download_git_commit( -- url=grass_addons_url if is_addon else grass_modules_url, -- response_format="application/json", -- ) -- if response: -- commit = json.loads(response.read()) -- if commit: -- git_log["commit"] = commit[0]["sha"] -- git_log["date"] = datetime.strptime( -- commit[0]["commit"]["author"]["date"], -- "%Y-%m-%dT%H:%M:%SZ", -- ).strftime(datetime_format) -- else: -- if stdout: -- commit = stdout.splitlines() -- git_log["commit"] = commit[0].split(" ")[-1] -- commit_date = commit[2].lstrip("Date:").strip() -- git_log["date"] = commit_date.rsplit(" ", 1)[0] -- return git_log -- -- - html_page_footer_pages_path = ( - os.getenv("HTML_PAGE_FOOTER_PAGES_PATH") - if os.getenv("HTML_PAGE_FOOTER_PAGES_PATH") -@@ -261,6 +79,14 @@ pgm = sys.argv[1] - src_file = "%s.html" % pgm - tmp_file = "%s.tmp.html" % pgm - -+grass_version = os.getenv("VERSION_NUMBER", "unknown") -+trunk_url = "" -+addons_url = "" -+if grass_version != "unknown": -+ major, minor, patch = grass_version.split(".") -+ trunk_url = f"https://github.com/OSGeo/grass/tree/releasebranch_{major}_{minor}/" -+ addons_url = f"https://github.com/OSGeo/grass-addons/tree/grass{major}/" -+ - header_base = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> - <html> - <head> -@@ -295,9 +121,6 @@ sourcecode = string.Template( - <a href="${URL_SOURCE}">${PGM} source code</a> - (<a href="${URL_LOG}">history</a>) - </p> --<p> -- ${DATE_TAG} --</p> - """ - ) - -@@ -624,7 +447,6 @@ else: - source_url = addons_url - pgmdir = os.path.sep.join(curdir.split(os.path.sep)[-3:]) - url_source = "" --addon_path = None - if os.getenv("SOURCE_URL", ""): - addon_path = get_addon_path() - if addon_path: -@@ -655,23 +477,11 @@ if index_name: - else: - url_log = url_source.replace(tree, commits) - -- git_commit = get_last_git_commit( -- src_dir=curdir, -- addon_path=addon_path if addon_path else None, -- is_addon=True if addon_path else False, -- ) -- if git_commit["commit"] == "unknown": -- date_tag = "Accessed: {date}".format(date=git_commit["date"]) -- else: -- date_tag = "Latest change: {date} in commit: {commit}".format( -- date=git_commit["date"], commit=git_commit["commit"] -- ) - sys.stdout.write( - sourcecode.substitute( - URL_SOURCE=url_source, - PGM=pgm, - URL_LOG=url_log, -- DATE_TAG=date_tag, - ) - ) - sys.stdout.write( diff --git a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch b/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch deleted file mode 100644 index 1eca86750ecd..000000000000 --- a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://github.com/OSGeo/grass/pull/2269 ---- a/lib/imagery/Makefile -+++ b/lib/imagery/Makefile -@@ -7,7 +7,6 @@ - - include $(MODULE_TOPDIR)/include/Make/Lib.make - include $(MODULE_TOPDIR)/include/Make/Doxygen.make --include $(MODULE_TOPDIR)/include/Make/Grass.make - - # images - IMGSRC := $(wildcard *.png) $(wildcard *.jpg) $(wildcard *.gif) diff --git a/sci-geosciences/grass/grass-8.0.0.ebuild b/sci-geosciences/grass/grass-8.0.0.ebuild deleted file mode 100644 index 3ab8a5a5d5f2..000000000000 --- a/sci-geosciences/grass/grass-8.0.0.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="sqlite" # bug 572440 -WX_GTK_VER="3.0-gtk3" - -inherit autotools desktop python-single-r1 toolchain-funcs 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/8.0" -if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~ppc x86" -fi -IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp 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/six[${PYTHON_USEDEP}] - ') - sci-libs/gdal:= - sys-libs/gdbm:= - sys-libs/ncurses:0= - sci-libs/proj:= - sci-libs/xdrfile - sys-libs/zlib - media-libs/libglvnd - media-libs/glu - blas? ( - virtual/cblas[eselect-ldso(+)] - virtual/blas[eselect-ldso(+)] - ) - fftw? ( sci-libs/fftw:3.0= ) - geos? ( sci-libs/geos:= ) - lapack? ( virtual/lapack[eselect-ldso(+)] ) - 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:4.0 - x11-libs/cairo[X,opengl?] - 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=" - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - X? ( dev-lang/swig )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - # bug 746590 - "${FILESDIR}/${PN}-flock.patch" - "${FILESDIR}/${PN}-${PV}-mkhtml.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 - 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() { - if use X; then - local WX_BUILD=yes - setup-wxwidgets - fi - - 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) - $(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) - $(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 - - # fix paths in addons makefile includes - local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/ - for f in "${scriptMakeDir}"/*; do - file="${f##*/}" - echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - done - - # get proper folder for grass path in script - local gisbase=/usr/$(get_libdir)/${MY_PM} - sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\ -GISBASE = os.path.normpath(\"${gisbase}\"):" \ - -i "${ED}"/usr/bin/grass || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ - "${ED}"${gisbase}/etc/fontcap || die - - # set proper python interpreter - sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ -os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ - -i "${ED}"/usr/bin/grass || die - - # set proper GISDBASE directory path in the demolocation .grassrc80 file - sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \ - -i "${ED}"${gisbase}/demolocation/.grassrc80 || die - - if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - 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.0.1.ebuild b/sci-geosciences/grass/grass-8.0.2.ebuild index f2a791cdcee7..ff4658b5ba17 100644 --- a/sci-geosciences/grass/grass-8.0.1.ebuild +++ b/sci-geosciences/grass/grass-8.0.2.ebuild @@ -32,7 +32,7 @@ else S="${WORKDIR}/${MY_P}" fi -IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" +IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} opengl? ( X )" @@ -59,7 +59,7 @@ RDEPEND=" fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) - liblas? ( sci-geosciences/liblas ) + las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) @@ -184,7 +184,7 @@ src_configure() { $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config) + $(use_with las 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) @@ -274,6 +274,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ pkg_postinst() { use X && xdg_pkg_postinst + ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed' + ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)' } pkg_postrm() { diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild b/sci-geosciences/grass/grass-8.2.0.ebuild index 92ed99c98cc2..d326298a52b2 100644 --- a/sci-geosciences/grass/grass-8.0.1-r1.ebuild +++ b/sci-geosciences/grass/grass-8.2.0.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu HOMEPAGE="https://grass.osgeo.org/" LICENSE="GPL-2" -SLOT="0/8.0" +SLOT="0/8.2" GVERSION=${SLOT#*/} MY_PM="${PN}${GVERSION}" @@ -32,7 +32,7 @@ else S="${WORKDIR}/${MY_P}" fi -IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" +IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} opengl? ( X )" @@ -59,7 +59,7 @@ RDEPEND=" fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) - liblas? ( sci-geosciences/liblas ) + las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) @@ -93,7 +93,6 @@ BDEPEND=" PATCHES=( # bug 746590 "${FILESDIR}/${PN}-flock.patch" - "${FILESDIR}/${P}-lib_imagery.patch" ) pkg_setup() { @@ -185,7 +184,7 @@ src_configure() { $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config) + $(use_with las 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) @@ -275,6 +274,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ pkg_postinst() { use X && xdg_pkg_postinst + ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed' + ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)' } pkg_postrm() { diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index 31ad3a913914..33808453c9c7 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu HOMEPAGE="https://grass.osgeo.org/" LICENSE="GPL-2" -SLOT="0/8.1" +SLOT="0/8.3" GVERSION=${SLOT#*/} MY_PM="${PN}${GVERSION}" @@ -32,7 +32,7 @@ else S="${WORKDIR}/${MY_P}" fi -IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" +IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} opengl? ( X )" @@ -59,7 +59,7 @@ RDEPEND=" fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) - liblas? ( sci-geosciences/liblas ) + las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) @@ -179,7 +179,7 @@ src_configure() { $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config) + $(use_with las 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) @@ -269,6 +269,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ pkg_postinst() { use X && xdg_pkg_postinst + ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed' + ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)' } pkg_postrm() { diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml index 5114a3d95217..66b650a3707b 100644 --- a/sci-geosciences/grass/metadata.xml +++ b/sci-geosciences/grass/metadata.xml @@ -21,6 +21,7 @@ <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="las">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag> <flag name="opencl">Enable OpenCL support</flag> </use> <upstream> diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest index 0bf09877ef0c..652ad8e45157 100644 --- a/sci-geosciences/josm-bin/Manifest +++ b/sci-geosciences/josm-bin/Manifest @@ -1,5 +1,5 @@ -DIST josm-snapshot-18387.jar 16234138 BLAKE2B 9fea2eb3949bad9d4ce5fcb8bdbbc5314e81010de08338d459e3704009d457886081c2fb0977d55f89621f528afc09dba318787e2cde61e3a0adde35d4731679 SHA512 d9c429ad68df9993769fbe94020675bb560224008244cfaae9a062c3484a7bd2eefc05338e3c931a3c856a097e27d3e0e94ff2af5404a9aa2a30ecd4d6f747ff DIST josm-snapshot-18427.jar 16255913 BLAKE2B 9c47d32ab2e199645aa84b6ccdec710cb95e93df7b7c5745378aa2338ead4bd3ad851bca91b701de4f2e4f9e815fb8a6b71aa203c81e2ec323cc43d8d79fe110 SHA512 5269c3bba5d0376c4da9eb9cd561429d9b92ee554b458fd00f3e93607420cdbcdcc5389b58966a15b6ef2a3b94d3bb4bb5d421c5e28e1b6575369df44ed96f87 -EBUILD josm-bin-18387.ebuild 904 BLAKE2B 9ed52ecb81273d828594dc0d0ee3cfa286c08fecfaf3a1605a8de715e9d45eaa7da69a998860bf511992cac1225deacb3b8f3733209dbe450cc4d6dc92af3d38 SHA512 f3fa3232bff0f2ad95afe62f0979e11b38010dd9a27765ec71c1002f32ecae3d0c13feb74b74b682a1fea84da44bb915841057bd8305a7a6c9c742eae3eab197 -EBUILD josm-bin-18427.ebuild 904 BLAKE2B 9ed52ecb81273d828594dc0d0ee3cfa286c08fecfaf3a1605a8de715e9d45eaa7da69a998860bf511992cac1225deacb3b8f3733209dbe450cc4d6dc92af3d38 SHA512 f3fa3232bff0f2ad95afe62f0979e11b38010dd9a27765ec71c1002f32ecae3d0c13feb74b74b682a1fea84da44bb915841057bd8305a7a6c9c742eae3eab197 +DIST josm-snapshot-18463.jar 16273803 BLAKE2B 043121ca1e7512207608dfaa549a53d70532a6844028f2fb2554fc187e41f4220a5aec9032c734356f6f1f42478c5bdb74d7498a9c45929daa430e89ba61c64f SHA512 46152f16a3a019d9231a27f584e5bd8b5865c01e2a9bf94179c81c69fd32fcf532b6d02222e41bf431c3981a0bf375ce7be17551b3c2d7fb0734671bc4e59071 +EBUILD josm-bin-18427.ebuild 902 BLAKE2B 09809516397c8139b7c7a5aaa8455846a7fb2a7c43aba801b3c437ae56cd885c0e14782dfb6eee7dfb2c21c0e5a42863f7cba0ccc1211cbe1ed19ed05c7b06e8 SHA512 e04057f2dc94db22192bcfad3652cb9154475febe86268e25838a9e2afc78e1452edf748441e032600ad9408bf65b7b74b8a08cee7ee5f4797da0b08c6fe77bc +EBUILD josm-bin-18463.ebuild 904 BLAKE2B 9ed52ecb81273d828594dc0d0ee3cfa286c08fecfaf3a1605a8de715e9d45eaa7da69a998860bf511992cac1225deacb3b8f3733209dbe450cc4d6dc92af3d38 SHA512 f3fa3232bff0f2ad95afe62f0979e11b38010dd9a27765ec71c1002f32ecae3d0c13feb74b74b682a1fea84da44bb915841057bd8305a7a6c9c742eae3eab197 MISC metadata.xml 544 BLAKE2B 7a1610f8796ea0ea5772fccae64a2a91017c8701f847b03f61624240caca1b655b7865d649790b15b43fc565f5c26dc196c45053207c7caeae2601ec5f290840 SHA512 74c714e664fb2833868093bae98511b5b99955cc862c687bef981280fe86b3663acf8c093d34daa3b30809f1a57910797daf3b2cc79bca50e218213780612e0d diff --git a/sci-geosciences/josm-bin/josm-bin-18427.ebuild b/sci-geosciences/josm-bin/josm-bin-18427.ebuild index 3a5ff50d232a..37cce593e359 100644 --- a/sci-geosciences/josm-bin/josm-bin-18427.ebuild +++ b/sci-geosciences/josm-bin/josm-bin-18427.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}" LICENSE="Apache-2.0 GPL-2+ GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=">=virtual/jre-1.8" BDEPEND="app-arch/unzip" diff --git a/sci-geosciences/josm-bin/josm-bin-18387.ebuild b/sci-geosciences/josm-bin/josm-bin-18463.ebuild index 3a5ff50d232a..3a5ff50d232a 100644 --- a/sci-geosciences/josm-bin/josm-bin-18387.ebuild +++ b/sci-geosciences/josm-bin/josm-bin-18463.ebuild diff --git a/sci-geosciences/opencpn-plugin-weather_routing/Manifest b/sci-geosciences/opencpn-plugin-weather_routing/Manifest index 46f4a11a95f9..20252c36e6c6 100644 --- a/sci-geosciences/opencpn-plugin-weather_routing/Manifest +++ b/sci-geosciences/opencpn-plugin-weather_routing/Manifest @@ -1,4 +1,4 @@ -DIST opencpn-plugin-weather_routing-1.10.1.tar.gz 845403 BLAKE2B e7cacef78f2f5567c008452c6c24eacf3acde8f8dcd78aa05f1e36248f31ab946f27c0bacdbb0882dcc1075a0fe15d6ddd62f5e24f7c38fffaf577683de6a345 SHA512 052377bc2b962b131640ecdb2e688b97325a7935f60c68652be6bdb07486278d03d09ec2c8b4b1547e5eeab1ea7613890604c800a91f185babe5bfb5221a7337 -EBUILD opencpn-plugin-weather_routing-1.10.1.ebuild 777 BLAKE2B bd03ab8cf466ef4d4f8c506f7a70515b17f0eafe00cb7c5576b6993305888fc66db77a6326c2cd17dd08eb8b8719cc83b71b02739b1eceac1f215587dc01f427 SHA512 f83452bdc60882de93ae858cf160492d9b67ee4e874f3159acab0e5eb24a3bb5a90a9ca5f4b50d28d61921cc44882b3f879d6a32eefce054e4d4643d609dfc22 -EBUILD opencpn-plugin-weather_routing-9999.ebuild 777 BLAKE2B bd03ab8cf466ef4d4f8c506f7a70515b17f0eafe00cb7c5576b6993305888fc66db77a6326c2cd17dd08eb8b8719cc83b71b02739b1eceac1f215587dc01f427 SHA512 f83452bdc60882de93ae858cf160492d9b67ee4e874f3159acab0e5eb24a3bb5a90a9ca5f4b50d28d61921cc44882b3f879d6a32eefce054e4d4643d609dfc22 +DIST opencpn-plugin-weather_routing-1.13.1.tar.gz 893533 BLAKE2B 011eed0e6c4b463a89e83611f1b5b6dcb74edd65100a8fe444c5623ea85c20666194586964c2ed0b8a8b1d2d790026affccc034d98ea375284048fd33983a092 SHA512 43661df7b1a823f38a928a899bca58cd7451b663e23843bdf79000c0bc4e95cf9491e21e7a5ea6ad33f6a15e0a72c68058779ee241ad338a907852d048b5bc45 +EBUILD opencpn-plugin-weather_routing-1.13.1.ebuild 767 BLAKE2B 787191df716ae19da24a7c7e65bcd21e87162f3cdd683778f3577922854b0b98b51341f0eb88fd0f7ae2fa7eec490c7fbdf36cf92248ba850676089fbc82c559 SHA512 eba1e33f807deca48dca2c5d46090b304015102f2df9a542af9027d66ebdd098809637420c795a2d08f36a62a6d24124ab7b3434f878ab4c24fc375c14bbd92e +EBUILD opencpn-plugin-weather_routing-9999.ebuild 767 BLAKE2B 787191df716ae19da24a7c7e65bcd21e87162f3cdd683778f3577922854b0b98b51341f0eb88fd0f7ae2fa7eec490c7fbdf36cf92248ba850676089fbc82c559 SHA512 eba1e33f807deca48dca2c5d46090b304015102f2df9a542af9027d66ebdd098809637420c795a2d08f36a62a6d24124ab7b3434f878ab4c24fc375c14bbd92e MISC metadata.xml 478 BLAKE2B 7126f955f011452ea4c9265527eed6fb8dd6477184813fc884e56c53f54501aea7f73efbc561d1b24bc42588a0520d01285a04017b9499db4f05aeb1e8a3c45e SHA512 b14e31eb7f78fc695b3f9ad65b23633e9984fc15fd673b1d70f234155bd9b5a5d5689aa5c01fe70ee6705580b87d50343705e0d3d59b3664df401bc228920c2b 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.13.1.ebuild index 826df2e8f0ba..2d4a9d906c36 100644 --- 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.13.1.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -WX_GTK_VER="3.0" +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/seandepagnier/${MY_PN}.git" + 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" + 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" 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 826df2e8f0ba..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,24 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -WX_GTK_VER="3.0" +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/seandepagnier/${MY_PN}.git" + 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" + 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" diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest index 5162cda3eb58..7c1274a1aa1b 100644 --- a/sci-geosciences/opencpn/Manifest +++ b/sci-geosciences/opencpn/Manifest @@ -1,5 +1,4 @@ -AUX opencpn-5.2.4-cmake.patch 591 BLAKE2B f91412ce753bc8cd1806bb5b0e64a6ef924ea93be42fb15337a4e0d2d723b3329ddfd2c6adc5694b2442a205f1827e2081a087510621e74209b5cfd200c189b6 SHA512 c9b4da53fab5007c06461236bee1952d64d685626d7c81f977f219c8aef85359204e2a396def663c2e58c3fb9ed4e07f2bced141ffe1a4d6e07901b6c8da4183 -DIST opencpn-5.2.4.tar.gz 81226481 BLAKE2B 7c5bb1157e94d3271bce899740cdf6d9d5dc17c4406b3020fa8a91ae728ca3c0ddab799affa219b833df86e547de91b2e6ccd11fa57fff056550a440d9968fad SHA512 13543272fe4c68b911c42fdc19f0bd7842809edc8e91d73899030f70668e78c448474541a5742ad675d6e2b361240ca1a5d603b163f8b5107539720442ee19a0 +DIST opencpn-5.6.2.tar.gz 82919992 BLAKE2B a45e19d293d63262f2bb6bd0bd5d18723cadd0b93af8e64484b55d246cebbe623dccbb6a1d257eccd74fb9111953d9cdd4b44d6f3fb38c3a9f40fa253718f337 SHA512 6d90b21448b2d2a58685592e92647108978012cbaa25999d98855dca222e013784ca4e351eb08efd0a18980cccffb28b0d3c171ea9207e5fb37889e3a3b377e3 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb -EBUILD opencpn-5.2.4.ebuild 1285 BLAKE2B f2d056230fd908e8ce816fd7a11c24640a29399258d642d645c670ad11b27b463258a1f531ea3d0c0040f7311ebd69a9c8a9e8a35f333bfed6f677640355495d SHA512 c683ab1e8ddc1a61c21260e6378ce0655465e733fed7057889edcbb1b8e63e986511cb8e36d7e99277cb28df55329598300436ea68c5e1ea49dfe92d7bd7487a +EBUILD opencpn-5.6.2.ebuild 1266 BLAKE2B d7528a2b59fb6dc1b85fdadff69075f27324b33f62a722d6deb9aee6831103fc9fa0e5a288f29f1c63242ddad1fede04d0841cafae8abc8de505384046b340e4 SHA512 c3e701816d645aeeca02d180f2d969d7696cb733dde790f4d753a3e535688cf094be5d6df049e974974b07b2ad6e07833b1d5f18bf7a8add76d337112059c485 MISC metadata.xml 532 BLAKE2B f58755354fa6e133c3d948f9b57165ddc5dceed8548a599665f093500ea3451b83331324eda72bc3654b5ec49e2c0032421b4f6a20f270c2e7a14715fea5e0b0 SHA512 38390912b33d945d24fe81ab0bd23d09a1207e0eaaf68d4101748a41cd8237251e5451df277a98b65a16d6acfad8adb27c20b842e90decba25dbf98bfb580e72 diff --git a/sci-geosciences/opencpn/files/opencpn-5.2.4-cmake.patch b/sci-geosciences/opencpn/files/opencpn-5.2.4-cmake.patch deleted file mode 100644 index 4c2ea09ae159..000000000000 --- a/sci-geosciences/opencpn/files/opencpn-5.2.4-cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt 2021-11-02 01:45:56.488999411 -1000 -+++ b/CMakeLists.txt 2021-11-02 01:51:53.343219957 -1000 -@@ -756,9 +756,9 @@ - # looked for them. This is a nasty fix which might fail miserably. Assumption: - # All builds using GTK uses unicode and wxWidgets 3.0 - if (GTK3_FOUND) -- list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_aui-3.0") -+ list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_aui-3.0-gtk3") - if (OPENGL_FOUND) -- list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_gl-3.0") -+ list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_gl-3.0-gtk3") - endif () - endif () - diff --git a/sci-geosciences/opencpn/opencpn-5.2.4.ebuild b/sci-geosciences/opencpn/opencpn-5.6.2.ebuild index f4be4868019e..023654a26760 100644 --- a/sci-geosciences/opencpn/opencpn-5.2.4.ebuild +++ b/sci-geosciences/opencpn/opencpn-5.6.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WX_GTK_VER="3.0-gtk3" inherit wxwidgets xdg cmake @@ -11,9 +11,9 @@ 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 + 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-${PV}" +S="${WORKDIR}/OpenCPN-Release_${PV}" LICENSE="GPL-2+" SLOT="0" @@ -36,8 +36,6 @@ BDEPEND=" sys-devel/gettext sys-apps/lsb-release" -PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) - src_configure() { use doc && HTML_DOCS=( "${S}"/../${PN}/doc/. ) diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index ce9a01482542..60be1f3b3025 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -2,9 +2,15 @@ AUX qgis-3.22.5-install-grass8-scripts.patch 786 BLAKE2B fbffb03339dddad1479c8a8 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb DIST qgis-3.22.6.tar.bz2 138056354 BLAKE2B a1f7681ae71b4f06c8e4542fe1351fbd0fd0c5a07934b1eb5e535d17a5c0432a9df1489db34dfdcbb776c55c233f3f53c8c1aaf957ba0b8445c4738c9a504cf2 SHA512 5ef36d6d93e5f7562f4ef2dc2a738057376153e7b34fdef7dd4cf278334d61af0b3380712b22961c3693088036d18167f9b2c2f623f405c668e8b48ef2f93d20 +DIST qgis-3.22.7.tar.bz2 138076419 BLAKE2B 25e164e9da681dc78546b2492ec85dc97976f8f6e33e41244b8d72ef109edf9c482f00807183338da1e23a0dc9fbf0526953f053f67aff5723dc30ed280daae2 SHA512 d85b88a7a9aee17e7f8179c7d715bc60e64de5bdb41498177886ecdf5da2d707e3880715b6eaba4af86398666da4e322b0fac6b03f6aa907c9e39bfe4d93db91 +DIST qgis-3.22.8.tar.bz2 138285002 BLAKE2B d9c94c9e9836f342242000279217fcd7ceee63693829306b7927378b61b5cf9a2d6c78d41722e44b515653d73ea89d104ecb0a7f1688e294d75cad52bcf065e0 SHA512 80fec733fde090b3be0ba4cad1c8709023dac2fc254d2ed10540d8a929ced3218d7ae69c11b396f9424280b1746a84871d457380aaad8e65ffc62b150c731bd2 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d EBUILD qgis-3.22.0-r4.ebuild 5420 BLAKE2B dc36fe6b812a086e27fb2d64704116820f2e69985c7a85ffa8369589fe965f0b49bf039776f01435d6f7af06f8e0766cd3ec5be168924686a16b81087c8eb863 SHA512 bb9cf572439f8f4993898b62047bea605cb1c6b5315aaeb319597f831dd62b9aee4eb8112749eec7177e738e54a5b363dc86f3ab70a8839a994996d0f5ab78b5 -EBUILD qgis-3.22.5.ebuild 7287 BLAKE2B ad70353e43052e10886881dd89dc7ea8f4f840e0cadc67596f7d778747b20e147cfa61c721d0dde99784c3d0d90630a25145ecb648bf3429a702c52dcab01d0c SHA512 d03e1f57afe052ede7fdc608f6d5ec743be9d1c57ab0fce066d96773899705fa0a5a5ef832f5ecfdc4572e8c1760cbf47ecb3f09970d55b62c6eba9a97a204b8 +EBUILD qgis-3.22.5.ebuild 7286 BLAKE2B 56718ea1eba27279618e85bae6ee8f82683c194495034a9235608c62877c28eb82b1a1d45acaa61445d38f09c0bd295d7ba2368c46f52e768a0df27c403fb9f1 SHA512 928b6d1da9ba779f23b94031791d12e9e2965c5272844dac254870547c0368c0834c2d8b0d23e4704a67587f0103b79a40effc7f4d483a5044248dc154cae24d EBUILD qgis-3.22.6.ebuild 11049 BLAKE2B 5a8d4662530f4ec28a2729e6c29e317047357dabac41a55d1b8961417c6a130877cfcf15e0573502dd6dd51604043416ea2717da563972687705ecee9bd3aee0 SHA512 4575d7062b418eafa7fe0ffc816459c18ca6576051d4351a3a94f7633274ddc8ec822d17242b73c250fcb84777fdd309b425dfb9dc3227a0b60c79b17d7c1d58 -EBUILD qgis-9999.ebuild 11094 BLAKE2B 26af643627474796cc1dc06bc13806bc291d7a6e8c8485f33aecf1228af60a1e5f66b4f77d00e01e72861e000c16f382e2aae027d871de419763b632f1bee85e SHA512 427f3702c50e42faa0d69e22798d454b9820290c64fe62cb163c665d4337d311a1281d7d07817c40c3000ac7e2a521310ef7940c1c8653c5e5f602e4ed6c4057 +EBUILD qgis-3.22.7-r1.ebuild 11055 BLAKE2B fdcb354bd3bd105b905cbd9e124fb8ccab539ad9f45b64906966b2b035680e7071c09e12d583050e420064ceebefb63b54caac6c48b2a8935b9af8064493f84c SHA512 13a65857bd19d7a37018f9ed2283d261cb9c1a26abd8fee41ba0ea9c153d77b5f606d03e346ab12454a3745f3f297a32de4f3bdc57fad59ff9bb1b07c9b5f034 +EBUILD qgis-3.22.7-r2.ebuild 10679 BLAKE2B ef670493f54038009ca8d30cdb8867378c28ca6f126fe30f729e835115811ac0772a28fbd1867fd40e56a158fc0842c0764a2d984b3d059214922e8cbeee0d8a SHA512 5183042e26a965d2837357b78b9ce6ba55ddf8b59ae5829b945e1875f876f6e0312f25361ef7c0f2d5c4c0666b7984a159ce4908300466966c525bd284adaaeb +EBUILD qgis-3.22.7.ebuild 11049 BLAKE2B c186d65df66548487d1878f3511e2a0f694ff17f34c1ba38d7fed013b54a1fa9d4c9bd3d55f5d0aec7e7dd1713b5933eaf0f1bc39fa66b584258c1cfddf3def3 SHA512 6d789a3673c81515b87ebb4828e77b9067577d03f42a938bd0c76fee6cedc856a034e09a54e08857c3fb46ec384417e9c4f2e4b70762f60bf392956a5cede0ea +EBUILD qgis-3.22.8.ebuild 10679 BLAKE2B ef670493f54038009ca8d30cdb8867378c28ca6f126fe30f729e835115811ac0772a28fbd1867fd40e56a158fc0842c0764a2d984b3d059214922e8cbeee0d8a SHA512 5183042e26a965d2837357b78b9ce6ba55ddf8b59ae5829b945e1875f876f6e0312f25361ef7c0f2d5c4c0666b7984a159ce4908300466966c525bd284adaaeb +EBUILD qgis-9999.ebuild 10814 BLAKE2B 4585e55628d4c661868f6fb4f4ad6ce37b550ef05e3619906fe926d83f9e48c05b7ec493b0d242aa53f111429f679923e93e59fc473169f5a5137f9ad7fdf26e SHA512 f7ddb41a2542f48691b4abf05182b7adf055e6d6b97c40b8e2ee5654698684e8386e58ba562c3ef13ec0216fab9bc7cea9fa1b08cc73abc1340bc06ebda2d75e MISC metadata.xml 1580 BLAKE2B 66cde139d4014d816207d9b85fceee3d5c630e9dce42b84472cd3a6f42f9d49247cae35a93f8590a44af411a9fceebc05c5a1d75d68ba6d5e5a0238fe85b22c4 SHA512 ff8aefd056cc28a21f9af93201ab71c880bd423289933c2a0588f915ebd60e62d62d5046fe404a2c5a4350816299c50349d151223ad9959f885adc310fc6615b diff --git a/sci-geosciences/qgis/qgis-3.22.5.ebuild b/sci-geosciences/qgis/qgis-3.22.5.ebuild index 7aca973d344b..3489bad447fe 100644 --- a/sci-geosciences/qgis/qgis-3.22.5.ebuild +++ b/sci-geosciences/qgis/qgis-3.22.5.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then else SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi inherit cmake python-single-r1 xdg diff --git a/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild b/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild new file mode 100644 index 000000000000..20f78cf866b8 --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.22.7-r1.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="sqlite" + +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 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 pdal polar postgres python qml serial test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" + +# Disabling test suite because upstream disallow running from install path +RESTRICT="!test? ( test )" + +# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of +# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies) +# Keep an eye on that bug / a fixed GRASS release and readd support +# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed! +# (No need to change the supported GRASS versions in src_configure b/c +# it won't find GRASS 8 with this dependency set.) +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/qtsvg:5 + dev-qt/qtsql: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:= + sys-libs/zlib + >=sci-libs/proj-4.9.3:= + >=x11-libs/qscintilla-2.10.1:=[qt5(+)] + >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] + 3d? ( dev-qt/qt3d: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] + ) + 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/future[${PYTHON_USEDEP}] + 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,network,positioning,printsupport,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-5:=[${PYTHON_USEDEP}] + dev-python/six[${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 + python? ( ${PYTHON_DEPS} ) +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" +BDEPEND=" + ${PYTHON_DEPS} + dev-qt/linguist-tools:5 + sys-devel/bison + sys-devel/flex + 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 +} + +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 + -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml + -DPEDANTIC=OFF + -DUSE_CCACHE=OFF + -DWITH_ANALYSIS=ON + -DWITH_APIDOC=OFF + -DWITH_GUI=ON + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=$(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 ) + + # 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 + # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059 + -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_offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVirtualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)' + + --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.22.7-r2.ebuild b/sci-geosciences/qgis/qgis-3.22.7-r2.ebuild new file mode 100644 index 000000000000..1124e0d0de93 --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.22.7-r2.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="sqlite" + +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 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 pdal polar postgres python qml serial test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" + +# Disabling test suite because upstream disallow running from install path +RESTRICT="!test? ( test )" + +# See bug #850787 re sip-6.6. +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/qtsvg:5 + dev-qt/qtsql: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:= + sys-libs/zlib + >=sci-libs/proj-4.9.3:= + >=x11-libs/qscintilla-2.10.1:=[qt5(+)] + >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] + 3d? ( dev-qt/qt3d: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/future[${PYTHON_USEDEP}] + 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,network,positioning,printsupport,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-6.6:=[${PYTHON_USEDEP}] + dev-python/six[${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 + python? ( ${PYTHON_DEPS} ) +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" +BDEPEND=" + ${PYTHON_DEPS} + dev-qt/linguist-tools:5 + sys-devel/bison + sys-devel/flex + 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 +} + +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 + -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml + -DPEDANTIC=OFF + -DUSE_CCACHE=OFF + -DWITH_ANALYSIS=ON + -DWITH_APIDOC=OFF + -DWITH_GUI=ON + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=$(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 ) + + # 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 + # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059 + -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_offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVirtualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)' + + --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.22.7.ebuild b/sci-geosciences/qgis/qgis-3.22.7.ebuild new file mode 100644 index 000000000000..30e49896a601 --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.22.7.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="sqlite" + +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 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 pdal polar postgres python qml serial test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" + +# Disabling test suite because upstream disallow running from install path +RESTRICT="!test? ( test )" + +# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of +# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies) +# Keep an eye on that bug / a fixed GRASS release and readd support +# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed! +# (No need to change the supported GRASS versions in src_configure b/c +# it won't find GRASS 8 with this dependency set.) +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/qtsvg:5 + dev-qt/qtsql: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:= + sys-libs/zlib + >=sci-libs/proj-4.9.3:= + >=x11-libs/qscintilla-2.10.1:=[qt5(+)] + >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] + 3d? ( dev-qt/qt3d: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] + ) + pdal? ( sci-libs/pdal:= ) + polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) + postgres? ( dev-db/postgresql:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_USEDEP}] + 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,network,positioning,printsupport,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-5:=[${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:5 ) + serial? ( dev-qt/qtserialport:5 ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/qttest:5 + python? ( ${PYTHON_DEPS} ) +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" +BDEPEND=" + ${PYTHON_DEPS} + dev-qt/linguist-tools:5 + sys-devel/bison + sys-devel/flex + 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 +} + +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 + -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml + -DPEDANTIC=OFF + -DUSE_CCACHE=OFF + -DWITH_ANALYSIS=ON + -DWITH_APIDOC=OFF + -DWITH_GUI=ON + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=$(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 ) + + # 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 + # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059 + -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_offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVirtualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)' + + --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.22.8.ebuild b/sci-geosciences/qgis/qgis-3.22.8.ebuild new file mode 100644 index 000000000000..1124e0d0de93 --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.22.8.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="sqlite" + +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 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 pdal polar postgres python qml serial test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" + +# Disabling test suite because upstream disallow running from install path +RESTRICT="!test? ( test )" + +# See bug #850787 re sip-6.6. +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/qtsvg:5 + dev-qt/qtsql: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:= + sys-libs/zlib + >=sci-libs/proj-4.9.3:= + >=x11-libs/qscintilla-2.10.1:=[qt5(+)] + >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] + 3d? ( dev-qt/qt3d: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/future[${PYTHON_USEDEP}] + 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,network,positioning,printsupport,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-6.6:=[${PYTHON_USEDEP}] + dev-python/six[${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 + python? ( ${PYTHON_DEPS} ) +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" +BDEPEND=" + ${PYTHON_DEPS} + dev-qt/linguist-tools:5 + sys-devel/bison + sys-devel/flex + 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 +} + +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 + -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml + -DPEDANTIC=OFF + -DUSE_CCACHE=OFF + -DWITH_ANALYSIS=ON + -DWITH_APIDOC=OFF + -DWITH_GUI=ON + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=$(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 ) + + # 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 + # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059 + -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_offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVirtualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)' + + --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-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 52cef87319b2..2d3c9b473c26 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" if [[ ${PV} = *9999* ]]; then @@ -28,12 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" # Disabling test suite because upstream disallow running from install path RESTRICT="!test? ( test )" -# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of -# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies) -# Keep an eye on that bug / a fixed GRASS release and readd support -# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed! -# (No need to change the supported GRASS versions in src_configure b/c -# it won't find GRASS 8 with this dependency set.) +# See bug #850787 re sip-6.6. COMMON_DEPEND=" app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 @@ -63,7 +58,7 @@ COMMON_DEPEND=" >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 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:= ) @@ -77,6 +72,7 @@ COMMON_DEPEND=" postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} + >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' dev-python/future[${PYTHON_USEDEP}] dev-python/httplib2[${PYTHON_USEDEP}] @@ -91,9 +87,8 @@ COMMON_DEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] - <dev-python/sip-5:=[${PYTHON_USEDEP}] + <dev-python/sip-6.6:=[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) ') ) @@ -121,10 +116,6 @@ BDEPEND=" ) " -pkg_setup() { - python-single-r1_pkg_setup -} - src_prepare() { cmake_src_prepare } @@ -221,8 +212,7 @@ src_configure() { src_test() { local myctestargs=( # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 - # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059 - -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_offlineediting|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_meshlayerpropertiesdialog|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|qgis_grassprovidertest8|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|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVirtualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)' + -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 ) diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest index 41dda526bfd0..bcfa5cb6f800 100644 --- a/sci-geosciences/routino/Manifest +++ b/sci-geosciences/routino/Manifest @@ -1,4 +1,4 @@ AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3db8417bd8bcc62c8d15a5ed2f43ae8b55e56870ca037b98de2c424f258d139dff11c0128ac60940f09ace6 SHA512 52cbd47e68b25a7c735d32a4bb51436ea45867cdb9f86bc3a55304674b80d33dcc41f845527659db345e118f2f56036a2265a98a177744b4cb1029c7a18e202e DIST routino-3.3.3.tgz 2564198 BLAKE2B 0476e4afb2279c6a93b3d5192a1be580b0ee20fe07b5101c7d590bd3b74873e0205549c2fa621c6444eea0dd0cf0545c9fc054454e04f434d3e57ed750b1df3d SHA512 b037f6ef38b3abef4639d639c3564b42adc742d225108905d0cacb790e4a07593245c537b5550c43874cd6083f37b710b7aec02a0b0669c927804cf30ce34386 -EBUILD routino-3.3.3.ebuild 1646 BLAKE2B ea2ffcbf13ac57706fd2f2f33aa0e7a61f02eef638ecead1628f7b8c2fa5ef1faba674e0f23734ba5e7169239ab60f22620fc1fbb84563d8d96980861b5d422d SHA512 f04972ec4cdc6bcbb5b7af24ab2295bf7d430e57c2eb5fe29884cb0bb4c9b02735c4ca310568cabdcb543955970d704f26bcdd5ecf56196752b630081c2947f1 +EBUILD routino-3.3.3-r2.ebuild 1639 BLAKE2B bfedac5a070ae7830d8b31036dd8cf5b3fd86e072f9fa8584b8e553f038b740183b92b297ef869221cf2d02f45f174905840b0fd302f9a15fc2aa0ae4ada4ff5 SHA512 7ca30165b7947eb305c57174d120d7c8f2b717e6adb729dff59499d0a680bdd41aaecc31924a9ac0430c4c4de7d9e2a2c21757290ece5f470ae11899ab3ef240 MISC metadata.xml 894 BLAKE2B e9854b11005fdab70046e42a963c65a4e921f2d05572c4591e0ee581316a8ba3d3a5a0df39cf2aa500b1a89bde29fd1aaa459962abb68fdc71b49abd9681db54 SHA512 1397fb38a051f523925f04ab1d77044f2bbbcb2957a724696b54d6c057d49d67e758ae3d5b3c925fbce95f35e95c8b3a191724021bb82d4aa35ea61bc2c2153a diff --git a/sci-geosciences/routino/routino-3.3.3.ebuild b/sci-geosciences/routino/routino-3.3.3-r2.ebuild index f10841c69c91..215869319f5a 100644 --- a/sci-geosciences/routino/routino-3.3.3.ebuild +++ b/sci-geosciences/routino/routino-3.3.3-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit toolchain-funcs distutils-r1 DESCRIPTION="Routing application based on openstreetmap data" @@ -40,43 +40,49 @@ src_prepare() { src_compile() { emake -j1 + rm README.txt || die "rm README.txt failed" mv doc/README.txt . || die "mv doc/README.txt . failed" + if use python; then - pushd python > /dev/null - python_compile() { - rm -f build/.timestamp || die - emake PYTHON=${EPYTHON} - } - python_foreach_impl python_compile - popd > /dev/null + 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_test() { emake test -# if use python; then -# pushd python > /dev/null -# python_test() { -# echo "######## ${EPYTHON} ########" -# emake PYTHON=${EPYTHON} test -# } -# python_foreach_impl python_test -# popd > /dev/null -# fi + + # 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 - python_install() { - esetup.py install - python_optimize - } - python_foreach_impl python_install + pushd python > /dev/null || die + distutils-r1_src_install newdoc README.txt README_python.txt - popd > /dev/null + popd > /dev/null || die fi +} +python_install() { + esetup.py install + python_optimize } |