summaryrefslogtreecommitdiff
path: root/sci-geosciences
diff options
context:
space:
mode:
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/Manifest.gzbin11258 -> 11249 bytes
-rw-r--r--sci-geosciences/gmt/Manifest5
-rw-r--r--sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch14
-rw-r--r--sci-geosciences/gmt/gmt-5.4.4.ebuild116
-rw-r--r--sci-geosciences/gmt/metadata.xml3
-rw-r--r--sci-geosciences/josm-bin/Manifest2
-rw-r--r--sci-geosciences/josm-bin/josm-bin-18746.ebuild33
7 files changed, 36 insertions, 137 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 402a88600b8d..be5cbc7e38ca 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
Binary files differ
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 9ba28f824d7e..0926c271cde9 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,6 +1,3 @@
-AUX gmt-5.4.4-sighandler.patch 573 BLAKE2B 1df9b28c9a23c929c86af060845a1e5346f366e4469656c0cc405c2979819870734666c5c777a725a04b2508dd85d84cbccce6ca8000ddd0b1e32f755038e17d SHA512 3e5b26234ecaef39658ef1e82f90b5ffd86ff5fd0a91eda829c92fd11a886e1c4106f0a578b5bd223e3ae9b75dec0c44022112197bed69fae09cd534f7e535a8
-DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
DIST gmt-6.4.0-src.tar.xz 55875004 BLAKE2B 887ea35708d354f3812822b1effd4906ead129a186b0117930bb46e057671645e3d2eec3e0a104aa3e06092c6c28857f5dba2c8828b61847e618651eeaa5f146 SHA512 0748215cbe9138a0ec3c7168019fee438e53c1d80a836caa33fa82d4d5ba30525e636a4a937ab9cb1c90cf07181c610f7ebcb5e844f0019f51523613878f7e40
-EBUILD gmt-5.4.4.ebuild 3085 BLAKE2B b948907dddde73aa76be9c5c6ea4d46c7885e7fefa4de8fc11210cb9e0f5f6bbd8813608f9bf136838f73bf505fd28282cbb4937285fc74bdc49e84b917e8070 SHA512 1dc699f0e7711d4f72c0fe4db4c26d90a34f1f3cc7a750b11af537f92551ac86e3035346417df87e5a2ef33afc962517209ff895f60308464af7f5ffe0feefb7
EBUILD gmt-6.4.0.ebuild 2615 BLAKE2B c104e6c6382f4caaeb47dfbe176c5de29ab6c8fff16e251b86467caa8a593494d4a6e8495b1a86fff58b41d5a267c56c4d0c3822ce793ddc9ea223422043e436 SHA512 a36bd6550fc700e9199d0a3b3939e5cf27ffde48959441975122b4d49490c7844a51a999d3d553152ee7d8f67fa76d6e9fd77dd4d10e1a5d0304973091d13f95
-MISC metadata.xml 803 BLAKE2B 495348da16fac57337217745efbb67a20ddf05d208136caaab926434b84f765c7c7f044dc026bf5df7c09fbaf443f210e19f3bb8e3bc5c1b68b5bfb2bd0379c5 SHA512 09e8b04766b871f579b84541de88f19c8f6bff63a9b6b36bbc863cedbb0e3bb3eeb13becac2a793b88dbb2ced592f5b8d80f7c421c7491be4a48cd56fb402205
+MISC metadata.xml 598 BLAKE2B e9f4551ca272d7f20f76a508db5ef33963819635d9409ee2d62699f2f982ace1198dc6f73f064c9457f8862e4198f3fcc19e15ef286e395d8db90341c072a398 SHA512 2275e91105ab3ada0cf02f68c4ba20aadc442c8af63274bd1bde0c8c31e41aeedfc8d621c1e2ffed4dbaa04f0f83975b344f1344eabb128543917f3485f6fea2
diff --git a/sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch b/sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch
deleted file mode 100644
index 54aecb3c0d55..000000000000
--- a/sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/738224
-Author: hangglider@gmx.de
---- a/src/common_sighandler.c
-+++ b/src/common_sighandler.c
-@@ -187,7 +187,7 @@
- return;
- }
- else {
-- fprintf (stderr, "ERROR: Caught signal number %d (%s) at\n", sig_num, sys_siglist[sig_num]);
-+ fprintf (stderr, "ERROR: Caught signal number %d (%s) at\n", sig_num, strsignal(sig_num));
- backtrace_symbols_fd (array, 2, STDERR_FILENO); /* print function with faulting instruction */
- size = backtrace (array, 50); /* get void*'s for all entries on the stack */
- fprintf (stderr, "Stack backtrace:\n");
-
diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild
deleted file mode 100644
index 15ac033c5501..000000000000
--- a/sci-geosciences/gmt/gmt-5.4.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake flag-o-matic
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="https://gmt.soest.hawaii.edu/"
-SRC_URI="mirror://gmt/${P}-src.tar.xz"
-
-LICENSE="GPL-3+ gmttria? ( Artistic )"
-SLOT="5"
-KEYWORDS="amd64 ~x86"
-IUSE="doc examples +fftw +gdal gmttria htmldoc lapack openmp pcre pcre2 threads tutorial"
-
-REQUIRED_USE="?? ( pcre pcre2 )"
-
-DEPEND="
- app-text/ghostscript-gpl
- net-misc/curl
- >=sci-libs/netcdf-4.1:=[hdf5]
- sys-libs/zlib
- fftw? ( sci-libs/fftw:3.0= )
- gdal? ( sci-libs/gdal:= )
- lapack? ( virtual/lapack )
- pcre? ( dev-libs/libpcre )
- pcre2? ( dev-libs/libpcre2 )
-"
-RDEPEND="${DEPEND}
- !sci-biology/probcons
- sci-geosciences/dcw-gmt
- sci-geosciences/gshhg-gmt
-"
-
-PATCHES=( "${FILESDIR}"/${P}-sighandler.patch )
-
-src_prepare() {
- cmake_src_prepare
- # Rename man pages to avoid a name conflict with gmt4
- pushd man_release || die
- local m c suffix newc
- for m in *.gz; do
- c=${m%%.*}
- suffix=${m#*.}
- newc=gmt_${c}
- # This man pages does'nt conflict
- case ${c} in
- gmt|gmt.conf|postscriptlight)
- continue ;;
- gmt_shell_functions)
- newc=gmt5_shell_functions ;;
- gmtcolors)
- newc=gmt5colors ;;
- esac
- mv "${c}.${suffix}" "${newc}.${suffix}" || die
- done
- popd || die
-}
-
-src_configure() {
- # https://bugs.gentoo.org/710088
- # drop on version bump
- append-cflags -fcommon
- local mycmakeargs=(
- -DGMT_DATADIR="share/${P}"
- -DGMT_DOCDIR="share/doc/${PF}"
- -DGMT_MANDIR="share/man"
- -DLICENSE_RESTRICTED=$(usex gmttria no yes)
- -DGMT_OPENMP=$(usex openmp)
- -DGMT_USE_THREADS=$(usex threads)
- -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=OFF # Install bash completions properly
- -DGMT_INSTALL_MODULE_LINKS=OFF # Don't install symlinks on gmt binary, they are conflicted with gmt4
- -DBASH_COMPLETION_DIR="$(get_bashcompdir)"
- $(cmake_use_find_package gdal GDAL)
- $(cmake_use_find_package fftw FFTW3)
- $(cmake_use_find_package lapack LAPACK)
- $(cmake_use_find_package pcre PCRE)
- )
- use pcre || mycmakeargs+=( $(cmake_use_find_package pcre2 PCRE2) )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # Remove various documentation
- if ! use doc; then
- rm -rf "${ED}/usr/share/doc/${PF}/pdf" || die
- fi
-
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -rf "${ED}/usr/share/doc/${PF}/examples" || die
- fi
-
- if ! use htmldoc; then
- rm -rf "${ED}/usr/share/doc/${PF}/html" || die
- fi
-
- if use tutorial; then
- docompress -x /usr/share/doc/${PF}/tutorial
- else
- rm -rf "${ED}/usr/share/doc/${PF}/tutorial" || die
- fi
-
- # Decompress manuals
- find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} + || die
- # Rename some files to avoid a name conflict with gmt4
- mv "${ED}/usr/bin/gmt_shell_functions.sh" "${ED}/usr/bin/gmt5_shell_functions.sh" || die
- mv "${ED}/usr/bin/isogmt" "${ED}/usr/bin/isogmt5" || die
- rm "${ED}/usr/bin/gmtswitch" || die
- # Rename bash completion file
- mv "${D}$(get_bashcompdir)/gmt_completion.bash" "${D}$(get_bashcompdir)/gmt" || die
-}
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index 089070826efa..05748e9b8511 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -9,9 +9,6 @@
<flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
<flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
<flag name="gmttria">Non GNU triangulation method, more efficient</flag>
- <flag name="htmldoc">Install html documentation</flag>
- <flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> for regular expressions</flag>
- <flag name="tutorial">Install data files for tutorial</flag>
</use>
<upstream>
<remote-id type="github">GenericMappingTools/gmt</remote-id>
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 5fe8c2b4f224..d7be610f97ac 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,5 +1,7 @@
DIST josm-snapshot-18700.jar 16421003 BLAKE2B 67310f9e1d2b64646f543573ee9aacac6f62ff40597e069e756d34bf4699755712bccf5dca8bd89c8185db5a470dd3d1c4242b02534e416fe04c62ca7f994de2 SHA512 7d6923bf3d5ba1f7331a3904d1b54920a301eacc53c720991132cecb00bfc2dca2e0fd9d58d90e88ff0e3f46207bed06b6ac002e13baa69e95cbc0c11b4e191e
DIST josm-snapshot-18721.jar 16460468 BLAKE2B 6c5e86b31691a366211ea93e3094a8650ac6e2b42f4f72883ffc17819108cf717f1b29f2918788acfe07aae946f57b4b88be637069fc97b830af067de9a69de1 SHA512 53244e668d5269e8c20a0efadab9ab7ab665f40f1e02366e3491b3dac9ff1595a2a10ba34e063f56bef1c8e3c450abd237f6c02218484817960e8dfd7959db41
+DIST josm-snapshot-18746.jar 16627046 BLAKE2B b3c846229f9ff9087fcb69e03dffcd392a9d56c5de2462134ce090c587f0ed638d8b2e95de4b60d18b2e564ec8b2edafd983aaea311f6f33f7449a8ad052910b SHA512 a8e1218448cfbb9956227a3456efd737bcb8b0fe6afc705814d8f3dbdcf6ac1133b4d887e7119f993ea20233bfd8ebf2fff6556bb864c5025101b4641a138560
EBUILD josm-bin-18700.ebuild 977 BLAKE2B 1d92fa177bc617952c90e55c7ed083591cee3b6a58e36070ee0b1f11222452575b135d4256da94d4b87829e0b02b236064c82de89f4754e80e4159c91d7c53d2 SHA512 89436b6f1f3cb3f0c324054be45197e28bdec03e581af4cb36b9d6593ae47cb067b3ea5e28a1326c606db4f93c23ee77624c927a1d70745a0d87ff77a05dddb2
EBUILD josm-bin-18721.ebuild 978 BLAKE2B e601ff9462741ef04a7e52d9afe1c2ead273f61854f87f3a770ae37f75cbb680bf09307439c39238b3fa36e8423465b6f7dbe205d2158f9a2ad032fadf4237eb SHA512 02831baa1bb0501b6ba1bf9a4ee04e0196cb76f53ac686e9d76132ee683dc7e6530115fe2992eb26373b7dece1d9acd872eb2bbf7abdd99cdf28b4558f8a4072
+EBUILD josm-bin-18746.ebuild 978 BLAKE2B e601ff9462741ef04a7e52d9afe1c2ead273f61854f87f3a770ae37f75cbb680bf09307439c39238b3fa36e8423465b6f7dbe205d2158f9a2ad032fadf4237eb SHA512 02831baa1bb0501b6ba1bf9a4ee04e0196cb76f53ac686e9d76132ee683dc7e6530115fe2992eb26373b7dece1d9acd872eb2bbf7abdd99cdf28b4558f8a4072
MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-18746.ebuild b/sci-geosciences/josm-bin/josm-bin-18746.ebuild
new file mode 100644
index 000000000000..1aba0e7ffd7b
--- /dev/null
+++ b/sci-geosciences/josm-bin/josm-bin-18746.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop java-utils-2 xdg
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="https://josm.openstreetmap.de/"
+# PV should be stable here https://josm.openstreetmap.de/wiki/StartupPage
+SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+BDEPEND="app-arch/unzip"
+
+src_install() {
+ java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
+ java-pkg_dolauncher ${PN} --jar ${PN}.jar
+
+ local icon_size
+ for icon_size in 16 32 48; do
+ newicon -s ${icon_size} -t hicolor \
+ images/logo_${icon_size}x${icon_size}x32.png ${PN}.png
+ newicon -s ${icon_size} -t locolor \
+ images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
+ done
+ make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 17:17:31 +0000