commit:     a9f83014e6e771b681153ca870fb0d306da51e11
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Thu Apr 15 16:36:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 04:46:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f83014

games-arcade/xboing: EAPI-7 bump, eutils drop, tidy, prefix support

Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-arcade/xboing/xboing-2.4-r3.ebuild | 62 ++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/games-arcade/xboing/xboing-2.4-r3.ebuild 
b/games-arcade/xboing/xboing-2.4-r3.ebuild
index 48583653f80..354b48020f5 100644
--- a/games-arcade/xboing/xboing-2.4-r3.ebuild
+++ b/games-arcade/xboing/xboing-2.4-r3.ebuild
@@ -1,62 +1,70 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Blockout type game where you bounce a ball trying to destroy 
blocks"
 HOMEPAGE="http://www.techrescue.org/xboing/";
 SRC_URI="http://www.techrescue.org/xboing/${PN}${PV}.tar.gz
-       mirror://gentoo/xboing-${PV}-debian.patch.bz2"
+       mirror://gentoo/${P}-debian.patch.bz2"
+S="${WORKDIR}/${PN}"
 
 LICENSE="xboing"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
 
-RDEPEND="acct-group/gamestat
+RDEPEND="
+       acct-group/gamestat
        x11-libs/libXpm"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
        app-text/rman
        x11-misc/gccmakedep
-       >=x11-misc/imake-1.0.8-r1
-"
+       >=x11-misc/imake-1.0.8-r1"
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+       "${WORKDIR}"/${P}-debian.patch
+       "${FILESDIR}"/${P}-buffer.patch
+       "${FILESDIR}"/${P}-sleep.patch
+)
 
 src_prepare() {
-       epatch "${WORKDIR}"/xboing-${PV}-debian.patch
-       epatch "${FILESDIR}"/xboing-${PV}-buffer.patch
-       epatch "${FILESDIR}"/xboing-${PV}-sleep.patch
+       default
        sed -i '/^#include/s:xpm\.h:X11/xpm.h:' *.c || die
-       eapply_user
+       sed -i "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die
 }
 
 src_configure() {
-       sed -i -e "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die
-       append-cflags -fcommon
+       append-cflags -fcommon #707214
 
        CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
                IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
-       emake \
-               CC="$(tc-getCC)" \
-               CDEBUGFLAGS="${CFLAGS}" \
-               LOCAL_LDFLAGS="${LDFLAGS}" \
-               XBOING_DIR="/usr/share/${PN}"
+       local myemakeargs=(
+               CC="$(tc-getCC)"
+               CDEBUGFLAGS="${CFLAGS}"
+               LOCAL_LDFLAGS="${LDFLAGS}"
+               HIGH_SCORE_DIR="${EPREFIX}/var/games"
+               XBOING_DIR="${EPREFIX}/usr/share/${PN}"
+       )
+       emake "${myemakeargs[@]}"
 }
 
 src_install() {
-       emake \
-               CC="$(tc-getCC)" \
-               PREFIX="${D}" \
-               BINDIR="${D}/usr/bin" \
-               LOCAL_LDFLAGS="${LDFLAGS}" \
-               XBOING_DIR="/usr/share/${PN}" \
-               install
+       local myemakeargs=(
+               CC="$(tc-getCC)"
+               LOCAL_LDFLAGS="${LDFLAGS}"
+               PREFIX="${D}"
+               BINDIR="${ED}/usr/bin"
+               HIGH_SCORE_DIR="${EPREFIX}/var/games"
+               XBOING_DIR="${EPREFIX}/usr/share/${PN}"
+       )
+       emake "${myemakeargs[@]}" install
+
        newman xboing.man xboing.6
        dodoc README docs/*.doc
 

Reply via email to