gentoo auto-resync : 29:09:2023 - 11:37:12

5 files changed, 144 insertions, 0 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index e9f51321667b..fbe8fdfc4de7 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index 7a364b08b65b..3e615f91985b 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -1,9 +1,12 @@
 AUX grace-5.1.21-fortran.patch 649 BLAKE2B c0de10fc82809fa0ec73e6fdc03e7b50ac18f0cf49eaf817b84419038078667db24adc953d7c24ef009807d9310c0226ed00eabb902dd36eedc8060e3156ab06 SHA512 29331f67e0a23a2c180aff1c864fde6cd7b41d835a0eff63135c1f5840b2c67263c409c355d1c453133668f2dbde032f7525859ce2e579d52db8884f08554baa
 AUX grace-5.1.22-dlmodule.patch 355 BLAKE2B baee835ed77d6720f145a7973a5a1e58359d129eb514b4e8ec13f3390dcd39f9842cee30a6ac131b79c2f3deaffecf76e41ddb5df0b8a26f67aa1b85959aaddb SHA512 8ce040b56992712a11f2d00aa1aca67120e16df187ffed9541bb5fdc390c7555461d3ccbfbc3448e68d9a41b6b3bf9d1d2f3dca10259393c96665e3ba489ef34
+AUX grace-5.1.25-honor-noask.patch 419 BLAKE2B 5fdfc9228d001ec8a0016b8dfc5a4df1d95f0a0931e602d2f2a4099ae88b65904546f337528b28a4de2af6561bf05172d25bad0a75bd3eb343c0fdafc92efde8 SHA512 5b089de3b58d7107674cb8f07fceb0ef639208a534c56d785add156b04857fe9ae2a04edd68ec1f74eac12a2a32d255550782042801a092137cd24b481368d04
+AUX grace-c99.patch 346 BLAKE2B dc63430fd61f1dd53e3f0bc9515d61929d834e957af03c02c607eab8061c05c1e74bf5db57c08182e5bc95d005216b11d79309cd06fddee4b2578f7fe99f304b SHA512 880e825ee4ebbbb5bc7d8fb500bd54f773982817a6c52606d4b7f3a02bacc627416a08b1aa3f0e1a121424f4b0f8d9a9f23d239376d477239a5511b5c2f63c86
 AUX grace.desktop 161 BLAKE2B a401e23fc2ee22cd47c36becfa742f5acafd2359185a92f1156159c2ea480a17a82219182873aaf9da4e6582bce6ac1ef62b66b1330759214fc21a364c376ac6 SHA512 6d43de6f8d5f85c3fff36202320864ea3611d3ee842efa677ad59ae1390c6499f9f14aefd37345c0cec62024637b057e804efd26577c45b4f7a5bb6717952b2a
 DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a
 DIST grace_5.1.25-13.debian.tar.xz 110248 BLAKE2B 19dce6ed1b9e1d93d87036f5aba5ee262d54a58bc7daf2039fb2246bd2f45e413832561a33f8cb1b793fdf30831b0282f00e60efe3980df7875d2923a9f32f76 SHA512 51ee85525557c630fc3e208eb9b72b8973de6351698766ade1a59af6b9f16bc1b6b9c2c40d2270eb33d55806c4762c7b5d10b14f2a470ff00cfae2c9351bc922
 DIST grace_5.1.25-9.debian.tar.xz 109764 BLAKE2B 0b32a7e08104c463cbd75bf022dfeffb967b5c828ab8866f123e8ed3bb8a0095876f8f3e54b3fc951ddff142561eef921a046fc59cee1ceb02a4643019b11071 SHA512 f2e7d68fc5f03450ea9c88260935f2cfab31cdc38f9a1f4c8a201c1c5172dcc27d521941d005ae13249c4df3aed8c1a9f3a63dad029988c6b2f25f6d177e1390
 EBUILD grace-5.1.25_p13-r1.ebuild 2861 BLAKE2B fd95edcc79f9ff9a4ca9b182a9336cbf2e007c93bcdaf7ab150b9c69cf2cd0dfe7aad1ade60f881a066d9814b3796f344ddd424d71c79a141b8c6c1a4f42aeb7 SHA512 17840bb0c82d8be359b20417548292927769ffe2e2529bee7d7bd80cabbf4ec679d71a71f9c5827fa30fa2609e56d1f4f02ff58dbb268d283f75ec727c6940c1
+EBUILD grace-5.1.25_p13-r2.ebuild 3035 BLAKE2B 1faa0d707ee3d67a467337a8536b1bd272fd46481bca105faa0c1156c567c760aa02a87c3fce66614add4f1d8cf9dba83e657eac1920517dc7495edf8daeca25 SHA512 904f1db858eecc94d7c8d5bbf23b195699cef23311d00431f1655eb835d0f6e75449c597f677b68a8089ae5fd6cf7851114cdcc8c9a9595537ff3e02fcfd011e
 EBUILD grace-5.1.25_p9-r3.ebuild 2857 BLAKE2B 88a64e562a2abcdf8aa1c8f2df5e9496e9021422c2bc662c732a80b1418699b5d9bee5f025e36ac5376eb64fa73c33c7815cebe654dbba951eba25e1543edc9f SHA512 e92fc7c81798bb3c19c2cbd60549aaf03dea60275480cd2926f7ab83cb6586135f77c1176c44e1b4440371c29117df0c039000b863a5c30e7e0b9ba660062ce6
 MISC metadata.xml 731 BLAKE2B feed7db30735c68833d77ff620fba0fe0aa1bce8a5dbe28acc9fe173cd5ac43db832b1c7f6561c7ae4806518a8ac307bc8dd0e6d7fa0c01cfd2dfda1733bd50d SHA512 e8a3ba01961a1c0bcc3627670ddb286395f85d481ba1892aba65b5c661337b29e93e4457a3b86813d2381073e8bff9a2bef8b70fc19cdd4c0bca2dfafded8334
