diff --git a/games-arcade/supertux/ChangeLog b/games-arcade/supertux/ChangeLog --- a/games-arcade/supertux/ChangeLog +++ b/games-arcade/supertux/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/games-arcade/supertux/ChangeLog,v 1.33 2009/02/23 01:02:56 mr_bones_ Exp $ + 28 Nov 2009; Nathan Phillip Brink (ohnobinki) + supertux-9999.ebuild, + -files/supertux-cmake.patch: + Removed patch: installation dirs are settable thanks to r6122 by tuxdev + 14 Nov 2009; Nathan Phillip Brink (ohnobinki) files/supertux-cmake.patch: Updated patch for supertux SVN r5936. diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest --- a/games-arcade/supertux/Manifest +++ b/games-arcade/supertux/Manifest @@ -1,4 +1,3 @@ -AUX supertux-cmake.patch 4864 RMD160 807501750c7c253de7a67fa5d02197bc8474ece3 SHA1 94908744bbeda42a63b67932fd7eed896c92827c SHA256 0e0374b2e385445915a58dcdfd793af3816b87761a691195a707cc73caa1ef0a -EBUILD supertux-9999.ebuild 1393 RMD160 2d6e164b8893b3d9bec09e1cad36dea6babdb470 SHA1 2becb126d0ca9b52e0177b51ead48a414efa3b7d SHA256 2a1c6cdb2301cfc626d1aeea054bfd091ee22efa9ac6f609892d74abe3f40ebc +EBUILD supertux-9999.ebuild 1331 RMD160 d379ed8b35465d8ee3ce457236614d5911af6c47 SHA1 e6c21119e4cff90a9ba69b21be75e99befbfa489 SHA256 09022fde0c543bea1284e00d912c48980943b865226e61eb6899c96cbe0a22e1 MISC ChangeLog 4958 RMD160 485b89a533bb574db6ec7cc46491f83884590747 SHA1 2ffe7be2e6523355d346fc2cfda2aa3e0f34e0e1 SHA256 e7c5e87030aa5ac2dfe8e32e314761d84a5564b29efcc73187c7118020a58847 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-arcade/supertux/files/supertux-cmake.patch b/games-arcade/supertux/files/supertux-cmake.patch deleted file mode 100644 --- a/games-arcade/supertux/files/supertux-cmake.patch +++ /dev/null @@ -1,116 +0,0 @@ -Index: mk/cmake/VariableOption.cmake -=================================================================== ---- mk/cmake/VariableOption.cmake (revision 0) -+++ mk/cmake/VariableOption.cmake (revision 0) -@@ -0,0 +1,58 @@ -+# Copyright Nathan Phillip Brink -+# -+# This file is part of SuperTux. -+# -+# SuperTux is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# SuperTux is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with SuperTux. If not, see . -+# -+# - - - -+# -+# SETIFNOTDEFINED will set the variable named by VARNAME to VALUE unless -+# if it's already defined. If it is not set, it is set it to -+# VALUE -+# When setting (or re-setting) the variable, the macro will insert it into -+# the cmake cache with a docstring of ${VARNAME}_DOCSTRING and a variable type -+# of TYPE (e.g., PATH). -+# -+# Usage example: -+# SET(MYVAR_DOCSTRING "this variable exists") -+# -+# IF(A) -+# SETIFNOTDEFINED(MYVAR "default value" STRING) -+# ELSE(A) -+# SETIFNOTDEFINED(MYVAR "default value for when A is false" STRING) -+# ENDIF(A) -+# -+# Necessity: -+# -+# Even though the command-line -D option for cmake overrides CMakeLists.txt's -+# attempt to set values in the cache, the SET() command will set variables locally -+# while the script is executing. Thus, to recognize a user's option, the script must -+# check if the variable is defined or not first. -+# -+# Because there are three variables pertaining to file installation and three -+# different defaults for different platforms, placing an IF() statement around each SET -+# statement is impractical -+ -+MACRO(SETIFNOTDEFINED VARNAME VALUE TYPE) -+ IF(NOT DEFINED ${VARNAME}) -+ #set the default value and store in cache -+ SET(${VARNAME} ${VALUE} CACHE ${TYPE} ${${VARNAME}_DOCSTRING}) -+ #I cannot use the PARENT_SCOPE and CACHE option at the same time... -+ SET(${VARNAME} ${VALUE} PARENT_SCOPE) -+ ELSE(NOT DEFINED ${VARNAME}) -+ # set the variable into the cache; we use force because we want to add the -+ # docstring even if the user specifies the variable -+ SET(${VARNAME} ${${VARNAME}} CACHE ${TYPE} ${${VARNAME}_DOCSTRING} FORCE) -+ ENDIF(NOT DEFINED ${VARNAME}) -+ENDMACRO(SETIFNOTDEFINED) -\ No newline at end of file -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 5883) -+++ CMakeLists.txt (working copy) -@@ -349,11 +349,17 @@ - - ## Install stuff - -+SET(INSTALL_SUBDIR_BIN_DOCSTRING "Directory to install binary files to") -+SET(INSTALL_SUBDIR_SHARE_DOCSTRING "Directory to install data files to") -+SET(INSTALL_SUBDIR_DOC_DOCSTRING "Directory to install doc files to") -+ -+INCLUDE(VariableOption) -+ - IF(WIN32 AND NOT UNIX) - -- SET(INSTALL_SUBDIR_BIN ".") -- SET(INSTALL_SUBDIR_SHARE "data/") -- SET(INSTALL_SUBDIR_DOC ".") -+ SETIFNOTDEFINED(INSTALL_SUBDIR_BIN "." STRING) -+ SETIFNOTDEFINED(INSTALL_SUBDIR_SHARE "data/" STRING) -+ SETIFNOTDEFINED(INSTALL_SUBDIR_DOC "." STRING) - - INSTALL(FILES ${SUPERTUX_SOURCE_DIR}/SDL.dll - ${SUPERTUX_SOURCE_DIR}/SDL_image.dll -@@ -369,19 +375,19 @@ - ELSE(WIN32 AND NOT UNIX) - IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - -- SET(INSTALL_SUBDIR_BIN "SuperTux.app/Contents/MacOS/") -- SET(INSTALL_SUBDIR_SHARE "SuperTux.app/Contents/Resources/data/") -- SET(INSTALL_SUBDIR_DOC "SuperTux.app/Contents/Resources/") -- -+ SETIFNOTDEFINED(INSTALL_SUBDIR_BIN "SuperTux.app/Contents/MacOS/" STRING) -+ SETIFNOTDEFINED(INSTALL_SUBDIR_SHARE "SuperTux.app/Contents/Resources/data/" STRING) -+ SETIFNOTDEFINED(INSTALL_SUBDIR_DOC "SuperTux.app/Contents/Resources/" STRING) -+ - INSTALL(FILES ${SUPERTUX_SOURCE_DIR}/tools/darwin/info.plist DESTINATION "SuperTux.app/Contents/") - - INSTALL(FILES ${SUPERTUX_SOURCE_DIR}/data/images/engine/icons/supertux.png ${SUPERTUX_SOURCE_DIR}/data/images/engine/icons/supertux.icns DESTINATION "SuperTux.app/Contents/Resources/") - - ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - -- SET(INSTALL_SUBDIR_BIN "games/") -- SET(INSTALL_SUBDIR_SHARE "share/games/supertux2/") -- SET(INSTALL_SUBDIR_DOC "share/doc/supertux2/") -+ SETIFNOTDEFINED(INSTALL_SUBDIR_BIN "games" STRING) -+ SETIFNOTDEFINED(INSTALL_SUBDIR_SHARE "share/games/supertux2" STRING) -+ SETIFNOTDEFINED(INSTALL_SUBDIR_DOC "share/doc/supertux2" STRING) - - INSTALL(FILES ${SUPERTUX_SOURCE_DIR}/supertux2.desktop DESTINATION "share/applications") - diff --git a/games-arcade/supertux/supertux-9999.ebuild b/games-arcade/supertux/supertux-9999.ebuild --- a/games-arcade/supertux/supertux-9999.ebuild +++ b/games-arcade/supertux/supertux-9999.ebuild @@ -35,10 +35,6 @@ src_unpack() { subversion_src_unpack } -src_prepare() { - epatch "${FILESDIR}/supertux-cmake.patch" -} - src_configure() { local mycmakeargs="-DWERROR=OFF -DINSTALL_SUBDIR_BIN=games/bin