version bump

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 316 insertions, 17 deletions

diff --git a/games-engines/odamex/ChangeLog b/games-engines/odamex/ChangeLog
index 10bf4c13324f..12d758a76d95 100644
--- a/games-engines/odamex/ChangeLog
+++ b/games-engines/odamex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-engines/odamex
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.8 2013/03/17 17:40:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.9 2013/04/27 15:39:38 hasufell Exp $
+
+*odamex-0.6.3 (27 Apr 2013)
+
+  27 Apr 2013; Julian Ospald <hasufell@gentoo.org> +odamex-0.6.3.ebuild,
+  +files/odamex-0.6.3-build.patch:
+  version bump
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 247bcaf2b21a..6e60a14c8c6f 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -4,28 +4,23 @@ Hash: SHA256
 AUX odamex-0.6.1-build.patch 5903 SHA256 9654f26beaf684831347a2970ab959b27561b9772595a4a900ce589683a5b062 SHA512 29df1ad3f86dbf6e1dc92c2c01ce3e223ed0d38eb1fe8c1e1a06c2d158f67330f68e7fa542770fe0bf68ce8d8785371959f391cf98b8334b40fd0b9cb4b635c3 WHIRLPOOL 67d757cd882831fd86a007081d465183d184a4f06f3bd7d930b634bcc6b5124c2c793ef891420a77a243e686cc46a53a9f0a44bdf65e2902187aba76aeb6491a
 AUX odamex-0.6.2-build.patch 5923 SHA256 d08e7420d38e503baa26291088fa612576bc90439e80095b9237b22b616b8dc1 SHA512 8a9c498750a1ad8efcc436bbbc699152f30c4a1b8a366b78c3eb285646a8b0ed84c260650376766372d671ef7e243337b267e621c2f403971c35442eb28c3768 WHIRLPOOL d0f722b2b5a56006f979af195acc106456b22a2753c5af1c860c521c9926ebb2d67fabbf0a9f8eefe4ef5dcce68e839934fec1bc96d8755dc1f22fc0e47ad7e5
 AUX odamex-0.6.2-libagar.patch 429 SHA256 d6b6d691946fc1a97d12e281226d08a1e913de7c75cfb8a4f778566dd33e08fc SHA512 010c557770742d541d3e1ae3f744625da9e87b8cf56b27d770fd6ecd9ad68d0a15f63603db1e99c52866d91b6453ec2813cb7c16ace94411e122f92d198e3181 WHIRLPOOL 0b84e375658c6a8d0c47170d66561c573092ce42b65a44038d8bce345e39612988a6b8858e2539b8092515751e263cc04af7545679b93adbe3e526cf28a10c34
+AUX odamex-0.6.3-build.patch 5368 SHA256 ad73c287357fd847e518cf2926e24254633c4f5d2b1b7587510fae71c4e177ea SHA512 b39ec3418d9f05889642fc47fff538357a25d712b42f2d08c1b65a5bbb75d4d5b47d15f803d8705e45575f998cf8442455bea9907848400f84b6b472a37ee92a WHIRLPOOL b1fadd2df2dc985d9b55f2c210e9b646561102d3189a19cd10c984028c279eb233dd2a02c658d8e562bc7645cd3a16afeabf41d4658cbc1b95023f890ae34306
 DIST odamex-src-0.6.1.tar.bz2 7522333 SHA256 d7758141d00510eae55132a2376326560a206c772da3d604666dc2c62009f861 SHA512 bb506ec912dbd63e68be2f1ef3ae7c0bdd800ac39ab56ddeb270c707584c1a34c83a729ef9bf3f8a5d24599b220d526ca9559fc9a2e3c561af3fe3ab134aa7f9 WHIRLPOOL 31d4adc826a3a2ffa1d5c9e3872edb6a702c9b6695f268ecba324fb27aa8f29db05d525972fbdafc1c5c8c58d991b2600674bb9ff674cf3d6991d3d3ba82a68d
 DIST odamex-src-0.6.2.tar.bz2 8451290 SHA256 70534ee0b88f759269b807190f347acacc1a0ff4f9e9e90edeab9aa99d4f316e SHA512 83bdb7b850a6a6c3670fa9eeeccca6501ea90f26bcef2437e5530a43d40c9cdd408de15183d4fe991becc13f58666c86586660522d102680148df4c12dd27104 WHIRLPOOL d024220bc2b743fd6512981ce3d58fa8562e9cfc3712158e308172ba1c3b1a2de076969015601a418d14be25af5ebe366e6353bb66f523837a29ad5c56af1c64
