diff options
Diffstat (limited to 'sci-geosciences')
45 files changed, 360 insertions, 1848 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex 39c065e4a00e..af9c6fddccb9 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest index 0ca448711467..b1859086aece 100644 --- a/sci-geosciences/bt747/Manifest +++ b/sci-geosciences/bt747/Manifest @@ -1,5 +1,6 @@ +AUX bt747-2.1.7-source-target.patch 1978 BLAKE2B 723a9946b1213ceb4b8a3e7d70726b3faef31e444b25ffee240dd394e74d1de6c64de093a8f75d820cf8306bb81c03c03da2846a6f101a5ba2ca22e72ad7d53f SHA512 bb14e15ecd406f4f0ce8f58641835a0b8a2f86e99737e5665ebbf23e57e19ecfc34d37a88151eb7d4da6663216e4fbd3cfbbf9880ae1d8aec358c2783f2a470c AUX jchart2d-3.2.patch 490 BLAKE2B c676f77a4d7db06a61b445c85ad551aa1510820599e43e8d98d9803788f829da80485e2e3dfdd0e20c4a57c48acc8a5d2fbad7564930cd849c4adc3c1d615669 SHA512 75f9d1d9cc3cd5c6ce4f99dc6c68b97f4566fd5841d04f5d21fcc44294a8bb6c8046599180564ed9d0e6760bc1bf16a44ae817b07952303fcbd6c1b3ef774641 DIST BT747_2.1.7_full.zip 9649645 BLAKE2B ec714f90395875c26679ace3ea732effff977dcdf3f7003f6282cd3ac87935956b5fc829a60e98acd8533d7b6fc482bc9c7ee9348f3972b5cf59db5476009730 SHA512 362533ccbf6b9252d6d7e09497a75038b0776e76a2c2f73f05e2abc0c521d0a640d0ae9e7d5d40da1d14850838a2924f17622d91535e90b900a5ae97b66f6b3d DIST bt747.gif 5903 BLAKE2B ae5516dc716ab147b261ea43c0bbb480ae8ab6f3523147fb9fe980e5c53142ac0021448eee3fc7958467a3cd1a38d989f7894112e5a2d5361300e8644b96df00 SHA512 55c3bbc9ec5fe12261b2604980c7b5d4416afa3ec73f7834c62d3ebbdf4580b247c1feb2ac112f876e7110a8aabe652da39d2181f01661435ba465671a631252 -EBUILD bt747-2.1.7-r3.ebuild 1723 BLAKE2B 5dd339c0b626644448b011d5972a5e5aca1264b3d34a2dd33fd3de66d5c6c3878af400ff8f915465c4d7015f5542acff58644e4c859f71305e9c6123af756e17 SHA512 bc69de391b2bd7cfc675ad73636afe5032542d2b966ffe122426ca0f2289c77cecafea2717fb214be52737a58bb30c8d4637f1ec850e01054e1fee4c3143b5cb +EBUILD bt747-2.1.7-r4.ebuild 2448 BLAKE2B 55ca1faffcbe57ffa2d8dc50554f24c007293ad014083e59f638d3c13fd957d1bd45110f2597063d1c7fdd27ee097c89e2004ec3b18cae75994ad0c5b2ed5a7e SHA512 3f311602190800fb803a5840e2f44990024db3801cdde0d240d33a8b83e2cc8e518972ac061b78a9252885005a4b0cbd3c3f75bfa77ee6ee2532100461d7450e MISC metadata.xml 939 BLAKE2B 09e8faea8d375dc63be360cf1d28db08e511a4a76b024b4902decd7065e11661b6b2ab35fde78aa2e118cf8c5d83661c8911aae24bed4578150529bc81d180e0 SHA512 fdf33fb97c25281d4409578979dad4f0549a225df9ab1f2bddda1a30d90b7004b0963a2649ff37a3475d3b5b29f80bb99603b0a96a2852c171a75186d3a6ba59 diff --git a/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild index 4d6823b6b5da..b5b2ecc0515f 100644 --- a/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild +++ b/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit desktop java-pkg-2 java-ant-2 +inherit desktop java-pkg-2 DESCRIPTION="MTK GPS Datalogger Device Control" HOMEPAGE="https://www.bt747.org" @@ -13,9 +13,10 @@ S="${WORKDIR}" LICENSE="GPL-3" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" -BDEPEND="app-arch/unzip:0" +BDEPEND="app-arch/unzip:0 + >=dev-java/ant-1.10.14-r3:0" CDEPEND=" dev-java/commons-imaging:0 dev-java/jcalendar:1.2 @@ -26,23 +27,28 @@ CDEPEND=" dev-java/swingx:1.6 dev-java/swingx-ws:bt747 " + +# Java 11 because of compile error with 1.8 +# /var/tmp/portage/sci-geosciences/bt747-2.1.7-r3/work/build.xml:1478: +# java.lang.NoSuchMethodError: java.nio.CharBuffer.flip()Ljava/nio/CharBuffer; +DEPEND="${CDEPEND} + >=virtual/jdk-11:* +" RDEPEND="${CDEPEND} dev-libs/glib:2[dbus] >=virtual/jre-1.8:* " -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:* -" -EANT_BUILD_TARGET="dist.j2se" -EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo" -EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747" -JAVA_ANT_REWRITE_CLASSPATH="yes" +DOCS=( ChangeLog.txt ) +PATCHES=( + "${FILESDIR}/bt747-2.1.7-source-target.patch" + # Fix for newer jchart2d. + "${FILESDIR}/jchart2d-3.2.patch" +) src_prepare() { + default #780585 java-pkg-2_src_prepare - # Fix for newer jchart2d. - eapply "${FILESDIR}/jchart2d-3.2.patch" # Remove all the bundled stuff. rm -rv dist/ lib/ || die @@ -50,11 +56,31 @@ src_prepare() { # GraphicsUtilities moved in later SwingX versions. sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \ src_j2se/net/sf/bt747/j2se/app/list/FileListCellRenderer.java || die + + # EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo" + cat > build.properties <<-EOF || die + skip.proguard=yes + svn=true + svnversion=true + build.current.revision=Gentoo + ant.build.javac.source=$(java-pkg_get-source) + ant.build.javac.target=$(java-pkg_get-target) + jcalendar.jar=$(java-pkg_getjars jcalendar-1.2) + jchart.jar=$(java-pkg_getjars jchart2d) + jopt-simple.jar=$(java-pkg_getjars jopt-simple) + rxtxcomm.jar=$(java-pkg_getjars rxtx-2) + sanselan.jar=$(java-pkg_getjars commons-imaging) + swing-layout.jar=$(java-pkg_getjars swing-layout-1) + swingx.jar=$(java-pkg_getjars swingx-1.6) + swingx-ws.jar=$(java-pkg_getjars swingx-ws-bt747) + EOF } -src_install() { - dodoc {ChangeLog,README}.txt +src_compile() { + eant dist.j2se +} +src_install() { java-pkg_dojar dist/*.jar java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \ --java-args="-Xmx192m" diff --git a/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch b/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch new file mode 100644 index 000000000000..aa9c46751371 --- /dev/null +++ b/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch @@ -0,0 +1,33 @@ +Hardcoded javac options prevent configuration. +In order to allow using -Dant.build.javac.source +and -Dant.build.javac.target we remove them. + +--- a/build.xml ++++ b/build.xml +@@ -411,7 +411,7 @@ + <delete dir="${j2sebuild.dir}" /> + <mkdir dir="${j2sebuild.dir}" /> + +- <javac verbose="no" srcdir="${src_j2se.dir}" destdir="${j2sebuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="j2seclasspath" encoding="iso-8859-15" target="1.5" source="1.5"> ++ <javac verbose="no" srcdir="${src_j2se.dir}" destdir="${j2sebuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="j2seclasspath" encoding="iso-8859-15"> + <include name="bt747/j2se_view/BT747Main.java" /> + <include name="bt747/j2se_view/BT747cmd.java" /> + <include name="de/k621/avr/gps/converter/NMEAConverter.java" /> +@@ -442,7 +442,7 @@ + <delete dir="${wababuild.dir}" /> + <mkdir dir="${wababuild.dir}" /> + +- <javac verbose="no" srcdir="${src_waba.dir}" destdir="${wababuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="wabaclasspath" encoding="iso-8859-15" target="1.5" source="1.5"> ++ <javac verbose="no" srcdir="${src_waba.dir}" destdir="${wababuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="wabaclasspath" encoding="iso-8859-15"> + <include name="BT747.java" /> + <compilerarg line="-Xlint:unchecked" /> + </javac> +@@ -971,7 +971,7 @@ + <include name="${src_j2se.dir}/**/resources/*" if="is.lib" /> + </fileset> + </delete> +- <javac verbose="no" srcdir="${rxtxsrc.dir}" destdir="${rxtxbuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="${build.classpath}" encoding="iso-8859-15" target="1.5" source="1.5"> ++ <javac verbose="no" srcdir="${rxtxsrc.dir}" destdir="${rxtxbuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="${build.classpath}" encoding="iso-8859-15"> + <include name="**/*.java" /> + </javac> + <copy todir="${rxtxbuild.dir}"> diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest index 1de99f09a177..80950ff36701 100644 --- a/sci-geosciences/geocode-glib/Manifest +++ b/sci-geosciences/geocode-glib/Manifest @@ -1,3 +1,3 @@ DIST geocode-glib-3.26.4.tar.xz 75352 BLAKE2B be783328b2372e1647c3fd6debadaf8313688fe1c993cbc1e084cd9ad8ba8fec0b142a0f579f63085684ef8fafc6e7ec6f54441a085d25d9d5f2eed31a893d1b SHA512 998c2f02a8d3d34a8b6a4b031da2e7c28df27014bcf58f3374fbc0c829fff6257c2622fd9bf331e05b85fbc761c64554fb77ce2d986e0f8b59b17aa486f9f609 -EBUILD geocode-glib-3.26.4-r201.ebuild 1026 BLAKE2B ee339b86ede12198ac4f3dda08f4d825058751a3df60a65e4ca36d1b0561fc3d9caa3cc5df9605fc5e83f6395f20cd4753c7a8fced199c0570b8697dc894f1a4 SHA512 b11da6218fb54f1d99c2bcd5b30c59e70c264906457207c9b3ffeeb41c7d34bbece894764da05bce51b4ceef9a16a14a6fbc03c0dae381cbf75777805604c2bb +EBUILD geocode-glib-3.26.4-r201.ebuild 1020 BLAKE2B 67a140d6695b604a4796e2b9ce408370fbf02ed793a4989a2b8c84a46cd3f9398f6af175b56965b33978b3ae09a7b5e73b6a727a99bde4a33078eda9ca002170 SHA512 6d6c95b9ca4f1b4a41afcee64a04350f0ab1540d2df4f4d529f96e4f388ee042feb38938fbb674dc257dab2900cf147de10538996bb8c0b249a0affd6d56d09b MISC metadata.xml 530 BLAKE2B b1ec0087512fd3f1f73946579481a6734bc6555c1118209a7883bc0ce0e13d9f028c4a7271ec458fc3a1147a2fdaf9692e16d805e09144d2cb729ee77edc1932 SHA512 ecfd5406ec2f8bae406225cf2ae2acfb07cf70ac8b121b2da3c5f814281c9f6a6eda9f06029cc9756e354502d3dc15a7aaf57919d144276ad27d79325bd697a3 diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild index 88a1ebfb3092..12e4b74a4f54 100644 --- a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild +++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r201.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib" LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="gtk-doc +introspection test" RESTRICT="!test? ( test )" diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest index 0939a45760d7..3f5f6a666a74 100644 --- a/sci-geosciences/gpsbabel/Manifest +++ b/sci-geosciences/gpsbabel/Manifest @@ -1,12 +1,5 @@ -AUX gpsbabel-1.7.0-use_system_shapelib.patch 5998 BLAKE2B 7e1228aae03a7ceab05754ff5f1f5c7f346001a7f0533c9d66744b11d8a748de57783a01ec970e246823f97342283f429a0707939e7ddfd4de429ead6b212de0 SHA512 e73e28becd2c9953501f552a30540511422265647a6d9798499d6558927a5b4d36d019f6c4fd1901d2338ea897ea5fc831e827af4c8a18ffdc7bb38d161b50ad -AUX gpsbabel-1.7.0-xmldoc.patch 498 BLAKE2B a080771489891b16edb2888a6925b3a37b609fb960cd6a2fbff64707eca040199aae36c93272d27d9b955815d47aa190d4481fc96b4d9d80e0b2b3469f8c136b SHA512 5a8bbaecd5975db4e1be8a1df50ff37937cd537e5fe51d4269a16d8cb8b6a390c05d5ff81925ab4ac7d7055b3822d328287d717a141adbc3534954b75e5f6965 AUX gpsbabel-1.8.0-no-automagic-qt5-qt6.patch 1382 BLAKE2B d0fda148f51ff575dfb86ef51db7e2962cbd05a33e1b5e5bc5b57845bb3e9e885b85b7ec81cef7c26e424ff3aed81818edb5c749c0b1fc0d1275f545962f1373 SHA512 4b82fdaea637d2bec322b085b3df33e7c493aeec93e145a3f6b1493884c3dd891e0252f9d4a5ec4f75b482178a65de050062fa18f078523426aee60cae002efd -DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83 -DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911 -DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4 DIST gpsbabel_1_9_0.tar.gz 14514572 BLAKE2B cdea8c74c1a75c4707b071b8a08fe83ce7fd3c6a6fd107c00d8fed958c9674c9f81de548a5cab7f9613a5d9f41834219f93bf7cabbc356047ef07f6667347bfe SHA512 e8591aef8015470471ff7ff6a75ab4a71a584f8de2ac00f3957d06ee76145bf1f53c26a12b8d963f1b96ce09270f54fbd5e96c80eccbeb8466ff94a75b72972d -EBUILD gpsbabel-1.7.0-r1.ebuild 1919 BLAKE2B 83c144e9ca5ba4649378e1857694eb87549344d340c2e09d35ace00eb7359b0b0a63b365e9b29b82c61bc973c1a460522c181a110cb5f58f04bda66c8f475a36 SHA512 551fdfb9e4e7382e1f6b6769673b73768feed8085b40ff46e6c45e98d5799d1d9301ca8d88d1fa4b695c57802e3579fe54381f499a39e6c4fd35149f768c80db -EBUILD gpsbabel-1.8.0-r1.ebuild 2336 BLAKE2B 9eb748c0078e7a03cdfdc6401bd03ca69f29e71d61201455951d833aa36b789ba085e434528fd5d75172c78771e5585096f42b912767c97adb5f884e4f618a7b SHA512 6639407ab52756284775d318a7d740340e42aa0aeb9a1f951cac344c70404a148defb85906ea3fcd892eb2ff7fd88c19ac79dd4da34be2bcfd588ccc79c85785 -EBUILD gpsbabel-1.9.0.ebuild 2164 BLAKE2B c9f80a150a16129fe80637e5552628d5dd2f5ba41ada25500c720081f728137e3eb07a124116a21bfb88ece1746f5cff8df65fdecee64b5cb333a9ed00e2cdd9 SHA512 299ce4f9f654e00a21f0fafff72f883862c5a60be2257e72f78f9696aa530f1a5a273e639ebc2f79f88bd67eb7b992b41a537cce4901b4776e639144e7da5f18 -EBUILD gpsbabel-9999.ebuild 2164 BLAKE2B c9f80a150a16129fe80637e5552628d5dd2f5ba41ada25500c720081f728137e3eb07a124116a21bfb88ece1746f5cff8df65fdecee64b5cb333a9ed00e2cdd9 SHA512 299ce4f9f654e00a21f0fafff72f883862c5a60be2257e72f78f9696aa530f1a5a273e639ebc2f79f88bd67eb7b992b41a537cce4901b4776e639144e7da5f18 +EBUILD gpsbabel-1.9.0.ebuild 2158 BLAKE2B 7ad368350a5d1df38b7432ec397118e6b40af0f0e277de0de166f4a0b3a4a1455eb6151e51b421a0a27b4a832cdff1d95dd893754b1b18e07c9caae286e4cb88 SHA512 f2e87c57bb5462e53b6d1950faa3db5d2150eb5892b80a2bd874301c45d9556021fa357fb92858cef8714657ab5a9e0d29235bc68408fdaab79c30406bf38117 +EBUILD gpsbabel-9999.ebuild 1896 BLAKE2B 69c0e2ac096587bebb9054a83315d8e7337d9cd2f01ba2626564839677beb485fdb931f7800ce6d81bb0a7442433698bee045c538b30999fde7747961e6dca39 SHA512 da7a6632c367847347392c0b769a6e35be97462274d14bdb5a60dbfa15368e5b92c1e596f12b69f63571982b778e8cfd28368038eb7dfb0603503ea6f66fc2b2 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch deleted file mode 100644 index 744400906963..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 5ace8da1..1acadf3e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -104,7 +104,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ - # Extra modules in Jeeps that we don't use - # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o - --SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o -+SHAPE=-lshp - - ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \ - zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \ -@@ -120,7 +120,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ - src/core/textstream.o \ - src/core/usasciicodec.o \ - src/core/xmlstreamwriter.o \ -- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) -+ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) - OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ - - DEPFILES = $(OBJS:.o=.d) -@@ -153,10 +153,10 @@ toolinfo - all: gpsbabel$(EXEEXT) - - gpsbabel$(EXEEXT): configure Makefile $(OBJS) @USB_DEPS@ @GPSBABEL_DEBUG@ -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - gpsbabel-debug: $(OBJS) @USB_DEPS@ -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ - gbversion.h.in gui/setup.iss.in -@@ -513,7 +513,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ - ggv_bin.h globalsat_sport.h gpx.h src/core/xmlstreamwriter.h \ - src/core/xmltag.h kml.h xmlgeneric.h legacyformat.h lowranceusr.h \ - mynav.h nmea.h osm.h qstarz_bl_1000.h random.h shape.h \ -- shapelib/shapefil.h subrip.h unicsv.h src/core/textstream.h xcsv.h \ -+ subrip.h unicsv.h src/core/textstream.h xcsv.h \ - garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ - jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ - jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ -@@ -538,7 +538,7 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ - globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ - kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ -- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ -+ qstarz_bl_1000.h random.h shape.h subrip.h \ - unicsv.h src/core/textstream.h xcsv.h yahoo.h - garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \ - zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ -@@ -825,7 +825,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ - dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ - globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ - kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ -- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ -+ qstarz_bl_1000.h random.h shape.h subrip.h \ - unicsv.h src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h \ - jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ - jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ -@@ -841,7 +841,7 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - garmin_fit.h geojson.h ggv_bin.h globalsat_sport.h gpx.h \ - src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ - legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ -- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ -+ random.h shape.h subrip.h unicsv.h \ - src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ - jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ - jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ -@@ -961,10 +961,7 @@ session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h - shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ -- shape.h format.h shapelib/shapefil.h --shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h --shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h --shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h -+ shape.h format.h - skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ - formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h -@@ -1059,7 +1056,7 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \ - src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ - legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ -- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ -+ random.h shape.h subrip.h unicsv.h \ - src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ - jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ - jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ -diff --git a/shape.cc b/shape.cc -index 933eb95a..f2ec5365 100644 ---- a/shape.cc -+++ b/shape.cc -@@ -32,7 +32,7 @@ - - #include "defs.h" - #include "shape.h" --#include "shapelib/shapefil.h" -+#include <libshp/shapefil.h> - - - #if SHAPELIB_ENABLED -diff --git a/shape.h b/shape.h -index 0ce05af7..09931eff 100644 ---- a/shape.h -+++ b/shape.h -@@ -27,7 +27,7 @@ - - #include "defs.h" // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file - #include "format.h" // for Format --#include "shapelib/shapefil.h" // for DBFHandle, SHPAPI_CALL, SHPHandle -+#include <libshp/shapefil.h> // for DBFHandle, SHPAPI_CALL, SHPHandle - - - #if SHAPELIB_ENABLED diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch deleted file mode 100644 index 56c60a553485..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in 2017-01-21 00:32:50.921546762 +0100 -+++ b/Makefile.in 2017-01-21 00:55:45.362728521 +0100 -@@ -278,8 +278,8 @@ - --stringparam html.cleanup "1" \ - --stringparam make.clean.html "1" \ - --stringparam html.valid.html "1" \ -- --stringparam html.stylesheet \ -- "https://www.gpsbabel.org/style3.css" \ -+ --nonet \ -+ --stringparam html.stylesheet "gpsbabel.org-style3.css" \ - http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \ - xmldoc/readme.xml - diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild deleted file mode 100644 index 36dfe7b2188f..000000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic qmake-utils - -MY_PV="${PV//./_}" -MY_P="${PN}_${MY_PV}" - -DESCRIPTION="GPS waypoints, tracks and routes converter" -HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git" - SRC_URI="doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )" -else - SRC_URI=" - https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz - doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css ) - " - KEYWORDS="amd64 ~ppc ~x86" - S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -DEPEND=" - dev-qt/qtcore:5 - sci-libs/shapelib:= - sys-libs/zlib - virtual/libusb:1 -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/docbook-xml-dtd:4.1.2 - dev-lang/perl - dev-libs/libxslt - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-xmldoc.patch - "${FILESDIR}"/${PN}-1.7.0-use_system_shapelib.patch -) - -S="${WORKDIR}/${PN}-${MY_P}" - -src_prepare() { - default - - # ensure bundled libs are not used - rm -r shapelib zlib || die - # remove prerequisite zlib/zlib.h - sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die - # remove failing test (fixed by f91d28bf) - rm testo.d/arc-project.test || die - - use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}" -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862576 - # Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824 - filter-lto - - econf \ - $(use_with doc doc "${S}"/doc/manual) \ - QMAKE=$(qt5_get_bindir)/qmake \ - --with-zlib=system -} - -src_compile() { - default - - if use doc; then - perl xmldoc/makedoc || die - emake gpsbabel.html - fi -} - -src_install() { - use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css ) - - default -} diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild deleted file mode 100644 index 5214d81abcd5..000000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_IN_SOURCE_BUILD=1 -inherit cmake desktop flag-o-matic xdg - -MY_PV="${PV//./_}" -MY_P="${PN}_${MY_PV}" - -DESCRIPTION="GPS waypoints, tracks and routes converter" -HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git" -else - SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" - S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc qt6" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/docbook-xml-dtd:4.1.2 - dev-lang/perl - dev-libs/libxslt - ) - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) -" - -RDEPEND=" - dev-libs/expat - sci-libs/shapelib:= - sys-libs/zlib:=[minizip] - virtual/libusb:1 - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtserialport:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets,xml] - dev-qt/qtserialport:6 - dev-qt/qtwebchannel:6 - dev-qt/qtwebengine:6[widgets] - dev-qt/qt5compat:6 - ) -" - -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS NEWS README.{contrib,igc,mapconverter,md} gui/README.{contrib,gui} ) - -PATCHES=( - "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" -) - -src_prepare() { - cmake_src_prepare - - # ensure bundled libs are not used - rm -r shapelib zlib || die -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862576 - # Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824 - filter-lto - - local mycmakeargs=( - -DGPSBABEL_WITH_LIBUSB=pkgconfig - -DGPSBABEL_WITH_SHAPELIB=pkgconfig - -DGPSBABEL_WITH_ZLIB=pkgconfig - -DGPSBABEL_MAPPREVIEW=ON - -DGPSBABEL_EMBED_MAP=ON - -DGPSBABEL_EMBED_TRANSLATIONS=ON - -DUSE_QT6="$(usex qt6)" - ) - - cmake_src_configure -} - -cmake_src_compile() { - cmake_build gpsbabel - cmake_build gpsbabelfe - use doc && cmake_build gpsbabel.html -} - -src_install() { - use doc && dodoc gpsbabel.html - einstalldocs - - dobin gpsbabel - dobin gui/GPSBabelFE/gpsbabelfe - insinto /usr/share/${PN}/translations/ - doins gui/gpsbabel*_*.qm - newicon gui/images/appicon.png ${PN}.png - domenu gui/gpsbabel.desktop -} diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild index 5b61f9f33ebe..56e727b1bd61 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git" else SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64" S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" fi diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild index 5b61f9f33ebe..8f8e29366683 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild @@ -12,61 +12,44 @@ MY_P="${PN}_${MY_PV}" DESCRIPTION="GPS waypoints, tracks and routes converter" HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" -if [[ ${PV} == 9999 ]] ; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git" else SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" fi LICENSE="GPL-2" SLOT="0" -IUSE="doc qt6" +IUSE="doc" BDEPEND=" + dev-qt/qttools:6[linguist] virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 dev-lang/perl dev-libs/libxslt ) - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) " - RDEPEND=" dev-libs/expat + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,network,widgets,xml] + dev-qt/qtserialport:6 + dev-qt/qtwebchannel:6 + dev-qt/qtwebengine:6[widgets] sci-libs/shapelib:= sys-libs/zlib:=[minizip] virtual/libusb:1 - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtserialport:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets,xml] - dev-qt/qtserialport:6 - dev-qt/qtwebchannel:6 - dev-qt/qtwebengine:6[widgets] - dev-qt/qt5compat:6 - ) " - DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui ) -PATCHES=( - "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" -) +PATCHES=( "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" ) src_prepare() { cmake_src_prepare @@ -83,7 +66,7 @@ src_configure() { -DGPSBABEL_MAPPREVIEW=ON -DGPSBABEL_EMBED_MAP=ON -DGPSBABEL_EMBED_TRANSLATIONS=ON - -DUSE_QT6="$(usex qt6)" + -DUSE_QT6=ON ) cmake_src_configure diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index d20d2098c777..a4890191bdca 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -1,7 +1,7 @@ AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea DIST gpsd-3.25.tar.xz 3647488 BLAKE2B 0c6f4eff5d2489e88ef0a35b9c089e30805368d491603e644a917a189c95316750913ec1d393a5a2ae7ebaf9279a4d1f19907333c35652178304c69102262849 SHA512 efc26221deb08ef8f34aed7d56809c1056320700f55d08519f1b44fd0c3c8ffc49672980301970fc096d88a0022d7cf207d329356dd81ca3618b7bedc3b078d6 -EBUILD gpsd-3.25-r1.ebuild 6701 BLAKE2B 75750cb012423ada7e8e1072c714407fc8ad471095fc9a1e8d9df2c09cf3959257b9aec39aa289096d7e9e5ef656be5d7709293457e0677b873d9ddfffa06713 SHA512 65b89ea3ee9a1040c15599afc30b083e5ca3b46548c61e0c072b1c1ffefe11b51420fcee371932cb9c55de15681aac271c89f9da6f992fe0104e7e17237435d2 +EBUILD gpsd-3.25-r2.ebuild 6876 BLAKE2B 5a05f66814b3769a730d3f5664111576e1ba4c5b7da0aefc78db37bc7f8df22d174cc286ee5797200d3fddf0a1c591e9ae9137f8b4043d085b590ebff224b350 SHA512 3f4a3d8da7d04d6eebe22002f2d5f404ce28df0ee40831458386efefdb85ef149d25961445a9c66850a8971fa9ab84f80137c0670011e223e12b89eb3af241db EBUILD gpsd-3.25.ebuild 6387 BLAKE2B 70c809b4536acf564cef0e28c9f16ce170d1730f279c485017a4ebc6f840f59816ceaaa56f9faea7b804a4563a8449e0e02c46cdba092405396b6c2fd80890bb SHA512 c433d934a992ce2d75ea711d86b77d1ca7cdb6e988153dc9939f70c9dbb0766af88d3bd49f49b80ee4ab3cfff3e1efc7a2f6317f3a2bb1aafc3a7435cbb6a947 -EBUILD gpsd-9999.ebuild 6407 BLAKE2B 018bbb85f5bb580360715e36b7d1e48db34064c79886bd03a69d18201170a2ec831ae559c2dff3e379fe05ff3fc53634ced7465dc07e26965606025c2aaef3c1 SHA512 a5b75b0b6c4f2a6b431ff97d7a2f82ebb8ec58d806081677c00c62212de881e5c6741bf774a5c24574586805ba1833333139081525917e6c4ddfb44613288a50 +EBUILD gpsd-9999.ebuild 6568 BLAKE2B c610a742a24a141be3dc6ed05e4da11dd77f52bbbb9a637df1449b97b40829a00eb70b13aa3a6704305a4a6c3c98fe8d374ce5b01f8399b66cb90df1fbe110fa SHA512 52ead91bf5f007a45d8c809398265c7a2baa4b39a06fa42c35d5413078a8c47a9be81b572dc0081c38a290140e9deec0448c3028088b8ef2740e462e1bdc706a MISC metadata.xml 1029 BLAKE2B a8bd09a148ce75d7e8a390353834e87f05d4a21e4ac31a1264565c37bef7801542eef52955dae03470f7a8d965d7b2ae446014ad5c7b3a251aa3a9ad0bef0e9c SHA512 cad79d8d94442ecfca1cbe03c137e771d02999db08a494801c524edba6a6648a7b948a00c9f3ebf539f99fa58794acd09923bc077cf19ae126a64bfb4d1ff397 diff --git a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.25-r2.ebuild index f7f785b3ea35..615d6bafd6f9 100644 --- a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.25-r2.ebuild @@ -213,10 +213,11 @@ python_test() { :; } -python_install(){ - mkdir -p "${T}/scripts" || die - grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs mv -t "${T}/scripts" - python_doscript "${T}"/scripts/* +python_install() { + while read -d '' -r file ; do + grep -q "#!/usr/bin/env python" "${file}" && python_doscript "${file}" + done < <(find "${T}"/scripts -type f -print0) + distutils-r1_python_install } @@ -231,7 +232,13 @@ src_install() { find "${D}"/python-discard/ -type d -delete # Install correct multi-python copy pushd "${P}" || die - use python && distutils-r1_src_install + if use python ; then + mkdir -p "${T}/scripts" || die + grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs cp -t "${T}/scripts" + assert "Moving Python scripts failed" + + distutils-r1_src_install + fi popd || die } diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index 75899a3a66c3..9a4ff1315e67 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -213,10 +213,11 @@ python_test() { :; } -python_install(){ - mkdir "${T}/scripts" || die - grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs mv -t "${T}/scripts" - python_doscript "${T}"/scripts/* +python_install() { + while read -d '' -r file ; do + grep -q "#!/usr/bin/env python" "${file}" && python_doscript "${file}" + done < <(find "${T}"/scripts -type f -print0) + distutils-r1_python_install } @@ -232,6 +233,9 @@ src_install() { # Install correct multi-python copy pushd "${PN}"-* || die + mkdir -p "${T}/scripts" || die + grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs cp -t "${T}/scripts" + assert "Moving Python scripts failed" distutils-r1_src_install popd || die } diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index ff3e4fba9eb7..06d7634d7926 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,4 +1,6 @@ AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc DIST gpxsee-13.22.tar.gz 5634011 BLAKE2B b708ea4a81679109ce4e67302e336e070a508799ba8bbcf67121b617390e3808e2a054170e57a112c734fa7d22698f71da5f902ec704fda0f0fcf2818495b29f SHA512 0a12304c608ee86ebdd226a3179fde538ac0f64d5300ede4a032be373059ccbe1dcbcb6db76326c9988620b9fd41dd0f36e8e922b305a16fd27e87a56385fcba +DIST gpxsee-13.23.tar.gz 5635256 BLAKE2B d6f69b4fd69aaa850994f9f3ee61790ff4e407adab85074b80940c7d9a24da010b4e2e485e79f0bd564b20a1295e34ae454504c59f60f56b161c7a5ac8fbd1ea SHA512 bf917e36deef824289d432d2ebdaffd417a34b843c2b7ef129e5469f3f5a723d54b4b1af756571614329dee7ba01daa38b110d730a7787dfcf617b4faa007ee3 EBUILD gpxsee-13.22.ebuild 1513 BLAKE2B f5262b4edabfdb6b1e92a4626c2c06d583d7203be056a104f8c98461fc2927f728584daef4bc87c38993a0f011233ad7fab9116409a6df411079e20a63d1e7ff SHA512 586dbcdcb1465ff66a20d88ae235dfe651b5a7ad15ae4454cad1be356aa15219429f319994358f79889da526f342427f160de73ec8bf19773a121832905e81b4 +EBUILD gpxsee-13.23.ebuild 1516 BLAKE2B fee78110a609facead46ce994c1deefd31a386a567113baef9587cdbcbfbdda809b4c12df41e5e696e5cea18989f67af974ab0c295b24ad5ef1d1501ceac4c81 SHA512 ae318269aa26b278ce16bdf6b585f1b35c7e28bdc8d43f6bc13c688e4fa88de338d9f68da1e92991d8b5fc436683852de08ddae24289de1aa177a18789a59f77 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3 diff --git a/sci-geosciences/gpxsee/gpxsee-13.23.ebuild b/sci-geosciences/gpxsee/gpxsee-13.23.ebuild new file mode 100644 index 000000000000..6ed42a42478c --- /dev/null +++ b/sci-geosciences/gpxsee/gpxsee-13.23.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh" +inherit plocale qmake-utils xdg + +MY_PN="GPXSee" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" +HOMEPAGE="https://www.gpxsee.org/ https://github.com/tumic0/GPXSee" +SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="qt6" + +RDEPEND=" + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtpositioning:6 + dev-qt/qtserialport:6 + ) + !qt6? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + qt6? ( dev-qt/qttools:6 ) + !qt6? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) + +src_prepare() { + default + + plocale_find_changes lang "${PN}_" '.ts' + + rm_ts() { + sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro + } + + plocale_for_each_disabled_locale rm_ts +} + +src_compile() { + if use qt6; then + $(qt6_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" + eqmake6 gpxsee.pro + else + $(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" + eqmake5 gpxsee.pro + fi + emake +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README.md +} diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 98ab4aa43f2e..05f25f02e3ac 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,10 +1,7 @@ AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c -DIST grass-8.3.1.tar.gz 68491177 BLAKE2B 58513c8c273b55831bca764c9e61e54b92c075ea2f4ff3c2f059ebcce98f25694ee03a25bef7a3e1c443165dd9493d3ce469233be3b65596dc28da166c12d174 SHA512 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793 DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0 -DIST grass-8.4.0RC1.tar.gz 70272599 BLAKE2B a292336e8eb657fadc4a54b6045b529df883fe4d49d784551d5e5d948e74a69f48a0508a862d9df47cd60172b20d97a4603a377afec2faceb98b35e8023d377c SHA512 c64576305476e60d8525418f973512dd71d2586ac7712f36560d9fe31a10bd1532b91351d3dc81bfd7c32073ddc1631a8e922d56e0e27159f59e37a1399e4c21 -EBUILD grass-8.3.1.ebuild 7070 BLAKE2B 24db4f7bc33845d9123e30a2dabd537097efd47066942322454de31b0b99c390524b408079c718a1e686b93d4d43f0426bff334c9e77cfd81222eff172b3656d SHA512 d68bdeb3add17d3f09809ec5c3c3c8e6d5701280a96181e57891db01bcddf188dc961eb8411bd674f6f6e7d7edd315e6c19a26b757bca6b3e60cb4ecb94147c5 -EBUILD grass-8.3.2-r1.ebuild 7071 BLAKE2B 8c7ef62b87d73b8c78afa658e1d171c3f4c28f6b4a0187f04457bee978185623b53d80eb26784c413ac98b8b46b1d5645bcf8b8518f31f6df8b865bb138ad853 SHA512 04d669e5f2a4a0c89be5dca40233010a20db30bfd709719525217ee4661953aed20573d27920af8e7a69e23830d2086bf3f694f4698fb653ffddf9e9a79f63c5 -EBUILD grass-8.3.2.ebuild 7070 BLAKE2B 24db4f7bc33845d9123e30a2dabd537097efd47066942322454de31b0b99c390524b408079c718a1e686b93d4d43f0426bff334c9e77cfd81222eff172b3656d SHA512 d68bdeb3add17d3f09809ec5c3c3c8e6d5701280a96181e57891db01bcddf188dc961eb8411bd674f6f6e7d7edd315e6c19a26b757bca6b3e60cb4ecb94147c5 -EBUILD grass-8.4.0_rc1.ebuild 7093 BLAKE2B 9f8603ec17ef8575cd0ca648e1ef4d6ccd7f37b24159f3eda08bc846e75c497043f384f6864d72f16b9a0ada95ce8911edd4596de6089b554746d7980e853abc SHA512 8c34fa9dacca31960eadb51f8898cb33f12cb1021d90c93aa9febadbf980abc1d41abf3aef88a6da4357a65080c2544e0d0bd4a80796054d4a2a9e3dec4e2679 -EBUILD grass-9999.ebuild 7033 BLAKE2B 0e43fd7b28dc213204bfaec6ba5a7692431402703c1f9243ae845660c1331fafea77a76261171dc9b7e170868b803fb016638139ca3a1f6be1d0c448ceafa3e9 SHA512 b26f8fcc1b828b58807fc0e24aaa60d2699fd0d1bc1d1484d9fe6b8c919a2774d05540c9fbd5f787724671fb30f9b0760b3f71d73f927ff73c5638615022d8a1 +DIST grass-8.4.0.tar.gz 70245687 BLAKE2B 0f8283d215cc5412abcf4bc984aa94b5ca3de6de0d3d240fb533a4a0d2b335438269524462f3c4ede5ebec5cfc0348246571216dbc16f8658d88db28159bf360 SHA512 c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4 +EBUILD grass-8.3.2-r1.ebuild 7085 BLAKE2B b68b36f7a1495d5c61853d102653ff8ae78c54117a8ce4e277b35c31b3f3705a5b34e4e571ee8ad4603baea65d9e2cb190772954fea757802365d3aa7d10783b SHA512 feee69d50bc31a1dabbf350a6db478313d0e69c53bc7a5ba5f9ee9deec8ad3f0826681bf744f1f843a27fd78342cadee49e5b0e625ced5f67cb77ea0280a6b94 +EBUILD grass-8.4.0.ebuild 7108 BLAKE2B 4a4a06b09e27ecfa22c90edcfe7de10f429e117f4c117eea0a8f3313c41f8bbf5cab1047727a9227e6d34bb46e3cab322e48db72806fd3da03829812e891cd76 SHA512 186867e9d072a20d8724903f8e2420d6e2135918dd1a7f4fc26e7e3a1f7fac189267fe1fa80152a28c037daddb34488ce0cdf35624c99efa49736ee905680a97 +EBUILD grass-9999.ebuild 7048 BLAKE2B 269ba74ebbe05764255e18f2632fa873d994dd4d0301650bcf582406e6688c007e63dd9f4d8d63e63142445aa9f50de8d853714199a6ccc08e3c3ece6859087c SHA512 ee8bd2435b5d0f382aa9c8a45e6211cda13051b84e373ad0270afe660ec6e00cde492d14a2b0331af56273e04301246c6318f171a5cad76a260ee0d3bfa7975d MISC metadata.xml 1316 BLAKE2B 508c5fdf769d6563bb585ccd0a7072675f2725fa0702ca9e3f9b3963bd5379312dda36e37ba2fc58c7a85e03c035484abbe95a2e6651d51ea7fa97e013897355 SHA512 1f58db0827750b585c64c8321d47b4277a8472b1073f0216f06cf211aeea6ad53065634b4003269560282b22679b90d34b077d447f8ae07c16a4dbe905cf9b79 diff --git a/sci-geosciences/grass/grass-8.3.1.ebuild b/sci-geosciences/grass/grass-8.3.1.ebuild deleted file mode 100644 index 8a3ea23d393d..000000000000 --- a/sci-geosciences/grass/grass-8.3.1.ebuild +++ /dev/null @@ -1,276 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="sqlite" # bug 572440 - -inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="https://grass.osgeo.org/" - -LICENSE="GPL-2" - -if [[ ${PV} =~ "9999" ]]; then - SLOT="0/8.3" -else - SLOT="0/$(ver_cut 1-2 ${PV})" -fi - -GVERSION=${SLOT#*/} -MY_PM="${PN}${GVERSION}" -MY_PM="${MY_PM/.}" - -if [[ ${PV} =~ "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OSGeo/grass.git" -else - MY_P="${P/_rc/RC}" - SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~ppc ~x86" - fi - - S="${WORKDIR}/${MY_P}" -fi - -IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - opengl? ( X )" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-admin/eselect-1.2 - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') - sci-libs/gdal:= - sys-libs/gdbm:= - sys-libs/ncurses:= - sci-libs/proj:= - sys-libs/zlib - media-libs/libglvnd - media-libs/glu - blas? ( - virtual/cblas[eselect-ldso(+)] - virtual/blas[eselect-ldso(+)] - ) - bzip2? ( app-arch/bzip2:= ) - fftw? ( sci-libs/fftw:3.0= ) - geos? ( sci-libs/geos:= ) - lapack? ( virtual/lapack[eselect-ldso(+)] ) - las? ( sci-geosciences/liblas ) - mysql? ( dev-db/mysql-connector-c:= ) - netcdf? ( sci-libs/netcdf:= ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - pdal? ( >=sci-libs/pdal-2.0.0:= ) - png? ( media-libs/libpng:= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:= ) - truetype? ( media-libs/freetype:2 ) - X? ( - $(python_gen_cond_dep ' - >=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - >=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}] - ') - x11-libs/cairo[X] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt - ) - zstd? ( app-arch/zstd:= )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - X? ( dev-lang/swig )" - -PATCHES=( - # bug 746590 - "${FILESDIR}/${PN}-flock.patch" -) - -pkg_setup() { - if use lapack; then - local mylapack=$(eselect lapack show) - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas=$(eselect blas show) - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix unversioned python calls - sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die - - default - - # When patching the build system, avoid running autoheader here. The file - # config.in.h is maintained manually upstream. Changes to it may lead to - # undefined behavior. See bug #866554. - # AT_NOEAUTOHEADER=1 eautoreconf - - ebegin "Fixing python shebangs" - python_fix_shebang -q "${S}" - eend $? - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/862579 - # https://github.com/OSGeo/grass/issues/3506 - # - # Do not trust it with LTO either - append-flags -fno-strict-aliasing - filter-lto - - addwrite /dev/dri/renderD128 - - local myeconfargs=( - --enable-shared - --disable-w11 - --without-opendwg - --with-regex - --with-gdal="${EPREFIX}"/usr/bin/gdal-config - --with-proj-includes="${EPREFIX}"/usr/include/proj - --with-proj-libs="${EPREFIX}"/usr/$(get_libdir) - --with-proj-share="${EPREFIX}"/usr/share/proj/ - $(use_with cxx) - $(use_with tiff) - $(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config) - $(use_with postgres) - $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql) - $(use_with sqlite) - $(use_with opengl) - $(use_with odbc) - $(use_with fftw) - $(use_with blas) - $(use_with lapack) - $(use_with X cairo) - $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2) - $(use_with nls) - $(use_with readline) - $(use_with threads pthread) - $(use_with openmp) - $(use_with opencl) - $(use_with bzip2 bzlib) - $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config) - $(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config) - $(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config) - $(use_with geos geos "${EPREFIX}"/usr/bin/geos-config) - $(use_with X x) - $(use_with zstd) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${ED}" \ - INST_DIR=/usr/$(get_libdir)/${MY_PM} \ - prefix=/usr/ BINDIR=/usr/bin \ - install - - pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die - - local HTML_DOCS=( docs/html/. ) - einstalldocs - - # translations - if use nls; then - insinto /usr/share/locale - doins -r locale/. - fi - - popd >/dev/null || die - - # link libraries in the ~standard~ place - local f file - for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do - file="${f##*/}" - dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} - done - - # link headers in the ~standard~ place - dodir /usr/include/ - dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass - - # set proper python interpreter - sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ -os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ - -i "${ED}"/usr/bin/grass || die - - if use X; then - local GUI="--gui" - make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" - doicon -s 48 gui/icons/${PN}-48x48.png - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die -} - -pkg_postinst() { - use X && xdg_pkg_postinst -} - -pkg_postrm() { - use X && xdg_pkg_postrm -} diff --git a/sci-geosciences/grass/grass-8.3.2-r1.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild index 1d2d329b7e3c..0871bb02df0d 100644 --- a/sci-geosciences/grass/grass-8.3.2-r1.ebuild +++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild @@ -30,7 +30,7 @@ else MY_P="${P/_rc/RC}" SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~ppc ~x86" + KEYWORDS="amd64 ~ppc ~x86" fi S="${WORKDIR}/${MY_P}" @@ -39,7 +39,8 @@ fi IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - opengl? ( X )" + opengl? ( X ) + pdal? ( cxx )" RDEPEND=" ${PYTHON_DEPS} diff --git a/sci-geosciences/grass/grass-8.3.2.ebuild b/sci-geosciences/grass/grass-8.3.2.ebuild deleted file mode 100644 index 8a3ea23d393d..000000000000 --- a/sci-geosciences/grass/grass-8.3.2.ebuild +++ /dev/null @@ -1,276 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="sqlite" # bug 572440 - -inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="https://grass.osgeo.org/" - -LICENSE="GPL-2" - -if [[ ${PV} =~ "9999" ]]; then - SLOT="0/8.3" -else - SLOT="0/$(ver_cut 1-2 ${PV})" -fi - -GVERSION=${SLOT#*/} -MY_PM="${PN}${GVERSION}" -MY_PM="${MY_PM/.}" - -if [[ ${PV} =~ "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OSGeo/grass.git" -else - MY_P="${P/_rc/RC}" - SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~ppc ~x86" - fi - - S="${WORKDIR}/${MY_P}" -fi - -IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - opengl? ( X )" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-admin/eselect-1.2 - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') - sci-libs/gdal:= - sys-libs/gdbm:= - sys-libs/ncurses:= - sci-libs/proj:= - sys-libs/zlib - media-libs/libglvnd - media-libs/glu - blas? ( - virtual/cblas[eselect-ldso(+)] - virtual/blas[eselect-ldso(+)] - ) - bzip2? ( app-arch/bzip2:= ) - fftw? ( sci-libs/fftw:3.0= ) - geos? ( sci-libs/geos:= ) - lapack? ( virtual/lapack[eselect-ldso(+)] ) - las? ( sci-geosciences/liblas ) - mysql? ( dev-db/mysql-connector-c:= ) - netcdf? ( sci-libs/netcdf:= ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - pdal? ( >=sci-libs/pdal-2.0.0:= ) - png? ( media-libs/libpng:= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:= ) - truetype? ( media-libs/freetype:2 ) - X? ( - $(python_gen_cond_dep ' - >=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - >=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}] - ') - x11-libs/cairo[X] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt - ) - zstd? ( app-arch/zstd:= )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - X? ( dev-lang/swig )" - -PATCHES=( - # bug 746590 - "${FILESDIR}/${PN}-flock.patch" -) - -pkg_setup() { - if use lapack; then - local mylapack=$(eselect lapack show) - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas=$(eselect blas show) - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix unversioned python calls - sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die - - default - - # When patching the build system, avoid running autoheader here. The file - # config.in.h is maintained manually upstream. Changes to it may lead to - # undefined behavior. See bug #866554. - # AT_NOEAUTOHEADER=1 eautoreconf - - ebegin "Fixing python shebangs" - python_fix_shebang -q "${S}" - eend $? - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/862579 - # https://github.com/OSGeo/grass/issues/3506 - # - # Do not trust it with LTO either - append-flags -fno-strict-aliasing - filter-lto - - addwrite /dev/dri/renderD128 - - local myeconfargs=( - --enable-shared - --disable-w11 - --without-opendwg - --with-regex - --with-gdal="${EPREFIX}"/usr/bin/gdal-config - --with-proj-includes="${EPREFIX}"/usr/include/proj - --with-proj-libs="${EPREFIX}"/usr/$(get_libdir) - --with-proj-share="${EPREFIX}"/usr/share/proj/ - $(use_with cxx) - $(use_with tiff) - $(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config) - $(use_with postgres) - $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql) - $(use_with sqlite) - $(use_with opengl) - $(use_with odbc) - $(use_with fftw) - $(use_with blas) - $(use_with lapack) - $(use_with X cairo) - $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2) - $(use_with nls) - $(use_with readline) - $(use_with threads pthread) - $(use_with openmp) - $(use_with opencl) - $(use_with bzip2 bzlib) - $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config) - $(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config) - $(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config) - $(use_with geos geos "${EPREFIX}"/usr/bin/geos-config) - $(use_with X x) - $(use_with zstd) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${ED}" \ - INST_DIR=/usr/$(get_libdir)/${MY_PM} \ - prefix=/usr/ BINDIR=/usr/bin \ - install - - pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die - - local HTML_DOCS=( docs/html/. ) - einstalldocs - - # translations - if use nls; then - insinto /usr/share/locale - doins -r locale/. - fi - - popd >/dev/null || die - - # link libraries in the ~standard~ place - local f file - for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do - file="${f##*/}" - dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} - done - - # link headers in the ~standard~ place - dodir /usr/include/ - dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass - - # set proper python interpreter - sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ -os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ - -i "${ED}"/usr/bin/grass || die - - if use X; then - local GUI="--gui" - make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" - doicon -s 48 gui/icons/${PN}-48x48.png - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die -} - -pkg_postinst() { - use X && xdg_pkg_postinst -} - -pkg_postrm() { - use X && xdg_pkg_postrm -} diff --git a/sci-geosciences/grass/grass-8.4.0_rc1.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild index bd3d41da509b..9903823c07a3 100644 --- a/sci-geosciences/grass/grass-8.4.0_rc1.ebuild +++ b/sci-geosciences/grass/grass-8.4.0.ebuild @@ -39,7 +39,8 @@ fi IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - opengl? ( X )" + opengl? ( X ) + pdal? ( cxx )" RDEPEND=" ${PYTHON_DEPS} diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index 0844f7c7bbff..558ef152545b 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -39,7 +39,8 @@ fi IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - opengl? ( X )" + opengl? ( X ) + pdal? ( cxx )" RDEPEND=" ${PYTHON_DEPS} diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest index 8ac956348218..ca343456cd06 100644 --- a/sci-geosciences/josm-bin/Manifest +++ b/sci-geosciences/josm-bin/Manifest @@ -1,7 +1,7 @@ -DIST josm-snapshot-19067.jar 18350764 BLAKE2B c4341e1f1442887b490d8118e6bdad72bcacaf437017f251b3a167622b75360434c57df5ef2631eb57bf747af5ec313c5a3029b9c2aed9134f2c8080904cbf6c SHA512 0300e21f494748ca3a4b8792ed671a5f9b9106f83ebe65e108c4d58b15e9312fa7323a016d0d4e55ee1ea9ea7bc201c1f209db9860cce026e66530d725357ae9 -DIST josm-snapshot-19096.jar 18349420 BLAKE2B 0423ccd0cad224168a1c88cc1bffb6643a65b837a9a0715aa867e0ece55d7d6d69530adb2ee32e65cc3a9364daaba0ca7a9d6edb8807e809913f145f8e554269 SHA512 6005dd32a2ca0aa1f7367b181b99d13d000d98282420d3119569b9fb148407191a1a8dccc81734b3c2e40715ee813599305dcadd5e3cf2af040ba312f75a0467 DIST josm-snapshot-19128.jar 18376543 BLAKE2B 055d652eccfe820a7e793190dab69fb39a5961d147996a6d8bb51518d3f91df6de6989547cfbb10e7c20db86abe1bfeda800a873bd26f5d92d896a2ee8c51829 SHA512 d21f3d4bccc4a0e83c5c65fba195af2490d7f1751dcd1b3d542c69ee2edce0a99881c21b52bd7d9aed5848a667542a4e67a6dcb8a701b74531a57c75ae23dd3f -EBUILD josm-bin-19067.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781 -EBUILD josm-bin-19096.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781 -EBUILD josm-bin-19128.ebuild 1194 BLAKE2B 4d3baae83ce1ec9b343eaf3223cfa0f0dc15fb32674a50ca13eac19f64c906d9d3bdcf5f494d2bfd9c985a32db6e23e838d4fd992233040714ddcd7a8b2487b2 SHA512 3824da326ecef5d2a7faad42ba89061dcb5d00f12387b42c3ad46a8647b1a9a23e33c4a7298e5a7b9bea6a46926da96b428af81eb07fcd2525369620361d7a5c +DIST josm-snapshot-19160.jar 18236258 BLAKE2B c0650ed766476aca4ff05fc07e1630e8a524f01a3c154233e4fba76db2998a7b18b18618815c6c44c091409f3dd922cbda61ea801974e0103adbfcb7e11bf378 SHA512 a8ba54e729b3699b0a380087ba1986cfd4061380c6fe2554e950751cf4a41803c1c92b480b93b0e17a41aedf789047f67494ef0a2495b9f360963a4f9508137a +DIST josm-snapshot-19207.jar 18348268 BLAKE2B 35d8a35b6f2ba4553784d44c6928b2d179d82fae65a98c71c859fd7bb8ce5a26510cfa784318b83f21c38e944685fec2e83e3138f5c7a6cf47229e505ab80ad3 SHA512 7de9b9f4a70cd3b4788254d4b1ab979df311362671d47ec53d8abf5324b32ecb8577ffc1b7619d51df8f8e901cbd4710bfa25e01cba3d8495fd741e53a7966af +EBUILD josm-bin-19128.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781 +EBUILD josm-bin-19160.ebuild 1194 BLAKE2B 4d3baae83ce1ec9b343eaf3223cfa0f0dc15fb32674a50ca13eac19f64c906d9d3bdcf5f494d2bfd9c985a32db6e23e838d4fd992233040714ddcd7a8b2487b2 SHA512 3824da326ecef5d2a7faad42ba89061dcb5d00f12387b42c3ad46a8647b1a9a23e33c4a7298e5a7b9bea6a46926da96b428af81eb07fcd2525369620361d7a5c +EBUILD josm-bin-19207.ebuild 1194 BLAKE2B 4d3baae83ce1ec9b343eaf3223cfa0f0dc15fb32674a50ca13eac19f64c906d9d3bdcf5f494d2bfd9c985a32db6e23e838d4fd992233040714ddcd7a8b2487b2 SHA512 3824da326ecef5d2a7faad42ba89061dcb5d00f12387b42c3ad46a8647b1a9a23e33c4a7298e5a7b9bea6a46926da96b428af81eb07fcd2525369620361d7a5c MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a diff --git a/sci-geosciences/josm-bin/josm-bin-19128.ebuild b/sci-geosciences/josm-bin/josm-bin-19128.ebuild index 6303fb8bbeed..3c2c192c743d 100644 --- a/sci-geosciences/josm-bin/josm-bin-19128.ebuild +++ b/sci-geosciences/josm-bin/josm-bin-19128.ebuild @@ -13,7 +13,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-19096.ebuild b/sci-geosciences/josm-bin/josm-bin-19160.ebuild index 3c2c192c743d..6303fb8bbeed 100644 --- a/sci-geosciences/josm-bin/josm-bin-19096.ebuild +++ b/sci-geosciences/josm-bin/josm-bin-19160.ebuild @@ -13,7 +13,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-19067.ebuild b/sci-geosciences/josm-bin/josm-bin-19207.ebuild index 3c2c192c743d..6303fb8bbeed 100644 --- a/sci-geosciences/josm-bin/josm-bin-19067.ebuild +++ b/sci-geosciences/josm-bin/josm-bin-19207.ebuild @@ -13,7 +13,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/laszip/Manifest b/sci-geosciences/laszip/Manifest index 4d8b965d2967..af5771b2ca17 100644 --- a/sci-geosciences/laszip/Manifest +++ b/sci-geosciences/laszip/Manifest @@ -1,6 +1,3 @@ -DIST laszip-src-3.4.1.tar.bz2 151530 BLAKE2B 17647e458a43165d21cf3ad6fa141f5ae5d82d27d73e4e2d4098bbb72db4826f495e86e15c6985c29eb532ba2677f1c9fe1674e1d8219b451f5b0f26cba1b2e0 SHA512 3aaace2b38b61403b965ca29c8902d757d781dd5ec6aa55eb5779164a66bd340a3be9af17dfe625e77a7ffcc54579610d3ebdbfce54c42ae8ba47dbd22c8c1e7 DIST laszip-src-3.4.3.tar.bz2 153819 BLAKE2B f23d0410ea474c50e858353ef06d9d006e091615e1a8cd26c070de81d2e12770ca64aa3281dd1348ebd372776cd951039d3fa3a60f487d0cb85dda0b19b17f4b SHA512 32635d0918201b1eb141b70bf946f06a40ef9a05d1b51429c90375382e9064e2c500574926a49ae2f6fef44c3a94329b1c305a3945f9bed2a3a92c9d63d37d74 -EBUILD laszip-3.4.1-r1.ebuild 583 BLAKE2B 7b15552928385488fd10507ad7f8936dcbcd4c178981afc6a703c60e556a713851d26480e41a2a60d13155dcf16d7780d1160f0fcc953778368929ce3eaca5f1 SHA512 a4b5db26abfd8dae9ff1b8045f00d2cb87f5ad090dd054d77aef71c49a9828dbec2f55ce7e0780d9939a9ea467235de95c4cb3f5daea45b6a0a6c3a48217e696 -EBUILD laszip-3.4.1.ebuild 581 BLAKE2B 0301e628c12c90e57356f4e2d8606d0ea2b4061c6b94ff1a86706c07e9f0fdf3220bdde36be6cef535f55464dfc6537e2202b147342281832d8928254c0a579c SHA512 73877b911fe5d664f6c2a2c36475a3d222519d3327678ccb1d9faf1ddb4886b1000a58d71b0a0bec773f0bb409977e8b0aa34b565805c77471dcd8f064783998 -EBUILD laszip-3.4.3.ebuild 438 BLAKE2B ca43f0b6f020d652540acad92f24504f06b588ebe1ace1a529e2d3159751ba85d9537cc9196461e80aafbce34aab9595d837f429cc43b04243ccd1e8aa0c9b79 SHA512 05d0713861127aa73e5e204847ac8cc94e15742e1d14b9e0508e5393654e8b79310b31d33032cb662c3afd34a8a40faa6f8f1ff12bf31e1cb6e54edfaca35a7c +EBUILD laszip-3.4.3.ebuild 436 BLAKE2B d91f9fbd446388a38f22cb3d8da77e96c0da1ea1bf07976978e8bb27d739f386e036805ff1ff1f4dee91d83b4f06751a815f34469b2dbf78ff41d8b1177918f6 SHA512 36bf892e0f2e2ad09ed978845a0e46235c67760775fe41e9d9e7bfb9149ab1a11f54a80ed494ec22644b87c133fbb18f4eec8820613810c2a9e39a7b3e845f78 MISC metadata.xml 348 BLAKE2B ed0e51225825d709f9058ebe57b8c4f7922d7ab075d7df44873fd6a84a7612c5490ae842bbab3a03fc4e1b0fd63cff18d2fe908a4df5826c3ab8d254e533bbc6 SHA512 1fd420bcfde5ba8f0929d79d88c9a977ff121b1ebce0c9f059257a8ce744a3605367b6e9d91698d2afe5d4c964488a2a5bf37a0997ac9670a28aaacae9a69002 diff --git a/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild b/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild deleted file mode 100644 index d41ac8eef3fb..000000000000 --- a/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format" -HOMEPAGE="https://laszip.org/" -SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV}.tar.bz2" - -SLOT="0" -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -S="${WORKDIR}/${PN}-src-${PV}" - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862582 - # Fixed in newer version. - filter-lto - - cmake_src_configure -} diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild deleted file mode 100644 index fd0926e96b21..000000000000 --- a/sci-geosciences/laszip/laszip-3.4.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format" -HOMEPAGE="https://laszip.org/" -SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV}.tar.bz2" - -SLOT="0" -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" - -S="${WORKDIR}/${PN}-src-${PV}" - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862582 - # Fixed in newer version. - filter-lto - - cmake_src_configure -} diff --git a/sci-geosciences/laszip/laszip-3.4.3.ebuild b/sci-geosciences/laszip/laszip-3.4.3.ebuild index e82c9094b483..70998812675f 100644 --- a/sci-geosciences/laszip/laszip-3.4.3.ebuild +++ b/sci-geosciences/laszip/laszip-3.4.3.ebuild @@ -12,4 +12,4 @@ S="${WORKDIR}/${PN}-src-${PV}" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest index bab06b26431f..e7db9bc9d6bb 100644 --- a/sci-geosciences/mapserver/Manifest +++ b/sci-geosciences/mapserver/Manifest @@ -1,3 +1,3 @@ -DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1 -EBUILD mapserver-8.0.1.ebuild 4940 BLAKE2B 51f02e80b40a9b1ae677d45a6da1d90a68f2ba8bd82027565a302be26315aec3d5a845d0aa0678095561786e32a9c07072ac090eeab9f1572969f20c80ced54a SHA512 8908f0f4ceb4f0140e76b7d2a50c36792e8995cb9e1776ada5cd8b5cc4e0a9507ae520fc289df138381d01db532f391fa240f520fe36e2655f74d5d02c2f1b38 +DIST mapserver-8.0.2.tar.gz 2957172 BLAKE2B fe9587afb9b805858478faa3a0a558283db6a29e0b131a605c9e2a2f20f8b8addaa8f2170997468db83164add5887bb521219a868404e88e47e907253c17c9cc SHA512 fbd0a77ba67429bd42a3450335b7a600f21e5565f620c6a1a195a0a4fb37e4091dbddc531d623765008d780ab6094da5bd3f29d3e0ec44465c6ac155ada71752 +EBUILD mapserver-8.0.2.ebuild 5545 BLAKE2B 82b8166d6e51ca625271d080140abc58f3083814d8b8f9544ce9fdc9ef2d73b317cbfbc77feb4bb0d2c9e605c3beeadf90d84abbd8578cbcfc7ea2e7337146af SHA512 56cc2843fc791b8c34665577fcf6a0ce948493a95d486b2cfde63eab8236419a0754e927dbf059523646be6a39e098937383c14b6e78664768c24f016f716b7a MISC metadata.xml 497 BLAKE2B b0517aa597d42116849e9f7ecdbf2cb2b479f5c57c7f0fe413dab870555abe82ac5dc07c624cabf769bfd2332300f2860e40cfd1ed375bafa109a347b670232b SHA512 3d58797fb05f9c45359e9ac2302a2432e9b61d300f1c01b27ef562da860311e777b7675b0f162eb2c490cdea0440c9f7b9a3323a89feef01589385ec30a5b64d diff --git a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild b/sci-geosciences/mapserver/mapserver-8.0.2.ebuild index 060fae52b9e2..91d7c76780a7 100644 --- a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild +++ b/sci-geosciences/mapserver/mapserver-8.0.2.ebuild @@ -1,25 +1,27 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) +JAVA_PKG_WANT_SOURCE="11" +JAVA_PKG_WANT_TARGET="11" WEBAPP_MANUAL_SLOT=yes WEBAPP_OPTIONAL=yes -inherit cmake depend.apache perl-functions python-r1 webapp +inherit cmake depend.apache java-pkg-opt-2 perl-functions python-r1 webapp DESCRIPTION="Development environment for building spatially enabled webapps" HOMEPAGE="https://mapserver.org/" SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz" LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk" -KEYWORDS="~amd64 ~x86" SLOT="0" +KEYWORDS="~amd64 ~x86" # NOTE: opengl removed for now as no support for it in upstream CMake -IUSE="apache bidi cairo geos mysql oracle perl postgis python" +IUSE="apache bidi cairo geos java mysql oracle perl postgis python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -71,6 +73,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig + java? ( + virtual/jdk + >=dev-lang/swig-4.0 + ) perl? ( >=dev-lang/swig-4.0 ) python? ( >=dev-lang/swig-4.0 @@ -83,6 +89,10 @@ want_apache2 apache pkg_setup() { use apache && webapp_pkg_setup use perl && perl_set_version + + if use java ; then + QA_SONAME="usr/$(get_libdir)/libjavamapscript.so" + fi } src_prepare() { @@ -97,6 +107,7 @@ _generate_cmake_args() { local args=( "-DCMAKE_SKIP_RPATH=ON" "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" + "-DCMAKE_INSTALL_SYSCONFDIR=/usr/share/${PN}" "-DWITH_CAIRO=OFF" "-DWITH_FCGI=OFF" "-DWITH_FRIBIDI=OFF" @@ -116,6 +127,10 @@ _generate_cmake_args() { } src_configure() { + if use java; then + export JAVA_HOME="$(java-config -g JAVA_HOME)" + fi + # NOTE: We could make this based on _generate_cmake_args, but # then we wouldn't be as-explicit about what is enabled/not, # and reliant on defaults not changing. @@ -123,6 +138,7 @@ src_configure() { local mycmakeargs=( "-DCMAKE_SKIP_RPATH=ON" "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" + "-DCMAKE_INSTALL_SYSCONFDIR=/usr/share/${PN}" "-DWITH_CLIENT_WMS=ON" "-DWITH_CLIENT_WFS=ON" "-DWITH_CURL=ON" @@ -141,6 +157,7 @@ src_configure() { "-DWITH_CAIRO=$(usex cairo ON OFF)" "-DWITH_FCGI=$(usex apache ON OFF)" "-DWITH_GEOS=$(usex geos ON OFF)" + "-DWITH_JAVA=$(usex java ON OFF)" "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)" "-DWITH_MYSQL=$(usex mysql ON OFF)" "-DWITH_FRIBIDI=$(usex bidi ON OFF)" @@ -183,6 +200,8 @@ src_install() { if use python ; then python_foreach_impl cmake_src_install python_foreach_impl python_optimize + remove_egg_info() { rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die; } + python_foreach_impl remove_egg_info fi # Install this last because this build is the most "fully-featured" @@ -193,6 +212,10 @@ src_install() { dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv webapp_src_install fi + + if use java ; then + java-pkg_dojar "${BUILD_DIR}"/mapscript/java/mapscript.jar + fi } pkg_postinst() { diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 3f7a20bb2944..e3565da5a63b 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -4,14 +4,11 @@ AUX qgis-3.36.3-qt6-Fix-broken-test.patch 1091 BLAKE2B 5fc073355b71e4cc932c3a3f7 AUX qgis-3.36.3-qt6.patch 1523 BLAKE2B 2a79e10ea3cbccb75e2af8b59c717668c379159897c508ce5b9a471df0f4ff45a9f9e5511b5fbd7655c0e9137339ebbada1fcba18b65ce2998f3338eecbd55d5 SHA512 f108a26274acb8c7e871aa6dd214897873f31e521f9bc0811404b13d7025a8414c0f50e066afa281d23c085bf8bd846e60e75919f859b4e0456b330ea7728645 AUX qgis-3.36.3-testReportDir.patch 651 BLAKE2B 04dcbad99cfd7156f284284cd165b39231de5ee29d45cd132d5afef7ceaa6197920385ffaf2f339c0ab943e2af2ceb5d5a232d3c5f9f753df7621d4d9ef9e18b SHA512 faf701cd2f83c966826933fbb9f8abbfdd3cce4278a6c9ace55641ce31fc7e8d282872aff7e7ea5a8e31f7590d94b53b608b0344daff3107f095914ebbcb0fe8 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56 -DIST qgis-3.36.1.tar.bz2 171472398 BLAKE2B 1bcd657d1bb715566975ec5aa5bff5a6f282b025c578370d1112a53d00865e18828343ec644f7bb9cff24922e50070c361cae93246f067df4566a4cbd629349b SHA512 e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273 -DIST qgis-3.36.3.tar.bz2 172648476 BLAKE2B 120ba5837e25b0a0ac1bd9588afccf1ee9a1cb6cb26500e010bdd81657d6c061acdf107dbbefc417cc94e113ee8039c3c4a6b664c892e8ea459c2d5f2135e6cc SHA512 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff +DIST qgis-3.38.3.tar.bz2 175959255 BLAKE2B 7fdc310cb8464bcc1b2168b14b661a41941c2ec22b5075f5c40796b15feeb8becec44e38905c6c970c94584b71e6d6798d0c072870f0f10555441db9399fa597 SHA512 ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d -EBUILD qgis-3.28.10.ebuild 11506 BLAKE2B c97b36829915ca90307b1881ae39945684ad6445bc7bef95c5e64215e9430fea6b6dc4aa286dd36b769fd92ed1d6fa657b335442c1e5fb44fad2ff76fb77cfc5 SHA512 40de0aa4183f1155081e1bf23fecb8e25c200eeb308a4a0b954899e0241ae01395142ccd501dea42bbd3b45255790dbcecc0bce384d909e457ce4ef1886f878d -EBUILD qgis-3.36.1.ebuild 11610 BLAKE2B bb4403eb004708735365e084cda82208c186922cef1f7f6f88a581bd04b06f9a52df12dd1db4ae7dbd4d0d03c5613d101878cf9f7ea10f2e65c2c19f391d41ab SHA512 09a86a2269682a93e8e6135c89a3a225fc1f2278f6f5d3ef0cd66f7b05716da8601350f920721773c63ca8c51875ec546b7e8a369feab0a24d946f94dc66acb6 -EBUILD qgis-3.36.3-r1.ebuild 13296 BLAKE2B e497ec73b97ebe75fb3af133e346afb7cbba032058b0c1f9c76ee8eb2c73004da8df1bcf148154d4b5786770d897ac3d515f512f12e7ea23d17050e026964be7 SHA512 cd9e4548a8bec164d4160fd67044f75fb0554e6113c5a87fa332a19356f5e1247a81d431dab78d5b85e41bf7e48d86bbf0312ebeb9d8ac5fd6636f1cbf9c82cb -EBUILD qgis-3.36.3.ebuild 11610 BLAKE2B bb4403eb004708735365e084cda82208c186922cef1f7f6f88a581bd04b06f9a52df12dd1db4ae7dbd4d0d03c5613d101878cf9f7ea10f2e65c2c19f391d41ab SHA512 09a86a2269682a93e8e6135c89a3a225fc1f2278f6f5d3ef0cd66f7b05716da8601350f920721773c63ca8c51875ec546b7e8a369feab0a24d946f94dc66acb6 -EBUILD qgis-3.38.0.ebuild 13504 BLAKE2B 7eaeb76847d68e8c91b586e5a4d2deb18ba9588753f39872a3684d163f650f7c24e181f784cf455620783d2c6ae7dc408fa4f4d1c767fef98ff589203969f215 SHA512 301486d04f8429f3be0d4ae702bdd89d4052517f5db069feb1cd312525138b35c56f39efdf07b8530cec5e86f15fac14abf9d6e822382f80e22477f0ba17cd5b -EBUILD qgis-9999.ebuild 13504 BLAKE2B 7eaeb76847d68e8c91b586e5a4d2deb18ba9588753f39872a3684d163f650f7c24e181f784cf455620783d2c6ae7dc408fa4f4d1c767fef98ff589203969f215 SHA512 301486d04f8429f3be0d4ae702bdd89d4052517f5db069feb1cd312525138b35c56f39efdf07b8530cec5e86f15fac14abf9d6e822382f80e22477f0ba17cd5b +EBUILD qgis-3.28.10.ebuild 11501 BLAKE2B de9db2760f0c4527f6dfd668b0b52006820b0a128ef6b0e3f5c0feee06152e831c54f4d8e271a4741280950e5b1da075fa687b6996593c9e1656c1b6090f8d5c SHA512 a42e3e061ee52f7433d70e37bbfe0a13753090e2630bdf68fa7d4bc8bbfb21ec2e5a7f2b1ea0d8f05a6ae22a5b2ed87b81747266f6f2a249a5f5d81cfe119727 +EBUILD qgis-3.38.0-r1.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e +EBUILD qgis-3.38.3.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e +EBUILD qgis-9999.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e MISC metadata.xml 1696 BLAKE2B 21bdfb035c471861aea5ab8c4ce2e632bcb6dafa0bd3cd0733a3533288c4a6a8f2e5e313a39db8757f11f204d15ca73b3d9b779f3156e7682293db58d24ec20b SHA512 189003c5dec06dd14c57bff372b656dfa5e5febc942ef418782d31f80eeab0d93c7e44bc850719543f5de6b1e08a3e2b2c1596b964d58c942e35441f913b43c3 diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild index 6b2233260c1e..bff6a620ed00 100644 --- a/sci-geosciences/qgis/qgis-3.28.10.ebuild +++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64" fi inherit cmake flag-o-matic python-single-r1 virtualx xdg diff --git a/sci-geosciences/qgis/qgis-3.36.1.ebuild b/sci-geosciences/qgis/qgis-3.36.1.ebuild deleted file mode 100644 index f0cc12843e19..000000000000 --- a/sci-geosciences/qgis/qgis-3.36.1.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="sqlite" - -# We only package the LTS releases right now -# We could package more but would ideally only stabilise the LTS ones -# at least. - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" - inherit git-r3 -else - SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 - examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" -fi -inherit cmake flag-o-matic python-single-r1 virtualx xdg - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/" - -LICENSE="GPL-2+ GPL-3+" -SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - mapserver? ( python ) - test? ( postgres ) -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="!test? ( test )" - -# At some point the dependency on qwtpolar should be -# replaced with a dependency on qwt[polar]. Currently -# it does not build with qwt-6.2[polar] though. -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] - >=dev-db/spatialite-4.2.0 - dev-db/sqlite:3 - dev-libs/expat - dev-libs/libzip:= - dev-libs/protobuf:= - dev-libs/qtkeychain[qt5(+)] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-gfx/exiv2:= - >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] - sci-libs/geos - sci-libs/libspatialindex:= - >=sci-libs/proj-4.9.3:= - sys-libs/zlib - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( dev-qt/qt3d:5 ) - georeferencer? ( sci-libs/gsl:= ) - grass? ( sci-geosciences/grass:= ) - hdf5? ( sci-libs/hdf5:= ) - mapserver? ( dev-libs/fcgi ) - netcdf? ( sci-libs/netcdf:= ) - opencl? ( virtual/opencl ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - pdal? ( sci-libs/pdal:= ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ') - ) - qml? ( dev-qt/qtdeclarative:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" -BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 - app-alternatives/yacc - app-alternatives/lex - doc? ( app-text/doxygen ) - test? ( - $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - dev-python/nose2[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ') - ) -" - -src_prepare() { - cmake_src_prepare - # Tests want to be run inside a git repo - if [[ ${PV} != *9999* ]]; then - if use test; then - git init -q || die - git config user.email "larry@gentoo.org" || die - git config user.name "Larry the Cow" || die - git add . || die - git commit -m "init" || die - fi - fi -} - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/862660 - # https://github.com/qgis/QGIS/issues/56859 - # - # Do not trust with LTO either - append-flags -fno-strict-aliasing - filter-lto - - local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=share/man/ - -DQGIS_LIB_SUBDIR=$(get_libdir) - -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis - -DQWT_INCLUDE_DIR=/usr/include/qwt6 - -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so - -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml - -DPEDANTIC=OFF - -DUSE_CCACHE=OFF - -DWITH_ANALYSIS=ON - -DWITH_APIDOC=$(usex doc) - -DWITH_GUI=ON - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=$(usex test) - -DWITH_3D=$(usex 3d) - -DWITH_GSL=$(usex georeferencer) - $(cmake_use_find_package hdf5 HDF5) - -DWITH_SERVER=$(usex mapserver) - $(cmake_use_find_package netcdf NetCDF) - -DUSE_OPENCL=$(usex opencl) - -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) - -DWITH_PDAL=$(usex pdal) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=OFF - -DWITH_DRACO=OFF - ) - - # We list all supported versions *by upstream for this version* - # here, even if we're not allowing it (e.g. bugs for now), so - # we enable/disable all the right versions. This is so qgis doesn't - # try to automatically use a version the build system knows about. - local supported_grass_versions=( 7 8 ) - if use grass; then - # We can do this because we have a := dep on grass & - # it changes subslot (ABI) when major versions change, so - # the logic here doesn't end up becoming stale. - readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)" - readarray -d'.' -t v <<<"${f[2]}" - grassdir="grass${v[0]}${v[1]}" - - GRASSDIR=/usr/$(get_libdir)/${grassdir} - - einfo "Supported versions: ${supported_grass_versions[@]}" - einfo "Found GRASS version: ${v[0]}*" - - local known_grass_version - # GRASS isn't slotted (in Gentoo, anyway) so we pick - # the best version we can to build against, and disable the others. - for known_grass_version in "${supported_grass_versions[@]}" ; do - case "${known_grass_version}" in - "${v[0]}") - einfo "GRASS version ${known_grass_version} is supported. Enabling." - mycmakeargs+=( - "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}" - "-DWITH_GRASS${known_grass_version}=ON" - ) - ;; - *) - einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling." - mycmakeargs+=( - "-DWITH_GRASS${known_grass_version}=OFF" - ) - ;; - esac - done - else - local known_grass_version - for known_grass_version in "${supported_grass_versions[@]}" ; do - mycmakeargs+=( - "-DWITH_GRASS${known_grass_version}=OFF" - ) - done - fi - - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) - - CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging - - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 - - cmake_src_configure -} - -src_test() { - local myctestargs=( - # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 - -E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_core_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimitedTextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)' - - --output-on-failure - ) - - virtx cmake_src_test -j1 -} - -src_install() { - cmake_src_install - - insinto /usr/share/mime/packages - doins debian/qgis.xml - - if use examples; then - docinto examples - dodoc -r "${WORKDIR}"/qgis_sample_data/. - docompress -x /usr/share/doc/${PF}/examples - fi - - if use python; then - python_optimize - python_optimize "${ED}"/usr/share/qgis/python - fi - - if use grass; then - python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts - fi -} - -pkg_postinst() { - if use postgres; then - elog "If you don't intend to use an external PostGIS server" - elog "you should install:" - elog " dev-db/postgis" - elif use python; then - elog "Support of PostgreSQL is disabled." - elog "But some installed python-plugins import the psycopg2 module." - elog "If you do not need these plugins just disable them" - elog "in the Plugins menu, else you need to set USE=\"postgres\"" - fi - - xdg_pkg_postinst -} diff --git a/sci-geosciences/qgis/qgis-3.36.3.ebuild b/sci-geosciences/qgis/qgis-3.36.3.ebuild deleted file mode 100644 index f0cc12843e19..000000000000 --- a/sci-geosciences/qgis/qgis-3.36.3.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="sqlite" - -# We only package the LTS releases right now -# We could package more but would ideally only stabilise the LTS ones -# at least. - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" - inherit git-r3 -else - SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 - examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" -fi -inherit cmake flag-o-matic python-single-r1 virtualx xdg - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/" - -LICENSE="GPL-2+ GPL-3+" -SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - mapserver? ( python ) - test? ( postgres ) -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="!test? ( test )" - -# At some point the dependency on qwtpolar should be -# replaced with a dependency on qwt[polar]. Currently -# it does not build with qwt-6.2[polar] though. -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] - >=dev-db/spatialite-4.2.0 - dev-db/sqlite:3 - dev-libs/expat - dev-libs/libzip:= - dev-libs/protobuf:= - dev-libs/qtkeychain[qt5(+)] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-gfx/exiv2:= - >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] - sci-libs/geos - sci-libs/libspatialindex:= - >=sci-libs/proj-4.9.3:= - sys-libs/zlib - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( dev-qt/qt3d:5 ) - georeferencer? ( sci-libs/gsl:= ) - grass? ( sci-geosciences/grass:= ) - hdf5? ( sci-libs/hdf5:= ) - mapserver? ( dev-libs/fcgi ) - netcdf? ( sci-libs/netcdf:= ) - opencl? ( virtual/opencl ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - pdal? ( sci-libs/pdal:= ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ') - ) - qml? ( dev-qt/qtdeclarative:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" -BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 - app-alternatives/yacc - app-alternatives/lex - doc? ( app-text/doxygen ) - test? ( - $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - dev-python/nose2[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ') - ) -" - -src_prepare() { - cmake_src_prepare - # Tests want to be run inside a git repo - if [[ ${PV} != *9999* ]]; then - if use test; then - git init -q || die - git config user.email "larry@gentoo.org" || die - git config user.name "Larry the Cow" || die - git add . || die - git commit -m "init" || die - fi - fi -} - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/862660 - # https://github.com/qgis/QGIS/issues/56859 - # - # Do not trust with LTO either - append-flags -fno-strict-aliasing - filter-lto - - local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=share/man/ - -DQGIS_LIB_SUBDIR=$(get_libdir) - -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis - -DQWT_INCLUDE_DIR=/usr/include/qwt6 - -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so - -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml - -DPEDANTIC=OFF - -DUSE_CCACHE=OFF - -DWITH_ANALYSIS=ON - -DWITH_APIDOC=$(usex doc) - -DWITH_GUI=ON - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=$(usex test) - -DWITH_3D=$(usex 3d) - -DWITH_GSL=$(usex georeferencer) - $(cmake_use_find_package hdf5 HDF5) - -DWITH_SERVER=$(usex mapserver) - $(cmake_use_find_package netcdf NetCDF) - -DUSE_OPENCL=$(usex opencl) - -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) - -DWITH_PDAL=$(usex pdal) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=OFF - -DWITH_DRACO=OFF - ) - - # We list all supported versions *by upstream for this version* - # here, even if we're not allowing it (e.g. bugs for now), so - # we enable/disable all the right versions. This is so qgis doesn't - # try to automatically use a version the build system knows about. - local supported_grass_versions=( 7 8 ) - if use grass; then - # We can do this because we have a := dep on grass & - # it changes subslot (ABI) when major versions change, so - # the logic here doesn't end up becoming stale. - readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)" - readarray -d'.' -t v <<<"${f[2]}" - grassdir="grass${v[0]}${v[1]}" - - GRASSDIR=/usr/$(get_libdir)/${grassdir} - - einfo "Supported versions: ${supported_grass_versions[@]}" - einfo "Found GRASS version: ${v[0]}*" - - local known_grass_version - # GRASS isn't slotted (in Gentoo, anyway) so we pick - # the best version we can to build against, and disable the others. - for known_grass_version in "${supported_grass_versions[@]}" ; do - case "${known_grass_version}" in - "${v[0]}") - einfo "GRASS version ${known_grass_version} is supported. Enabling." - mycmakeargs+=( - "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}" - "-DWITH_GRASS${known_grass_version}=ON" - ) - ;; - *) - einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling." - mycmakeargs+=( - "-DWITH_GRASS${known_grass_version}=OFF" - ) - ;; - esac - done - else - local known_grass_version - for known_grass_version in "${supported_grass_versions[@]}" ; do - mycmakeargs+=( - "-DWITH_GRASS${known_grass_version}=OFF" - ) - done - fi - - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) - - CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging - - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 - - cmake_src_configure -} - -src_test() { - local myctestargs=( - # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 - -E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_core_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimitedTextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)' - - --output-on-failure - ) - - virtx cmake_src_test -j1 -} - -src_install() { - cmake_src_install - - insinto /usr/share/mime/packages - doins debian/qgis.xml - - if use examples; then - docinto examples - dodoc -r "${WORKDIR}"/qgis_sample_data/. - docompress -x /usr/share/doc/${PF}/examples - fi - - if use python; then - python_optimize - python_optimize "${ED}"/usr/share/qgis/python - fi - - if use grass; then - python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts - fi -} - -pkg_postinst() { - if use postgres; then - elog "If you don't intend to use an external PostGIS server" - elog "you should install:" - elog " dev-db/postgis" - elif use python; then - elog "Support of PostgreSQL is disabled." - elog "But some installed python-plugins import the psycopg2 module." - elog "If you do not need these plugins just disable them" - elog "in the Plugins menu, else you need to set USE=\"postgres\"" - fi - - xdg_pkg_postinst -} diff --git a/sci-geosciences/qgis/qgis-3.38.0.ebuild b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild index 76526560ee61..0284f8d105e8 100644 --- a/sci-geosciences/qgis/qgis-3.38.0.ebuild +++ b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi inherit cmake flag-o-matic python-single-r1 virtualx xdg @@ -25,11 +25,10 @@ HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test webengine" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) - qt6? ( polar ) " # test? ( postgres ) @@ -37,11 +36,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" COMMON_DEPEND=" + app-crypt/qca:2[qt6,ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= + dev-libs/qtkeychain[qt6] + dev-qt/qttools:6[designer] + dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] + dev-qt/qtmultimedia:6 + dev-qt/qtpositioning:6 + dev-qt/qtserialport:6 + dev-qt/qtsvg:6 dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] @@ -49,6 +56,9 @@ COMMON_DEPEND=" sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib + >=x11-libs/qscintilla-2.10.1:=[qt6] + >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] + 3d? ( dev-qt/qt3d:6 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) @@ -78,74 +88,14 @@ COMMON_DEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - !qt6? ( - dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5] - ) - qt6? ( - dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt6] - ) + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] ') ) - !qt6? ( - app-crypt/qca:2[qt5,ssl] - dev-libs/qtkeychain[qt5] - x11-libs/qwt:=[qt5(+),svg(+)] - >=x11-libs/qscintilla-2.10.1:=[qt5] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - 3d? ( dev-qt/qt3d:5 ) - polar? ( - || ( - ( - x11-libs/qwt:5 - x11-libs/qwtpolar - ) - ( - x11-libs/qwt:6/1.5 - x11-libs/qwtpolar - ) - ( - >=x11-libs/qwt-6.2[polar(+)] - ) - ) - ) - qml? ( dev-qt/qtdeclarative:5 ) - webengine? ( dev-qt/qtwebengine:5 ) - ) - qt6? ( - app-crypt/qca:2[qt6,ssl] - dev-libs/qtkeychain[qt6] - >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] - >=x11-libs/qscintilla-2.10.1:=[qt6] - dev-qt/qttools:6[designer] - dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] - dev-qt/qtmultimedia:6 - dev-qt/qtpositioning:6 - dev-qt/qtserialport:6 - dev-qt/qtsvg:6 - 3d? ( dev-qt/qt3d:6 ) - polar? ( x11-libs/qwt:=[polar(+)] ) - qml? ( dev-qt/qtdeclarative:6 ) - webengine? ( dev-qt/qtwebengine:6 ) - ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) " DEPEND="${COMMON_DEPEND} - !qt6? ( - dev-qt/qttest:5 - ) test? ( python? ( app-text/qpdf @@ -157,20 +107,14 @@ RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " BDEPEND="${PYTHON_DEPS} - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) + dev-qt/qttools:6[linguist] app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( python? ( $(python_gen_cond_dep ' - !qt6? ( - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - ) - qt6? ( - dev-python/PyQt6[${PYTHON_USEDEP},testlib] - ) + dev-python/PyQt6[${PYTHON_USEDEP},testlib] dev-python/nose2[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] ') @@ -221,7 +165,7 @@ src_configure() { -DPEDANTIC=OFF -DUSE_CCACHE=OFF - -DBUILD_WITH_QT6="$(usex qt6)" + -DBUILD_WITH_QT6=ON -DWITH_ANALYSIS=ON -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON @@ -235,7 +179,7 @@ src_configure() { $(cmake_use_find_package netcdf NetCDF) -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) + -DWITH_QWTPOLAR=ON -DWITH_QTWEBENGINE=$(usex webengine) -DWITH_PDAL=$(usex pdal) -DWITH_POSTGRESQL=$(usex postgres) diff --git a/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.38.3.ebuild index 43309edb502c..0284f8d105e8 100644 --- a/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild +++ b/sci-geosciences/qgis/qgis-3.38.3.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi inherit cmake flag-o-matic python-single-r1 virtualx xdg @@ -25,23 +25,30 @@ HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) - qt6? ( polar ) - test? ( postgres ) " +# test? ( postgres ) # Disabling test suite because upstream disallow running from install path RESTRICT="!test? ( test )" COMMON_DEPEND=" + app-crypt/qca:2[qt6,ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= + dev-libs/qtkeychain[qt6] + dev-qt/qttools:6[designer] + dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] + dev-qt/qtmultimedia:6 + dev-qt/qtpositioning:6 + dev-qt/qtserialport:6 + dev-qt/qtsvg:6 dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] @@ -49,6 +56,9 @@ COMMON_DEPEND=" sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib + >=x11-libs/qscintilla-2.10.1:=[qt6] + >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] + 3d? ( dev-qt/qt3d:6 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) @@ -77,73 +87,15 @@ COMMON_DEPEND=" >=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:0[${PYTHON_USEDEP}] ) - !qt6? ( - dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5] - ) - qt6? ( - dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt6] - ) + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] ') ) - !qt6? ( - app-crypt/qca:2[qt5,ssl] - dev-libs/qtkeychain[qt5] - x11-libs/qwt:=[qt5(+),svg(+)] - >=x11-libs/qscintilla-2.10.1:=[qt5] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - 3d? ( dev-qt/qt3d:5 ) - polar? ( - || ( - ( - x11-libs/qwt:5 - x11-libs/qwtpolar - ) - ( - x11-libs/qwt:6/1.5 - x11-libs/qwtpolar - ) - ( - >=x11-libs/qwt-6.2[polar(+)] - ) - ) - ) - qml? ( dev-qt/qtdeclarative:5 ) - ) - qt6? ( - app-crypt/qca:2[qt6,ssl] - dev-libs/qtkeychain[qt6] - >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] - >=x11-libs/qscintilla-2.10.1:=[qt6] - dev-qt/qttools:6[designer] - dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] - dev-qt/qtmultimedia:6 - dev-qt/qtpositioning:6 - dev-qt/qtserialport:6 - dev-qt/qtsvg:6 - 3d? ( dev-qt/qt3d:6 ) - polar? ( x11-libs/qwt:=[polar(+)] ) - qml? ( dev-qt/qtdeclarative:6 ) - ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) " DEPEND="${COMMON_DEPEND} - !qt6? ( - dev-qt/qttest:5 - ) test? ( python? ( app-text/qpdf @@ -155,20 +107,14 @@ RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " BDEPEND="${PYTHON_DEPS} - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) + dev-qt/qttools:6[linguist] app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( python? ( $(python_gen_cond_dep ' - !qt6? ( - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - ) - qt6? ( - dev-python/PyQt6[${PYTHON_USEDEP},testlib] - ) + dev-python/PyQt6[${PYTHON_USEDEP},testlib] dev-python/nose2[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] ') @@ -177,7 +123,7 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch" + # "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch" "${FILESDIR}/${PN}-3.36.3-qt6.patch" "${FILESDIR}/${PN}-3.36.3-testReportDir.patch" ) @@ -219,7 +165,7 @@ src_configure() { -DPEDANTIC=OFF -DUSE_CCACHE=OFF - -DBUILD_WITH_QT6="$(usex qt6)" + -DBUILD_WITH_QT6=ON -DWITH_ANALYSIS=ON -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON @@ -233,7 +179,8 @@ src_configure() { $(cmake_use_find_package netcdf NetCDF) -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) + -DWITH_QWTPOLAR=ON + -DWITH_QTWEBENGINE=$(usex webengine) -DWITH_PDAL=$(usex pdal) -DWITH_POSTGRESQL=$(usex postgres) -DWITH_BINDINGS=$(usex python) @@ -298,6 +245,10 @@ src_configure() { } src_test() { + addwrite "/proc/self/mem" + addwrite "/proc/self/task/" + addwrite "/dev/fuse" + local -x CMAKE_SKIP_TESTS=( PyQgsAFSProvider$ PyQgsAnnotation$ diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 76526560ee61..0284f8d105e8 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi inherit cmake flag-o-matic python-single-r1 virtualx xdg @@ -25,11 +25,10 @@ HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test webengine" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) - qt6? ( polar ) " # test? ( postgres ) @@ -37,11 +36,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" COMMON_DEPEND=" + app-crypt/qca:2[qt6,ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= + dev-libs/qtkeychain[qt6] + dev-qt/qttools:6[designer] + dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] + dev-qt/qtmultimedia:6 + dev-qt/qtpositioning:6 + dev-qt/qtserialport:6 + dev-qt/qtsvg:6 dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] @@ -49,6 +56,9 @@ COMMON_DEPEND=" sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib + >=x11-libs/qscintilla-2.10.1:=[qt6] + >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] + 3d? ( dev-qt/qt3d:6 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) @@ -78,74 +88,14 @@ COMMON_DEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - !qt6? ( - dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5] - ) - qt6? ( - dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt6] - ) + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] ') ) - !qt6? ( - app-crypt/qca:2[qt5,ssl] - dev-libs/qtkeychain[qt5] - x11-libs/qwt:=[qt5(+),svg(+)] - >=x11-libs/qscintilla-2.10.1:=[qt5] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - 3d? ( dev-qt/qt3d:5 ) - polar? ( - || ( - ( - x11-libs/qwt:5 - x11-libs/qwtpolar - ) - ( - x11-libs/qwt:6/1.5 - x11-libs/qwtpolar - ) - ( - >=x11-libs/qwt-6.2[polar(+)] - ) - ) - ) - qml? ( dev-qt/qtdeclarative:5 ) - webengine? ( dev-qt/qtwebengine:5 ) - ) - qt6? ( - app-crypt/qca:2[qt6,ssl] - dev-libs/qtkeychain[qt6] - >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] - >=x11-libs/qscintilla-2.10.1:=[qt6] - dev-qt/qttools:6[designer] - dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] - dev-qt/qtmultimedia:6 - dev-qt/qtpositioning:6 - dev-qt/qtserialport:6 - dev-qt/qtsvg:6 - 3d? ( dev-qt/qt3d:6 ) - polar? ( x11-libs/qwt:=[polar(+)] ) - qml? ( dev-qt/qtdeclarative:6 ) - webengine? ( dev-qt/qtwebengine:6 ) - ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) " DEPEND="${COMMON_DEPEND} - !qt6? ( - dev-qt/qttest:5 - ) test? ( python? ( app-text/qpdf @@ -157,20 +107,14 @@ RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " BDEPEND="${PYTHON_DEPS} - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) + dev-qt/qttools:6[linguist] app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( python? ( $(python_gen_cond_dep ' - !qt6? ( - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - ) - qt6? ( - dev-python/PyQt6[${PYTHON_USEDEP},testlib] - ) + dev-python/PyQt6[${PYTHON_USEDEP},testlib] dev-python/nose2[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] ') @@ -221,7 +165,7 @@ src_configure() { -DPEDANTIC=OFF -DUSE_CCACHE=OFF - -DBUILD_WITH_QT6="$(usex qt6)" + -DBUILD_WITH_QT6=ON -DWITH_ANALYSIS=ON -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON @@ -235,7 +179,7 @@ src_configure() { $(cmake_use_find_package netcdf NetCDF) -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) + -DWITH_QWTPOLAR=ON -DWITH_QTWEBENGINE=$(usex webengine) -DWITH_PDAL=$(usex pdal) -DWITH_POSTGRESQL=$(usex postgres) diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index a3fbd5d4bf3b..7ce6e80ac7cf 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,3 +1,5 @@ DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c +DIST qmapshack-1.17.1_p600.tar.gz 56720384 BLAKE2B 0a76b90273838898c74d6fcf81de0903cd24c294e5ccb7333cdc478b22f01bb771bcc155683c27e0310b018b2c47cf23235b3cd65b81779f97104e389b79450b SHA512 05729eddaca0fd845490eb56e0a0c4ed6d3a721433c24c3e8a6a424a2d6dbb6f9a16dfc8babe4a4ae1b48d8215f586654b1385f748ee8497d629ecdbe4fae2f9 EBUILD qmapshack-1.17.1.ebuild 974 BLAKE2B 7ad2c6158aca5ad05afa5118ab0d868ac81b1bb4c43c4cb4195f1ca43ef8aa2e201e3eeb11e1072c901a5f19be5d1a338cba1311bfc7b4cadf70580de5deb7d0 SHA512 e73cd171b4db592739fa2c9d8f4b028c97fd2864e781cc30291354d5b88c6b3359286f120babca4d586aeb0a548abc71559906e6ee2cd2f81c2a08bde89db850 +EBUILD qmapshack-1.17.1_p600.ebuild 1034 BLAKE2B 48823a7ee5494134187d4a8a0b3e60cf6794ec6a23a7c78163f02c2ccdf955f99211fc87043fa4cd3366dd09dad17df7b444fd1d1135829746001565f642df8d SHA512 e78d8e2248a66b302944ea6f78421b1c94e99565314a06ab93f5a38d36b331e45c142de96f2ea64abe790f60b4694b31aab34fccb89770936e1fb88f00676bfd MISC metadata.xml 834 BLAKE2B af7dac2c7ce98d1a40e993e51e646fdadb328515d1aa1e3e8c508e30f47ae1bc25e71ddb774b7ab65126f4644e119aa2be1a01c075c783fcd5f5fa2d06f23e75 SHA512 8e6e2d99a1ed77eee5b511901c190b8e9b2dc12e9a83525463cb96db811cda03c4a7dc3bd6fe7bc83dff93bd5d202ac7a66f69f350f7ac0773a6e894e6b64a85 diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1_p600.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p600.ebuild new file mode 100644 index 000000000000..e35048395d1a --- /dev/null +++ b/sci-geosciences/qmapshack/qmapshack-1.17.1_p600.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="GPS mapping utility" +HOMEPAGE="https://github.com/Maproom/qmapshack/wiki" +COMMIT="1f009ac0be1d1c2a4c31aa1283f4009e88685d34" +SRC_URI="https://github.com/kiozen/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${COMMIT} + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-db/sqlite + dev-libs/quazip:0=[qt6(+)] + dev-qt/qt5compat:6[icu,qml] + dev-qt/qttools:6[assistant,linguist,opengl,qdbus,qml,widgets,zstd] + dev-qt/qtwebengine:6[widgets] + sci-geosciences/routino + sci-libs/alglib + sci-libs/gdal:= + sci-libs/proj:= +" +DEPEND="${RDEPEND}" + +src_install() { + docompress -x /usr/share/doc/${PF}/html + cmake_src_install + mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed" + ewarn "An experimental Qt6 port" + ewarn "Translations and the help system are broken" + ewarn "Other bugs to https://github.com/Maproom/qmapshack/issues" +} diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest index c0fcf1756d9c..d242befbba15 100644 --- a/sci-geosciences/viking/Manifest +++ b/sci-geosciences/viking/Manifest @@ -1,5 +1,5 @@ AUX viking-1.10-terraserver.patch 1286 BLAKE2B a10fb99632db730a03b1e34d2f3021ff5ab02905676052b409b25577b7f7e03f90572ddf201b0b6345b80c3704cc30582b266a613144cfb21e30afd7b9a78a88 SHA512 82a868cdd85b1d1886fa4b8e86fef5bf67b283453e5bb160b9fc9b15685727cab558f2b73f61c1a8e63e8bb366cfc0c22abca68865aba9fbc45bb6fc5153ec36 DIST viking-1.10.tar.gz 6014926 BLAKE2B 667a5cd854449f54c6f5969118a445903cafae4e8f046f14b6802f53a76c217cf960dd11876ed237112026f96da2906bb68b2474ba4e72696bd8b8a082cf7189 SHA512 8d0b3b46e139b8c03730140d89e8eaf6f1dbcde504011710d122e5239d11d1115464b087edd531228be199286605df0deb3f4b75fae0222128b0f5098344527e DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee -EBUILD viking-1.10.ebuild 2100 BLAKE2B 4346b9649e6252d5f69a809d44437237f9382b1ce58289468e3e09d4558a996db763ae30d79c8fabf01d00490357f3b8debeb362a4ef887060dcc313dbff3e80 SHA512 96b280af85f57f1ca63e9e05f38aaf7739fe42d95137859fbd64e1b19c879f2d8f0fe8200b0c8f7e06e0dbc6bc3b4d0d1e25eed00c6990ec3afd1d7f5f4494b6 +EBUILD viking-1.10.ebuild 2095 BLAKE2B 416d6bb44575e987b9503b66afc8ed294f189511abdfd1488f258bc2f3892de61e0d25aca65a4db833e7f2683fd566ecc1b1e66f9bc9167fbd13b43f7fbaf923 SHA512 a20f3bcbec9687fdba4c83282464c444f6798a85753177fde114bbdb125219fcb07774eda054c3c7eef927f4378d8a9937b28e6c2249087f1abdcc12ae4c009f MISC metadata.xml 793 BLAKE2B 21b6c3d0751f98fd8d90b260b54b9a3ef004b35f9fbb088dd664f60a72a1618df90464288075043d30754d95ebea1aa6e261ce3a280fda005a029c4dd4dac971 SHA512 9e436dedcc783f3c0c1c678905ec1381f7fe56f50480680448401b4ce06ccaffbc954debd52bb98af8008df468220482f155ee53db071e6b8b5adf1a6d600da5 diff --git a/sci-geosciences/viking/viking-1.10.ebuild b/sci-geosciences/viking/viking-1.10.ebuild index f3cde20cb986..67a1e9561987 100644 --- a/sci-geosciences/viking/viking-1.10.ebuild +++ b/sci-geosciences/viking/viking-1.10.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" IUSE="doc +exif libexif geoclue gps +magic nls oauth" COMMONDEPEND=" |