diff --git a/sci-visualization/grace/files/grace-5.1.25-honor-noask.patch b/sci-visualization/grace/files/grace-5.1.25-honor-noask.patch
new file mode 100644
index 000000000000..24285e478f04
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.25-honor-noask.patch
@@ -0,0 +1,13 @@
+--- a/src/files.c~	2008-04-26 20:25:57.000000000 +0200
++++ b/src/files.c	2023-09-26 11:39:24.232306135 +0200
+@@ -1098,10 +1098,6 @@
+     int noask_save = noask;
+     
+     old_fn = get_docname();
+-    if (compare_strings(old_fn, fn)) {
+-        /* If saving under the same name, don't warn about overwriting */
+-        noask = TRUE;
+-    }
+     
+     if ((cp = grace_openw(fn)) == NULL) {
+         noask = noask_save;
diff --git a/sci-visualization/grace/files/grace-c99.patch b/sci-visualization/grace/files/grace-c99.patch
new file mode 100644
index 000000000000..fb87e39848a9
--- /dev/null
+++ b/sci-visualization/grace/files/grace-c99.patch
@@ -0,0 +1,12 @@
+diff -ur grace-5.1.25.orig/src/utils.c grace-5.1.25/src/utils.c
+--- grace-5.1.25.orig/src/utils.c	2022-12-22 10:40:39.391625263 +0100
++++ grace-5.1.25/src/utils.c	2022-12-22 10:41:24.732188992 +0100
+@@ -1391,7 +1391,7 @@
+     update_app_title();
+ }
+ 
+-void lock_dirtystate(flag)
++void lock_dirtystate(int flag)
+ {
+     dirtystate_lock = flag;
+ }
diff --git a/sci-visualization/grace/grace-5.1.25_p13-r2.ebuild b/sci-visualization/grace/grace-5.1.25_p13-r2.ebuild
new file mode 100644
index 000000000000..7a5e42ca6de2
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.25_p13-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FORTRAN_NEEDED=fortran
+
+inherit desktop fortran-2 toolchain-funcs xdg
+
+DESCRIPTION="Motif based XY-plotting tool"
+HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/"
+SRC_URI="
+	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fftw fortran jpeg netcdf png"
+
+DEPEND="
+	media-libs/t1lib
+	media-libs/tiff:=
+	sys-libs/zlib
+	>=x11-libs/motif-2.3:0
+	x11-libs/xbae
+	fftw? ( sci-libs/fftw:3.0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	netcdf? ( sci-libs/netcdf:= )
+	png? ( media-libs/libpng:0= )"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+S="${WORKDIR}/${P/_p*}"
+
+PATCHES=(
+	# Fix for missing defines when fortran is disabled
+	"${FILESDIR}"/${PN}-5.1.21-fortran.patch
+	# Fix a leak (from freebsd)
+	"${FILESDIR}"/${PN}-5.1.22-dlmodule.patch
+	# Honor -noask option and avoid accidentally overwritting files
+	"${FILESDIR}"/${PN}-5.1.25-honor-noask.patch
+	# Fix C99 compat (from Fedora)
+	"${FILESDIR}"/${PN}-c99.patch
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Debian patches
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+
+	# don't strip if not asked for
+	sed -i \
+		-e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \
+		{auxiliary,grconvert,src}/Makefile || die
+
+	sed -i \
+		-e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
+		-e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \
+		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
+		-e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \
+		Makefile */Makefile || die "sed failed"
+
+	sed -i \
+		-e 's:bin/grconvert:grconvert:' \
+		-e 's:auxiliary/fdf2fit:fdf2fit:' \
+		gracerc || die
+}
+
+src_configure() {
+	tc-export CC AR
+
+	# the configure script just produces a basic Make.conf
+	# and a config.h
+	econf \
+		--disable-pdfdrv \
+		--disable-xmhtml \
+		--without-bundled-xbae \
+		--without-bundled-t1lib \
+		--enable-grace-home="${EPREFIX}"/usr/share/${PN} \
+		--with-helpviewer="xdg-open %s" \
+		--with-editor="xdg-open %s" \
+		--with-printcmd="lpr" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_with fftw) \
+		$(use_enable fortran f77-wrapper) \
+		$(use_enable netcdf) \
+		$(use_enable jpeg jpegdrv) \
+		$(use_enable png pngdrv) \
+		$(use_with fortran f77 $(tc-getFC))
+}
+
+src_install() {
+	default
+
+	dosym ../../${PN}/examples /usr/share/doc/${PF}/examples
+	dosym ../../${PN}/doc /usr/share/doc/${PF}/html
+
+	doman "${ED}"/usr/share/doc/${PF}/html/*.1
+	rm -f "${ED}"/usr/share/doc/${PF}/html/*.1 || die
+
+	domenu "${FILESDIR}"/${PN}.desktop
+	for size in 16 22 24 32; do
+		newicon -s "${size}" "${WORKDIR}"/debian/icons/grace"${size}".png "${PN}.png"
+	done
+	doicon -s 48 "${WORKDIR}"/debian/icons/grace.png
+	doicon -s scalable "${WORKDIR}"/debian/grace.svg
+}