+DIST odamex-src-0.6.3.tar.bz2 8439487 SHA256 ad0d2a1d86288e26438cb012fd8898d5b3b4cc1d466250105b4b740013d940da SHA512 86a57f359b1bfb1cf84c674aa71c7c91e2aabbe07e9f77de7914031a6584b547a11c7f59ea422756ea41dcfc1d50b7dfd74be764812a0e1ce1c69969403b1990 WHIRLPOOL 272a89b5941cb48af861e198e9c8de5b78a4edb0ea1e830ad33610c2147fab232dcff02bdd0db0b6b460cca8573b56cbbb83bc7cc98d80af0d8780beb0add7ed
 EBUILD odamex-0.6.1.ebuild 2166 SHA256 cd4a3a47923f81c1bc1debff517a203844e03ee0ccaeb638ba7fca1034c47fea SHA512 bdfd0dfc04827f79ebd6567a046841d6aefa73208f4a14b20f13dc5d1543724914da3448dac897c95dc638200a0b2fea5b4930efff42f3d828bd2fd1ef2c43bc WHIRLPOOL d35e94b1cacee8dd2e5af4613f1264775ff66b924f87d8bc6beed9f72c8ff0162e4aaf73f5f13414c1590b62c85828934c1aaabdb32990217252505953196047
 EBUILD odamex-0.6.2.ebuild 2215 SHA256 beeaa771aa0daa33959f06f808100a59a48c95a712159790ed0f4cac1df67eb3 SHA512 364439cdae5956c9edd67d32e3995339c81e5c830a410e69d8ddd07d46d45464d90e19d3710d911f686bfadaddb13e215f5cf4a6cdde8e51ae9d5bd755c7559f WHIRLPOOL 15e45f6522e0b5c9c16e5acf7269ffd2c1cb8f472c2ac85164469ba07c9b90ce0ec3e23580b0fc59d1d4bb2b977382e5bad0b736d0995307861f7a3390749232
-MISC ChangeLog 1178 SHA256 a2ba1171f002d55f0e125932f984cac6055a926cc91f87eda3cfe9c0029e3ab7 SHA512 5ae45cfbb19347e8200d53bdeb6e1bc165a9227930297fa206d26b2a4a38a0411f17a9a92db6da317697b33e22f3f77eaad6fbd63455ad7e11196a5bf3461c5b WHIRLPOOL 42a4de7b156076ad7fd9c8977967f1a62a90eaacbddd5c4ef59dc485da8b1d4d8586a025160244782961d1dd0c39285ab24382d54e103619b88b5b8583abf32e
+EBUILD odamex-0.6.3.ebuild 2260 SHA256 2829ca788bd7dd33af7b24c956a35be3d8a76437838f49d07bd8a3b83f9baaa6 SHA512 e474af7062e85056d4d66f420f848c90bdaf63814a69d3fcf1f6a0d4cc03adcbcb7b63c2e7dec8ccedb3468650e7f0052c8e2bf46c0f57649a6c8ad4e869b048 WHIRLPOOL e00158cf64546d0233dbfa25f992efe242a74b769d1134f5fd5ac1b8a0798a725d4a4e69377225118511cd728da11894027cf61851d888a9fddc2dd1a07a60a0
+MISC ChangeLog 1331 SHA256 dafdfc5a1ed29341ca229ed006a41fd7d248b17cac50d31e4c03f3d6f36eb513 SHA512 d0738bd34935fb227c031bae95df524a5476f39388d1eb48854d0ba7a228410eee7d57e41a7bf87852e443f3ef45ae6a751e18b1b49d956cb4867b34aa68e9d8 WHIRLPOOL c4df7d078283861b196f304f045e27a0b2ee44516b7e710856a1e5baad255c11e246777d8ced693a17fecb0a19cfd0826dc9a192330286a2ef814a95bae80017
 MISC metadata.xml 1441 SHA256 f1c8278351d9be40c517a5b7ad079c4d1e37e23af8ecaa4e4a5f9508e360fee3 SHA512 6c9a2a5702fdfdf6c612db4fe5938c3b4ab726c1dac18ce9a9d9e21c3238a5d5a2fe0082e4b57f002a5999736e0465da304e68dbb9e172e408a90dc6ef38f7ae WHIRLPOOL d6683a9f7718e4183f8d549afc30e7e6426cf6bb9fecab023f3faa52e31c12892095a5b82052170749de666d779d1ccf96fda7e5c560580c506dd0918aded8d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRRgAoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88M78P/iUGn/lk1IRQ+sJPlahV/XzQ
