sci-visualization/xd3d: EAPI 8

Closes: https://bugs.gentoo.org/732030
Closes: https://bugs.gentoo.org/732036
Closes: https://bugs.gentoo.org/836113
Signed-off-by: Sam James <sam@gentoo.org>

sci-visualization/xd3d/files/xd3d-8.3.1-r1-gentoo.patch

@@ -51,8 +51,8 @@ diff -Naur RULES.gentoo RULES.gentoo
 +# C compiler
 +#
 +COMPILC = $(CC)
-+RANLIB  = ranlib
-+AR      = ar r
++RANLIB  = $(MY_RANLIB)
++AR      = $(MY_AR) r
 +STRIP   = echo $@
 +
 +#

sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit fortran-2 flag-o-matic toolchain-funcs
+inherit edo fortran-2 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Scientific visualization tool"
 HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/"
@@ -14,13 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
-RDEPEND="
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
+RDEPEND="x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+BDEPEND="app-shells/tcsh"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.diff
+	"${FILESDIR}"/${P}-r1-gentoo.patch
 	"${FILESDIR}"/${P}-parallel.patch
 	"${FILESDIR}"/${P}-rotated.patch
 	"${FILESDIR}"/${P}-cflags.patch
@@ -28,31 +27,31 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed \
-		-e 's:"zutil.h":<zlib.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"
+
+	sed -i -e 's:"zutil.h":<zlib.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)
 
-	./configure -arch=gentoo || die "configure failed."
+	edo ./configure -arch=gentoo
 }
 
 src_install() {
 	dodir /usr/bin
-	default
+	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