commit: 60cc5cc4d8e954225b6c57c98741d7477217e23d Author: Austin English <wizardedit <AT> gentoo <DOT> org> AuthorDate: Fri Oct 28 17:29:17 2016 +0000 Commit: Austin English <wizardedit <AT> gentoo <DOT> org> CommitDate: Fri Oct 28 17:35:10 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60cc5cc4
games-rpg/zsxd: remove deprecated games eclass Also update to EAPI 6 Gentoo-Bug: https://bugs.gentoo.org/574082 Package-Manager: portage-2.3.2 .../{zsxd-1.9.0.ebuild => zsxd-1.9.0-r1.ebuild} | 21 +++++++++------------ games-rpg/zsxd/zsxd-1.9.0.ebuild | 5 ++--- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/games-rpg/zsxd/zsxd-1.9.0.ebuild b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild similarity index 68% copy from games-rpg/zsxd/zsxd-1.9.0.ebuild copy to games-rpg/zsxd/zsxd-1.9.0-r1.ebuild index a699d5f..044c939 100644 --- a/games-rpg/zsxd/zsxd-1.9.0.ebuild +++ b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit eutils gnome2-utils cmake-utils games +inherit eutils gnome2-utils cmake-utils DESCRIPTION="A free 2D Zelda fangame parody" HOMEPAGE="http://www.solarus-games.org/"; @@ -12,11 +12,11 @@ SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"; LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" RESTRICT="mirror bindist" -RDEPEND=">=games-engines/solarus-1.3.0 +RDEPEND=">=games-engines/solarus-1.3.1-r1 <games-engines/solarus-1.4.0" DEPEND="app-arch/zip" @@ -28,8 +28,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DSOLARUS_INSTALL_DATAROOTDIR="${GAMES_DATADIR}" - -DSOLARUS_INSTALL_BINDIR="${GAMES_BINDIR}" + -DSOLARUS_INSTALL_DATAROOTDIR="/usr/share" + -DSOLARUS_INSTALL_BINDIR="/usr/bin" ) cmake-utils_src_configure } @@ -44,19 +44,16 @@ src_install() { newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png # install proper wrapper script - rm -f "${ED%/}${GAMES_BINDIR}"/${PN} - games_make_wrapper ${PN} "solarus \"${GAMES_DATADIR}/solarus/${PN}\"" + rm -f "${ED%/}/usr/bin/${PN} + make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\" make_desktop_entry "${PN}" "Zelda: Mystery of Solarus XD" - prepgamesdirs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update } diff --git a/games-rpg/zsxd/zsxd-1.9.0.ebuild b/games-rpg/zsxd/zsxd-1.9.0.ebuild index a699d5f..916fd94 100644 --- a/games-rpg/zsxd/zsxd-1.9.0.ebuild +++ b/games-rpg/zsxd/zsxd-1.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,8 +16,7 @@ KEYWORDS="amd64 x86" IUSE="" RESTRICT="mirror bindist" -RDEPEND=">=games-engines/solarus-1.3.0 - <games-engines/solarus-1.4.0" +RDEPEND="=games-engines/solarus-1.3.1" DEPEND="app-arch/zip" DOCS=( ChangeLog readme.txt )
