From bd8ca999980e9c0c9ae40a11789c858bb58769e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Jul 2022 13:42:19 +0100 Subject: gentoo auto-resync : 15:07:2022 - 13:42:19 --- sci-visualization/Manifest.gz | Bin 5696 -> 5697 bytes sci-visualization/xd3d/Manifest | 4 +- .../xd3d/files/xd3d-8.3.1-gentoo.diff | 86 --------------------- .../xd3d/files/xd3d-8.3.1-r1-gentoo.patch | 86 +++++++++++++++++++++ sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild | 61 --------------- sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild | 60 ++++++++++++++ 6 files changed, 148 insertions(+), 149 deletions(-) delete mode 100644 sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff create mode 100644 sci-visualization/xd3d/files/xd3d-8.3.1-r1-gentoo.patch delete mode 100644 sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild create mode 100644 sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild (limited to 'sci-visualization') diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz index 531a096f3c0c..9a9eff076890 100644 Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ diff --git a/sci-visualization/xd3d/Manifest b/sci-visualization/xd3d/Manifest index 4c2badcd25df..aad05db25e78 100644 --- a/sci-visualization/xd3d/Manifest +++ b/sci-visualization/xd3d/Manifest @@ -1,7 +1,7 @@ AUX xd3d-8.3.1-cflags.patch 1950 BLAKE2B 8b4d45d990b8ea37bb3ab4959505c3a19ebe07898a3f0385a0890f16bdad1a96bd1df92a6547fba0a9d4257baaadd30fd9f13795f8bebc93cd8276e1629125c2 SHA512 d89639bca626f59f5b5281b64082ee268f2a576b222d0a2a52fa73de993b82c4700d3f2e60b540c4f2c99b8b4e4fcde53e1db05a416cf1229f5a95d336a2a517 -AUX xd3d-8.3.1-gentoo.diff 1768 BLAKE2B a223a496ef534650094ff368e4d327b4a896a1c051d2ffb0aa7127b57c7ed116aa5ff19c9a9965f3d07f7e2ab80c8b192dd4e989652da36273fd8b9fca6fa5cd SHA512 25af94a757f122c2ca98b1814701110ae6a9c3d387e8a6096ba54cc86bbbf8dbfe445c83feb157b071fc90230020c3b4fcd8313a3c915d5bbb314b67ab26be6f AUX xd3d-8.3.1-parallel.patch 2194 BLAKE2B b4706b43ab85cd312a2ec6399eac155ac23a53f0f7863117df14101ab59cc6001a0e218ffbc0b1fc3a36f5701ddfae6515e1e5266c2d8ba5609fce30de8bc7ab SHA512 d7516dd4fad56d35a0a24c5efb08e67d7c68642b72b6a48355a7c2b595f00e4b0b398c8759552eabf64a1d69072c5062f657b463dc4a2c788cae08d5813e790e +AUX xd3d-8.3.1-r1-gentoo.patch 1780 BLAKE2B e6a3756aed9fa69fe901c84f08028b3195fd8e6f4070f0bc880aff20fa9f6d95faac99573474ced4c2b3004976ece879cbba1926f77c88ab447013ccee03d276 SHA512 30296610087736f9b09e466c4b4e884486f7cbcbdbf4a625cde5ef30e84eb6aec27371065b13ac0b03e522d22326f31006fcb71ec0d5090d935632215fe75116 AUX xd3d-8.3.1-rotated.patch 241 BLAKE2B dbf15070238a3cd35c068ca2bc46a59ecc1cb3b60183a698992f72ad3b45dc2e044395238674a5caf249d9d9fe6755a743b7640f65e3bfe4fad753be86fcc2e7 SHA512 e5a1f0bc718543e577b1a4faea290f1dbb9e01f7341b1b81f8e90646156babdcd3a600fac9f195a29f97ad3052d432f2ea65d527a33f3e1685e914dc913630ec DIST xd3d-8.3.1.tar.gz 2188216 BLAKE2B 80db2b65e54dd0f0e7b0e1e6eec86d9d3756c60e0983e14b65d145876e3c6c5c06f050b2082d072a23fa7a4d250a2abc5f1c7564275ee14303719bb4f6cc8f36 SHA512 a02e1b53b1d393c8184866b0693394f596bb3c1eb5f49d00a41dd7bb972f08ba8d1621e7a1f197b015551d9483c9c76c07dac5e199961de775b9ff63c898c89e -EBUILD xd3d-8.3.1-r1.ebuild 1236 BLAKE2B a2ca466cb3bebf7af6ae45eb03729077ddb9140cb9516d5d1ee436772ff2a594b44932871b0379590c49e26b81a0d7efb98134804b2ace36db97b5b13bf3cbdd SHA512 c19d1efe6e211bd8cc1fece0ea841bca7c9dbe17255c266e2faa2534f3f0222a90211d775b213b9bab51ab51cb16a1edfbbce62934993efbfeebef7e35ebebdd +EBUILD xd3d-8.3.1-r2.ebuild 1284 BLAKE2B c7505e6602b5b7f5bf224d571e0e8672ba4c21e7b41997af07d383e037edfab1a58296232ddeafe67bbe29be187c358e8f93ff3d9bb44b287bbd58f61308a75d SHA512 b2cef08bf67ecf17a40edb1812b94fe1fe0e0b6dfdbe7625c8a691f98e059079a8e365eeb7b6fafa8407009c7635c8a9dde85c0d3196f6c00d52a93798928950 MISC metadata.xml 720 BLAKE2B 0b501949897a5d0584797160d29fb1541a4fdd74bfffeb10430f95aa67eb5c1293fd69f00ba6043a58ca61523f8ea479452360be64c5a97f9ec86d53f5c91874 SHA512 5fa5e5e24e88117eb15864c4796279c608951a547f013b1740de7b89f4e9ce480f2484ada253d39bde41e7266ba8d521a630e18bfcb9632e7df92b4fbb8aa759 diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff b/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff deleted file mode 100644 index 271fd0b8bd58..000000000000 --- a/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff +++ /dev/null @@ -1,86 +0,0 @@ -diff -Naur RULES.gentoo RULES.gentoo ---- /dev/null 1969-12-31 19:00:00.000000000 -0500 -+++ ./RULES.gentoo 2008-01-21 06:41:41.000000000 -0500 -@@ -0,0 +1,82 @@ -+#-------------------------------------------------------- -+# Configuration file for the Makefiles of xd3d | -+# François Jouve 2005 (Francois.Jouve@Polytechnique.fr) | -+#-------------------------------------------------------- -+ -+# -+# Modifiable parameters -+# -+ -+# -+# Root directory of the distribution -+# -+#XD3D_DIR = $(HOME)/xd3d-8.1.0 -+XD3D_DIR = Please_Configure -+ -+# -+# Install directory -+# -+#INSTALL_DIR = /usr/local/bin -+INSTALL_DIR = ##D##/usr/bin -+ -+# -+# Location of the X11 lib (libX11.a) -+# -+#LIBX11 = /usr/X11R6/lib -+LIBX11 = /usr/##lib##/ -+ -+# -+# Language parameter -+# -+#LANGUAGE = FRANCAIS -+#LANGUAGE = ENGLISH -+LANGUAGE = ENGLISH -+ -+# -+# Max memory for xd3d (MBytes) -+# -+#MEMORY_XD3D = 64 -+MEMORY_XD3D = 64 -+ -+# -+# Fortran compiler -+# -+COMPILF = $(FC) -+ -+# -+# C compiler -+# -+COMPILC = $(CC) -+RANLIB = ranlib -+AR = ar r -+STRIP = echo $@ -+ -+# -+# Options for the Fortran compiler -+# -+OPTF = $(FFLAGS) -+# -+# Options for the C compiler -+# -+OPTC = $(CFLAGS) -+ -+#----------------------------------------------- -+# You should not need to change anything below ! -+#----------------------------------------------- -+ -+SRCDIR = $(XD3D_DIR)/src -+BINDIR = $(XD3D_DIR)/bin -+LIBDIR = $(XD3D_DIR)/lib -+SUFF = -+INCF = -I$(XD3D_DIR)/src/include -+INCC = -I$(LIBX11)/../include -+ -+LINK = $(COMPILF) $(LDFLAGS) -o -+LINKOPT = -lc -lm -+LINKOPTX = -L$(LIBX11) -lX11 -lXpm -lc -lm -+LIBRAIRIE = $(LIBDIR)/question_lib.a -+MYXLIB = $(LIBDIR)/my_Xlib.a -+INTERP = $(LIBDIR)/interp.a -+ -+.f.o: ; $(COMPILF) $(INCF) $(OPTF) -c $*.f -+.c.o: ; $(COMPILC) $(INCC) $(OPTC) -D$(LANGUAGE) -c $*.c diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-r1-gentoo.patch b/sci-visualization/xd3d/files/xd3d-8.3.1-r1-gentoo.patch new file mode 100644 index 000000000000..bca0beca64e6 --- /dev/null +++ b/sci-visualization/xd3d/files/xd3d-8.3.1-r1-gentoo.patch @@ -0,0 +1,86 @@ +diff -Naur RULES.gentoo RULES.gentoo +--- /dev/null 1969-12-31 19:00:00.000000000 -0500 ++++ ./RULES.gentoo 2008-01-21 06:41:41.000000000 -0500 +@@ -0,0 +1,82 @@ ++#-------------------------------------------------------- ++# Configuration file for the Makefiles of xd3d | ++# François Jouve 2005 (Francois.Jouve@Polytechnique.fr) | ++#-------------------------------------------------------- ++ ++# ++# Modifiable parameters ++# ++ ++# ++# Root directory of the distribution ++# ++#XD3D_DIR = $(HOME)/xd3d-8.1.0 ++XD3D_DIR = Please_Configure ++ ++# ++# Install directory ++# ++#INSTALL_DIR = /usr/local/bin ++INSTALL_DIR = ##D##/usr/bin ++ ++# ++# Location of the X11 lib (libX11.a) ++# ++#LIBX11 = /usr/X11R6/lib ++LIBX11 = /usr/##lib##/ ++ ++# ++# Language parameter ++# ++#LANGUAGE = FRANCAIS ++#LANGUAGE = ENGLISH ++LANGUAGE = ENGLISH ++ ++# ++# Max memory for xd3d (MBytes) ++# ++#MEMORY_XD3D = 64 ++MEMORY_XD3D = 64 ++ ++# ++# Fortran compiler ++# ++COMPILF = $(FC) ++ ++# ++# C compiler ++# ++COMPILC = $(CC) ++RANLIB = $(MY_RANLIB) ++AR = $(MY_AR) r ++STRIP = echo $@ ++ ++# ++# Options for the Fortran compiler ++# ++OPTF = $(FFLAGS) ++# ++# Options for the C compiler ++# ++OPTC = $(CFLAGS) ++ ++#----------------------------------------------- ++# You should not need to change anything below ! ++#----------------------------------------------- ++ ++SRCDIR = $(XD3D_DIR)/src ++BINDIR = $(XD3D_DIR)/bin ++LIBDIR = $(XD3D_DIR)/lib ++SUFF = ++INCF = -I$(XD3D_DIR)/src/include ++INCC = -I$(LIBX11)/../include ++ ++LINK = $(COMPILF) $(LDFLAGS) -o ++LINKOPT = -lc -lm ++LINKOPTX = -L$(LIBX11) -lX11 -lXpm -lc -lm ++LIBRAIRIE = $(LIBDIR)/question_lib.a ++MYXLIB = $(LIBDIR)/my_Xlib.a ++INTERP = $(LIBDIR)/interp.a ++ ++.f.o: ; $(COMPILF) $(INCF) $(OPTF) -c $*.f ++.c.o: ; $(COMPILC) $(INCC) $(OPTC) -D$(LANGUAGE) -c $*.c diff --git a/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild deleted file mode 100644 index d46bcf3fdc4d..000000000000 --- a/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit fortran-2 flag-o-matic toolchain-funcs - -DESCRIPTION="Scientific visualization tool" -HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples" - -RDEPEND=" - x11-libs/libXpm" -DEPEND="${RDEPEND} - app-shells/tcsh" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.diff - "${FILESDIR}"/${P}-parallel.patch - "${FILESDIR}"/${P}-rotated.patch - "${FILESDIR}"/${P}-cflags.patch -) - -src_prepare() { - default - sed \ - -e 's:"zutil.h"::g' \ - -i src/qlib/timestuff.c || die - sed \ - -e "s:##D##:${ED%/}:" \ - -e "s:##lib##:$(get_libdir):" \ - -i RULES.gentoo \ - || die "failed to set up RULES.gentoo" -} - -src_configure() { - tc-export CC - # GCC 10 workaround - # bug #722426 - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - ./configure -arch=gentoo || die "configure failed." -} - -src_install() { - dodir /usr/bin - default - dodoc FORMATS - - use doc && dodoc -r Manuals - if use examples; then - mv {E,e}xamples || die - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild b/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild new file mode 100644 index 000000000000..d6fdeab91c00 --- /dev/null +++ b/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo fortran-2 flag-o-matic toolchain-funcs + +DESCRIPTION="Scientific visualization tool" +HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples" + +RDEPEND="x11-libs/libXpm" +DEPEND="${RDEPEND}" +BDEPEND="app-shells/tcsh" + +PATCHES=( + "${FILESDIR}"/${P}-r1-gentoo.patch + "${FILESDIR}"/${P}-parallel.patch + "${FILESDIR}"/${P}-rotated.patch + "${FILESDIR}"/${P}-cflags.patch +) + +src_prepare() { + default + + sed -i -e 's:"zutil.h"::g' src/qlib/timestuff.c || die + sed -i -e "s:##lib##:$(get_libdir):" RULES.gentoo || die "failed to set up RULES.gentoo" +} + +src_configure() { + tc-export CC + + export MY_AR="$(tc-getAR)" + export MY_RANLIB="$(tc-getRANLIB)" + + # GCC 10 workaround + # bug #722426 + append-fflags $(test-flags-FC -fallow-argument-mismatch) + + edo ./configure -arch=gentoo +} + +src_install() { + dodir /usr/bin + emake INSTALL_DIR="${ED}/usr/bin" install + dodoc FORMATS + + use doc && dodoc -r Manuals + + if use examples; then + mv {E,e}xamples || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} -- cgit v1.2.3