games-rpg/dear-esther: hopefully fix install, tidy a bit

Do not own this game but is known broken because fperms
will not take arguments without a leading /

Also stop calling non-existing gnome2_icon_* in EAPI-7

Fixes: 2b96c435dc01fed949e8dedf3beb0fe82b32c9f3
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

1 files changed, 18 insertions, 34 deletions

diff --git a/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild b/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
index b2a07780a454..34dd1adabcdb 100644
--- a/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
+++ b/games-rpg/dear-esther/dear-esther-20130608-r1.ebuild
@@ -3,41 +3,37 @@
 
 EAPI=7
 
-inherit desktop gnome2-utils unpacker wrapper
+inherit desktop unpacker wrapper xdg
+
+MY_TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
 
-TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
 DESCRIPTION="Ghost story, told using first-person gaming technologies"
 HOMEPAGE="http://dear-esther.com/"
-SRC_URI="dearesther-linux-${TIMESTAMP}-bin"
-S="${WORKDIR}"/data
+SRC_URI="dearesther-linux-${MY_TIMESTAMP}-bin"
+S="${WORKDIR}/data"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch"
 
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=opt/${PN}
 QA_PREBUILT="
-	${MYGAMEDIR#/}/dearesther_linux
-	${MYGAMEDIR#/}/bin/*.so*
-"
+	opt/${PN}/dearesther_linux
+	opt/${PN}/bin/*.so*"
 
 # TODO: unbundle libSDL2
 RDEPEND="
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
+	media-libs/freetype[abi_x86_32(-)]
+	media-libs/libsdl[abi_x86_32(-)]
+	media-libs/openal[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
-"
+	x11-libs/libX11[abi_x86_32(-)]"
 BDEPEND="app-arch/unzip"
 
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
 	einfo "and move it to your DISTDIR directory."
-	einfo
 }
 
 src_unpack() {
@@ -45,26 +41,14 @@ src_unpack() {
 }
 
 src_install() {
-	insinto ${MYGAMEDIR}
+	insinto /opt/${PN}
 	doins -r bin dearesther platform dearesther_linux
 
-	doicon -s 256 dearesther.png
-	make_desktop_entry "${PN}" "Dear Esther" dearesther
-	make_wrapper ${PN} "./dearesther_linux -game dearesther" "${MYGAMEDIR}" "${MYGAMEDIR}/bin"
-
-	dodoc README-linux.txt
-
-	fperms +x ${MYGAMEDIR}/dearesther_linux
-}
+	fperms +x /opt/${PN}/dearesther_linux
+	make_wrapper ${PN} "./dearesther_linux -game dearesther" /opt/${PN}{,/bin}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	newicon dearesther.png ${PN}.png
+	make_desktop_entry ${PN} "Dear Esther"
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	dodoc README-linux.txt
 }