[gentoo-commits] repo/gentoo:master commit in: games-arcade/aquaria/

[Sam James]

commit:     42add7c12cd19a7e92ba49a7c174cf248f0e02cd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 22:15:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 22:47:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42add7c1

games-arcade/aquaria: port to EAPI 7, games.eclass--

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ria-1.1.3-r1.ebuild => aquaria-1.1.3-r2.ebuild} | 29 ++++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild 
b/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
similarity index 69%
rename from games-arcade/aquaria/aquaria-1.1.3-r1.ebuild
rename to games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
index ff45a40ffdb..e1fb8b150c6 100644
--- a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild
+++ b/games-arcade/aquaria/aquaria-1.1.3-r2.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit unpacker eutils games
+EAPI=7
+
+inherit desktop unpacker wrapper
 
 DESCRIPTION="A 2D scroller set in a massive ocean world"
 HOMEPAGE="http://www.bit-blot.com/aquaria/";
 SRC_URI="aquaria-lnx-humble-bundle.mojo.run"
+S="${WORKDIR}"/data
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 RESTRICT="strip fetch bindist"
 
-DEPEND="app-arch/unzip"
 RDEPEND="
        >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
        >=media-libs/openal-1.15.1[abi_x86_32(-)]"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/data
-
-dir=${GAMES_PREFIX_OPT}/${PN}
+dir=opt/${PN}
 QA_PREBUILT="${dir#/}/aquaria"
 
 pkg_nofetch() {
@@ -36,19 +35,17 @@ src_unpack() {
 }
 
 src_install() {
-       insinto "${dir}"
-       exeinto "${dir}"
+       insinto ${dir}
+       exeinto ${dir}
 
        doins -r *.xml */
-       doexe "${PN}"
-       doicon "${PN}.png"
+       doexe ${PN}
+       doicon ${PN}.png
 
        dodoc README-linux.txt
        mv "${ED}/${dir}"/docs "${ED}/usr/share/doc/${PF}/html" || die
-       dosym /usr/share/doc/${PF}/html "${dir}"/docs
+       dosym  ../../../usr/share/doc/${PF}/html ${dir}/docs
 
-       games_make_wrapper "${PN}" "./${PN}" "${dir}"
+       make_wrapper "${PN}" "./${PN}" "${dir}"
        make_desktop_entry "${PN}" "Aquaria"
-
-       prepgamesdirs
 }