diff options
| -rw-r--r-- | games-rpg/zsdx/ChangeLog | 6 | ||||
| -rw-r--r-- | games-rpg/zsdx/files/zsdx-1.7.1-paths.patch | 40 | ||||
| -rw-r--r-- | games-rpg/zsdx/zsdx-1.7.1-r1.ebuild | 67 |
3 files changed, 5 insertions, 108 deletions
diff --git a/games-rpg/zsdx/ChangeLog b/games-rpg/zsdx/ChangeLog index 13e15e56715d..b7d7bb2a5faa 100644 --- a/games-rpg/zsdx/ChangeLog +++ b/games-rpg/zsdx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-rpg/zsdx # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/zsdx/ChangeLog,v 1.11 2015/05/21 10:46:40 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/zsdx/ChangeLog,v 1.12 2015/05/28 19:12:52 mr_bones_ Exp $ + + 28 May 2015; Michael Sterrett <mr_bones_@gentoo.org> + -files/zsdx-1.7.1-paths.patch, -zsdx-1.7.1-r1.ebuild: + old 21 May 2015; Agostino Sarubbo <ago@gentoo.org> zsdx-1.9.0.ebuild: Stable for amd64, wrt bug #547362 diff --git a/games-rpg/zsdx/files/zsdx-1.7.1-paths.patch b/games-rpg/zsdx/files/zsdx-1.7.1-paths.patch deleted file mode 100644 index 2b3a0554d89c..000000000000 --- a/games-rpg/zsdx/files/zsdx-1.7.1-paths.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Wed Jan 29 02:35:52 UTC 2014 -Subject: make paths modifiable - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,10 @@ - - set(quest_name "zsdx") - -+set(DATAROOTDIR "share" CACHE PATH "dataroot dir") -+set(DATADIR "${DATAROOTDIR}/solarus" CACHE PATH "data dir") -+set(BINDIR "bin" CACHE PATH "bin dir") -+ - # data files list - file(GLOB_RECURSE data_files - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/data -@@ -47,7 +51,7 @@ - add_custom_command( - OUTPUT ${quest_name} - COMMAND echo '\#!/bin/sh' > ${quest_name} -- COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name} $*' >> ${quest_name} -+ COMMAND echo 'solarus ${DATADIR}/${quest_name} $*' >> ${quest_name} - ) - add_custom_target(${quest_name}_command - ALL -@@ -56,11 +60,11 @@ - - # install the data archive - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/data.solarus -- DESTINATION share/solarus/${quest_name} -+ DESTINATION ${DATADIR}/${quest_name} - ) - - # install the script - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${quest_name} -- DESTINATION bin -+ DESTINATION ${BINDIR} - ) - diff --git a/games-rpg/zsdx/zsdx-1.7.1-r1.ebuild b/games-rpg/zsdx/zsdx-1.7.1-r1.ebuild deleted file mode 100644 index cf8aa2401d15..000000000000 --- a/games-rpg/zsdx/zsdx-1.7.1-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/zsdx/zsdx-1.7.1-r1.ebuild,v 1.2 2014/12/27 19:33:40 ago Exp $ - -EAPI=5 - -inherit cmake-utils gnome2-utils games - -DESCRIPTION="A free 2D Zelda fangame" -HOMEPAGE="http://www.solarus-games.org/" -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" -IUSE="" -RESTRICT="mirror" - -RDEPEND=">=games-engines/solarus-1.1.0 - <games-engines/solarus-1.2.0" -DEPEND="app-arch/zip" - -DOCS=( ChangeLog readme.txt ) -PATCHES=( "${FILESDIR}"/${P}-paths.patch ) - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DDATADIR="${GAMES_DATADIR}/solarus" - -DBINDIR="${GAMES_BINDIR}" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png - 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}\"" - - make_desktop_entry "${PN}" "Zelda: Mystery of Solarus DX" - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} |