-Au+4ufP63CtHXde2vpxUjYN799xrdSDyZAD+Psb83T/MQTDjPqYhVMLpl55lDi3N
-Kq9/EjHXE4Qb0EU1fDczWhmRbhXVASBFEpHfJOZSYqVHHgBtaiwnzB1aUvDYpDrl
-q0DdPJ7n2vhvc3EBaYSMsZ3yxPt/EgC3mEjVBoAv3ttyMSkzMiSmxgQ0J3yxjN1E
-ZnIZWpf2rud2mVXYTGT/cFjEBTqOkgiuyiyyMyOz+1Xe69ZkV9XSf/zvPSDF5lmj
-+KjhgFqeEqEQpUD0xMGBC6NhvsaO7Q1ddm7miLVzb22COu8LgPGiq3VSypsGuGOj
-zYDCCgLeItHWz66KnPJFL0sxsKB1g5UhqArBn7WtAyL2gRhRHtTbNdmdREq8pCU+
-d4pVkmt8xpBX0CnRMqj7TXlTBqc2lG9Kv+QyDCDC0zdVKKPyFPb3qftyyNulDIWg
-xiZiCYzJ8CAFT1HYlr6IAgdvPuUKf8lM7SBD1iM+8r3BLU8iRf7EqijtbXpJN/lY
-QZqQEzlkI1Jvg6Qd/6r55tQDquKW9OndSkYhHEKBB4+FlPFxB3QI4Gxx5Mp18pSa
-PEH8TlhiVcjm1M3IEBZOBGAQ88rUsLYr4/aPBchIF6tOjmQ+Mzt/fKM7p9K3svIC
-+Z63sJOBkF2gE6xpQYZF
-=KUGI
+iQEcBAEBCAAGBQJRe/E9AAoJEFpvPKfnPDWzWcoH/10qPSal1Yw83D8hFdcAM2bT
+A581IX+1EOaLYShpdm/tYX3slE/U+KViCYS6ZE6DUNLLv1peryjdq01LT63EqsPJ
+iO4Lr6awa8tkGIiTpSpcKL7FR6EGiekaURVGUDFL4SxffWsyLjLvZ5b9v/4o14OY
+lE/XJDHjJDIDPenz/APQr7IHEWb1cVIc/uJ3ZZaYuJiWNqfQ62OLEPoQnxwxPWFq
+oTQOEiRciPTS26ACQedJcunz0/1Lm9VHGGeNaSpZn8MjdDpVu6n1FpPTIdUEoTxD
+Rf3j8A1RSVCmFIa2uG7S7JrVovNmcer14ODsT4kD9OBD+j+ioKUWaXcf8AN+95Q=
+=HByn
 -----END PGP SIGNATURE-----
diff --git a/games-engines/odamex/files/odamex-0.6.3-build.patch b/games-engines/odamex/files/odamex-0.6.3-build.patch
new file mode 100644
index 000000000000..2683617871e6
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.6.3-build.patch
@@ -0,0 +1,198 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Jul 15 10:08:51 UTC 2012
+Subject: build system
+
+a. add install rules and make paths modifiable
+b. add odamex.wad install destination to wad search path
+c. add various cmake options
+d. use CMAKE_BINDIR as default bin patch in odalauncher
+
+--- odamex-src-0.6.3/CMakeLists.txt
++++ odamex-src-0.6.3/CMakeLists.txt
+@@ -2,6 +2,26 @@
+ project(Odamex)

+ cmake_minimum_required(VERSION 2.8)

+ 

++# cmake modules

++include( CMakeDependentOption )

++include( GNUInstallDirs )

++

++# options

