commit:     9f9a10c48354fc65145034e16da6d02138222966
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 14:27:51 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 15:49:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9a10c4

games-misc/little-inferno: fix install and runtime, tidy

Installation been broken since games.eclass removal due to
fperms refusing ${MYGAMEDIR} without a leading slash.

Furthermore, could not get it to run without bundled libvorbis.
Rather than keep USE=bundled-libs, use the configuration which
works and still allows for system openal with more audio backends.

No revbump given -r1 never installed.

Fixes: 872469e2855295b758cb0bf7951f0d0e592d4344
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../little-inferno-20130509-r1.ebuild              | 74 +++++++---------------
 games-misc/little-inferno/metadata.xml             |  3 -
 2 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/games-misc/little-inferno/little-inferno-20130509-r1.ebuild 
b/games-misc/little-inferno/little-inferno-20130509-r1.ebuild
index 91d4eb7d18e..55ab6204574 100644
--- a/games-misc/little-inferno/little-inferno-20130509-r1.ebuild
+++ b/games-misc/little-inferno/little-inferno-20130509-r1.ebuild
@@ -3,75 +3,49 @@
 
 EAPI=7
 
-inherit desktop gnome2-utils unpacker wrapper
+inherit desktop unpacker wrapper
 
 DESCRIPTION="Throw your toys into your fire, and play with them as they burn"
-HOMEPAGE="http://tomorrowcorporation.com/";
+HOMEPAGE="https://tomorrowcorporation.com/littleinferno";
 SRC_URI="LittleInferno-${PV}.sh"
+S="${WORKDIR}"
 
 LICENSE="Gameplay-Group-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
+RESTRICT="bindist fetch"
 
-RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
-
-MYGAMEDIR=opt/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/LittleInferno.bin.x86
-       ${MYGAMEDIR#/}/lib/*"
+QA_PREBUILT="
+       opt/${PN}/LittleInferno.bin.x86
+       opt/${PN}/lib/libogg.so.0
+       opt/${PN}/lib/libvorbis.so.0"
 
 RDEPEND="
-       >=net-misc/curl-7.37.0-r1[abi_x86_32(-)]
-       x11-libs/libX11[abi_x86_32(-)]
+       media-libs/openal[abi_x86_32(-)]
+       net-misc/curl[abi_x86_32(-)]
        virtual/opengl[abi_x86_32(-)]
-       !bundled-libs? (
-               >=media-libs/libogg-1.3.1[abi_x86_32(-)]
-               >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-               >=media-libs/openal-1.15.1-r1[abi_x86_32(-)]
-       )
-"
-BDEPEND="app-arch/xz-utils"
+       x11-libs/libX11[abi_x86_32(-)]"
 
 src_unpack() {
        unpack_makeself ${A}
-
-       mkdir ${P} || die
-       cd ${P} || die
-
-       local i
-       for i in instarchive_{,linux_}all ; do
-               mv ../"${i}" ../"${i}".tar.xz || die
-               unpack ./../"${i}".tar.xz
-       done
-}
-
-src_prepare() {
-       default
-
-       if ! use bundled-libs ; then
-               rm -rv lib || die
-       fi
+       mv instarchive_all{,.tar.xz} || die
+       mv instarchive_linux_all{,.tar.xz} || die
+       unpack ./instarchive_{,linux_}all.tar.xz
 }
 
 src_install() {
-       insinto ${MYGAMEDIR}
-       doins -r *
+       exeinto /opt/${PN}
+       doexe LittleInferno.bin.x86
 
-       doicon -s 128 LittleInferno.png
-       make_desktop_entry ${PN} "Little Inferno" LittleInferno
-       make_wrapper ${PN} "./LittleInferno.bin.x86" "${MYGAMEDIR}" 
"${MYGAMEDIR}/lib"
+       insinto /opt/${PN}
+       doins -r {debug,embed,frontend,resource}.pak shaders
 
-       fperms +x ${MYGAMEDIR}/LittleInferno.bin.x86
-}
+       # game currently segfaults without bundled libvorbis
+       exeinto /opt/${PN}/lib
+       doexe lib/lib{ogg,vorbis}.so.0
 
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       gnome2_icon_cache_update
-}
+       make_wrapper ${PN} ./LittleInferno.bin.x86 /opt/${PN}
 
-pkg_postrm() {
-       gnome2_icon_cache_update
+       newicon LittleInferno.png ${PN}.png
+       make_desktop_entry ${PN} "Little Inferno"
 }

diff --git a/games-misc/little-inferno/metadata.xml 
b/games-misc/little-inferno/metadata.xml
index befc8c80e0b..26079e608be 100644
--- a/games-misc/little-inferno/metadata.xml
+++ b/games-misc/little-inferno/metadata.xml
@@ -5,7 +5,4 @@
                <email>[email protected]</email>
                <name>Gentoo Games Project</name>
        </maintainer>
-       <use>
-               <flag name="bundled-libs">Use bundled libraries.</flag>
-       </use>
 </pkgmetadata>

Reply via email to