commit:     4d50c7b5b44287e36019071f118579b24620ecc1
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 12:52:17 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 12:52:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d50c7b5

sci-misc/cdfplayer: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...er-12.2.0.ebuild => cdfplayer-12.2.0-r1.ebuild} | 69 +++++++++++-----------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild 
b/sci-misc/cdfplayer/cdfplayer-12.2.0-r1.ebuild
similarity index 70%
rename from sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild
rename to sci-misc/cdfplayer/cdfplayer-12.2.0-r1.ebuild
index 21828e52bedd..39c3c27587c7 100644
--- a/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild
+++ b/sci-misc/cdfplayer/cdfplayer-12.2.0-r1.ebuild
@@ -1,30 +1,35 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit desktop eapi7-ver multilib
+inherit desktop
 
 DESCRIPTION="Wolfram Player for the interactive Computable Document Format 
(CDF)"
-SRC_URI="WolframPlayer_${PV}_LINUX.sh"
 HOMEPAGE="http://www.wolfram.com/cdf-player/";
+SRC_URI="WolframPlayer_${PV}_LINUX.sh"
+S="${WORKDIR}"
 
 LICENSE="WolframCDFPlayer"
 KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
-IUSE=""
-
 RESTRICT="strip mirror bindist fetch"
 
-DEPEND=""
-
 # this list comes from lsof output
 # probably there are still some libraries missing
 RDEPEND="
+       dev-libs/expat
+       dev-libs/icu
+       dev-libs/libxml2
+       media-libs/alsa-lib
+       media-libs/fontconfig
+       media-libs/freetype
+       sys-libs/ncurses-compat:5
        x11-libs/libICE
        x11-libs/libSM
        x11-libs/libX11
        x11-libs/libXau
+       x11-libs/libxcb
        x11-libs/libXcursor
        x11-libs/libXdmcp
        x11-libs/libXext
@@ -34,14 +39,6 @@ RDEPEND="
        x11-libs/libXrandr
        x11-libs/libXrender
        x11-libs/libXt
-       media-libs/alsa-lib
-       dev-libs/expat
-       media-libs/fontconfig
-       dev-libs/icu
-       x11-libs/libxcb
-       dev-libs/libxml2
-       sys-libs/ncurses-compat:5
-       media-libs/freetype
 "
 
 # we need this a few times
@@ -51,42 +48,42 @@ MPV=$(ver_cut 1-2)
 # we might as well list all files in all QA variables...
 QA_PREBUILT="opt/*"
 
-S=${WORKDIR}
+pkg_nofetch() {
+       einfo "Sadly Wolfram provides no permanent link to the player files."
+       einfo "Please download the Wolfram CFD Player installation file 
${SRC_URI} from"
+       einfo "${HOMEPAGE} and place it into your DISTDIR directory."
+}
 
 src_unpack() {
-       /bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto 
"-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die
+       ${CONFIG_SHELL:-${BASH}} "${DISTDIR}/${A}" --nox11 --confirm --keep -- 
-auto "-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin"
 }
 
 src_install() {
-       local ARCH
-       if use amd64; then ARCH='-x86-64'; else ARCH=''; fi
+       local ARCH=$(usev amd64 '-x86-64')
 
        # move all over
-       mv "${S}"/opt "${D}"/opt || die
+       (
+               insinto /
+               doins -r opt
+       )
 
        # the autogenerated symlinks point into sandbox, redo
-       rm "${D}"/opt/bin/* || die
+       rm "${ED}"/opt/bin/* || die
        dosym ../Wolfram/${MPN}/${MPV}/Executables/wolframplayer 
opt/bin/wolframplayer
        dosym ../Wolfram/${MPN}/${MPV}/Executables/WolframPlayer 
opt/bin/WolframPlayer
 
        # fix some embedded paths and install desktop files
        local filename
-       for filename in $(find "${D}" -name "wolfram-cdf12.desktop") ; do
-               echo Fixing "${filename}"
-               sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
-               echo 
"Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
+       while IFS="" read -d $'\0' -r filename ; do
+               einfo "Fixing ${filename}"
+               sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}" || die
+               echo 
"Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" 
|| die
                domenu "${filename}"
-       done
+       done < <(find "${ED}" -type f -name "wolfram-cdf12.desktop" -print0)
 
        # install a wrapper
-       echo '#!/bin/sh' >> ${PN}
-       echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/lib/libz.so.1 
/opt/Wolfram/${MPN}/${MPV}/Executables/wolframplayer \$*" \
-                >> ${PN}
-       dobin ${PN}
-}
-
-pkg_nofetch() {
-       einfo "Sadly Wolfram provides no permanent link to the player files."
-       einfo "Please download the Wolfram CFD Player installation file 
${SRC_URI} from"
-       einfo "${HOMEPAGE} and place it into your DISTDIR directory."
+       newbin - ${PN} <<- _EOF_
+               #!/usr/bin/env sh
+               
LD_PRELOAD=${EPREFIX}/usr/$(get_libdir)/libfreetype.so.6:${EPREFIX}/lib/libz.so.1
 ${EPREFIX}/opt/Wolfram/${MPN}/${MPV}/Executables/wolframplayer \$*
+       _EOF_
 }

Reply via email to