++option(BUILD_CLIENT "Build client target" 1)

++option(BUILD_SERVER "Build server target" 1)

++option(BUILD_MASTER "Build master server target" 1)

++cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 )

++cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )

++

++configure_file (

++  "${PROJECT_SOURCE_DIR}/config.h.in"

++  "${PROJECT_BINARY_DIR}/config.h"

++  )

++

++include_directories(

++	${PROJECT_BINARY_DIR}

++)

++

+ set(PROJECT_VERSION 0.6.3)

+ set(PROJECT_COPYRIGHT "2006-2013")

+ 

+@@ -54,13 +74,30 @@
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)

+ 

+ # Subdirectories for individual projects

+-add_subdirectory(client)

+-add_subdirectory(server)

+-add_subdirectory(master)

+-add_subdirectory(odalaunch)

++if(BUILD_CLIENT)

++	add_subdirectory(client)

++endif()

++if(BUILD_SERVER)

++	add_subdirectory(server)

++endif()

++if(BUILD_MASTER)

++	add_subdirectory(master)

++endif()

++if(BUILD_ODALAUNCH)

++	add_subdirectory(odalaunch)

++endif()

++

++if(NOT BUILD_CLIENT AND NOT BUILD_SERVER AND NOT BUILD_MASTER)

++	message(FATAL_ERROR "No target chosen, doing nothing.")

++endif()

+ 

+ # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET

+ # This is only really useful when setting up a universal build.

+ if(NOT NO_AG-ODALAUNCH_TARGET)

+   add_subdirectory(ag-odalaunch)

+ endif()

++

++# global install rules

++if(UNIX)

++	install(FILES odamex.wad DESTINATION ${CMAKE_INSTALL_DATADIR})

++endif()

+--- odamex-src-0.6.3/client/CMakeLists.txt
++++ odamex-src-0.6.3/client/CMakeLists.txt
+@@ -48,7 +48,7 @@
+ 

+ # PortMidi configuration

+ find_package(PortMidi)

+-if(PORTMIDI_FOUND)

++if(PORTMIDI_FOUND AND ENABLE_PORTMIDI)

+   include_directories(${PORTMIDI_INCLUDE_DIR})

+   add_definitions(-DPORTMIDI)

+ else()

+@@ -95,7 +95,7 @@
+   target_link_libraries(odamex ${SDL_LIBRARY})

+   target_link_libraries(odamex ${SDLMIXER_LIBRARY})

+ 

+-  if(PORTMIDI_FOUND)

++  if(PORTMIDI_FOUND AND ENABLE_PORTMIDI)

+     target_link_libraries(odamex ${PORTMIDI_LIBRARIES})

+   endif()

+ 

+@@ -164,5 +164,8 @@
+         " )

+     endif()

+ 

++    # UNIX install rules

++    elseif(UNIX)

++	install( TARGETS odamex DESTINATION ${CMAKE_INSTALL_BINDIR} )

+   endif()

+ endif()

+--- odamex-src-0.6.3/master/CMakeLists.txt
++++ odamex-src-0.6.3/master/CMakeLists.txt
+@@ -12,3 +12,9 @@
+ elseif(SOLARIS)

+   target_link_libraries(odamast socket nsl)

+ endif()

++

++# install rules

++if(UNIX)

++	install( TARGETS odamast DESTINATION ${CMAKE_INSTALL_BINDIR} )

++endif()

++

+--- odamex-src-0.6.3/odalaunch/CMakeLists.txt
++++ odamex-src-0.6.3/odalaunch/CMakeLists.txt
+@@ -61,3 +61,9 @@
+     )

+   endif()

+ endif()

++

++# install rules

++if(UNIX)

++	install( TARGETS odalaunch DESTINATION ${CMAKE_INSTALL_BINDIR} )

++endif()

++

+--- odamex-src-0.6.3/server/CMakeLists.txt
++++ odamex-src-0.6.3/server/CMakeLists.txt
+@@ -56,3 +56,9 @@
+ elseif(SOLARIS)

+   target_link_libraries(odasrv socket nsl)

+ endif()

++

++# install rules

++if(UNIX)

++	install( TARGETS odasrv DESTINATION ${CMAKE_INSTALL_BINDIR} )

++endif()

++

+--- /dev/null
++++ odamex-src-0.6.3/config.h.in
+@@ -0,0 +1,7 @@
++#ifndef CONFIG_H
++#define CONFIG_H
++
++#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@"
++#define CMAKE_BINDIR "@CMAKE_INSTALL_BINDIR@"
++
++#endif
+--- odamex-src-0.6.3/common/d_main.cpp
++++ odamex-src-0.6.3/common/d_main.cpp
+@@ -23,6 +23,7 @@
+ //-----------------------------------------------------------------------------

+ 

+ #include "version.h"

++#include "config.h"

+ 

+ #include <sstream>

+ #include <string>

+@@ -494,6 +495,7 @@
+ 	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);

+ 	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);

+ 	D_AddSearchDir(dirs, getenv("HOME"), separator);

++	D_AddSearchDir(dirs, CMAKE_WADDIR, separator);

+ 

+ 	// [AM] Search additional paths based on platform

+ 	D_AddPlatformSearchDirs(dirs);

+--- odamex-src-0.6.3/odalaunch/src/dlg_main.cpp
++++ odamex-src-0.6.3/odalaunch/src/dlg_main.cpp
+@@ -27,6 +27,7 @@
+ #include "str_utils.h"
+ 
+ #include "md5.h"
++#include "config.h"
+ 
+ #include <wx/settings.h>
+ #include <wx/menu.h>
+@@ -42,6 +43,7 @@
+ #include <wx/process.h>
+ #include <wx/toolbar.h>
+ #include <wx/xrc/xmlres.h>
++#include <wx/string.h>
+ 
+ #ifdef __WXMSW__
+     #include <windows.h>
+@@ -190,10 +192,12 @@
+     }
+     #endif
+ 
++    const char *cmake_bindir_str = CMAKE_BINDIR;
++    wxString cmake_bindir = wxString::FromAscii(cmake_bindir_str);
+     launchercfg_s.get_list_on_start = 1;
+     launchercfg_s.show_blocked_servers = 0;
+     launchercfg_s.wad_paths = wxGetCwd();
+-    launchercfg_s.odamex_directory = wxGetCwd();
++    launchercfg_s.odamex_directory = cmake_bindir;
+ 
+     m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList);
+     m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList);
diff --git a/games-engines/odamex/odamex-0.6.3.ebuild b/games-engines/odamex/odamex-0.6.3.ebuild
new file mode 100644
index 000000000000..3bf9b04c5a96
--- /dev/null
+++ b/games-engines/odamex/odamex-0.6.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/odamex-0.6.3.ebuild,v 1.1 2013/04/27 15:39:38 hasufell Exp $
+
+EAPI=5
+WX_GTK_VER="2.8"
+inherit cmake-utils eutils gnome2-utils wxwidgets games
+
+MY_P=${PN}-src-${PV}
+DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II"
+HOMEPAGE="http://odamex.net/"
+SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated +odalaunch master portmidi server"
+
+RDEPEND="
+	dedicated? ( >=net-libs/miniupnpc-1.8 )
+	!dedicated? (
+		>=media-libs/libsdl-1.2.9[X,audio,joystick,video]
+		>=media-libs/sdl-mixer-1.2.6
+		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+		portmidi? ( media-libs/portmidi )
+		server? ( >=net-libs/miniupnpc-1.8 )
+	)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}"
+		-DCMAKE_INSTALL_DATADIR="${GAMES_DATADIR}"/${PN}
+		$(cmake-utils_use_build master MASTER)
+	)
+
+	if use dedicated ; then
+		mycmakeargs+=(
+			-DBUILD_CLIENT=OFF
+			-DBUILD_ODALAUNCH=OFF
+			-DBUILD_SERVER=ON
+			-DENABLE_PORTMIDI=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_CLIENT=ON
+			$(cmake-utils_use_build odalaunch ODALAUNCH)
+			$(cmake-utils_use_build server SERVER)
+			$(cmake-utils_use_enable portmidi PORTMIDI)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use dedicated ; then
+		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
+		make_desktop_entry ${PN}
+
+		if use odalaunch ; then
+			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
+			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
+		fi
+	fi
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo
+	elog "This is just the engine, you will need doom resource files in order to play."
+	elog "Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F"
+	einfo
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}