version bump

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

4 files changed, 318 insertions, 5 deletions

diff --git a/games-engines/odamex/ChangeLog b/games-engines/odamex/ChangeLog
index 1fae40a0a30e..5e8aa3fad467 100644
--- a/games-engines/odamex/ChangeLog
+++ b/games-engines/odamex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-engines/odamex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.3 2012/09/23 08:04:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.4 2012/12/15 23:23:42 hasufell Exp $
+
+*odamex-0.6.2 (15 Dec 2012)
+
+  15 Dec 2012; Julian Ospald <hasufell@gentoo.org> +odamex-0.6.2.ebuild,
+  +files/odamex-0.6.2-build.patch:
+  version bump
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> odamex-0.6.1.ebuild:
   x86 stable wrt bug #432726
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 7106bfc63651..87b06d039cc4 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -2,14 +2,21 @@
 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
 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
 EBUILD odamex-0.6.1.ebuild 2166 SHA256 cd4a3a47923f81c1bc1debff517a203844e03ee0ccaeb638ba7fca1034c47fea SHA512 bdfd0dfc04827f79ebd6567a046841d6aefa73208f4a14b20f13dc5d1543724914da3448dac897c95dc638200a0b2fea5b4930efff42f3d828bd2fd1ef2c43bc WHIRLPOOL d35e94b1cacee8dd2e5af4613f1264775ff66b924f87d8bc6beed9f72c8ff0162e4aaf73f5f13414c1590b62c85828934c1aaabdb32990217252505953196047
-MISC ChangeLog 580 SHA256 fdffb76fd5d47d476af152342f3dd45c17295cdfc5d973176c45239cc83ea789 SHA512 98746e69c9d545b5ba11b975b2453fccf78b6570c12d8e20ceb892218c986c16cbe785651580e3632dc2bbf26c4e93208ceaf5088dc6be74ded64ba49b0a2b24 WHIRLPOOL dc23941716c256acf08d82c17c8560f99bfe9079fe42b4ef2f016ecb2103ba2a2dd2bee210d09f2defa26b05ead391b78119cf3351cefba9d74c26a5db9a8d1d
+EBUILD odamex-0.6.2.ebuild 2166 SHA256 380f8e4cd2b0836f3dfab280e87d5f8b0e5a67e1394382d5db21c8fcd4e8aaa2 SHA512 45519ba80e3f0f2acbcf96617758c4315f99270026c29d154a3573b34f129c4f374a74551cf4234c92f3ec26e4ca709227636e119ff7e623e234d1ed9d32f7fe WHIRLPOOL 61ed1ded764957be5ebe255e9d3827ddf11791e37563b916cb11a2216acb7d3c174e708bd1cae1fd7a83837e555f35f63bd9f1c6eea570c734f2d2a9d96aacda
+MISC ChangeLog 731 SHA256 167f2fbcd295b90d357127ea7043737656b3c5f82afe09d4de3931bb10450121 SHA512 d5a26179bd71e88c0174e49f54e74493201a21641d74a64c1b59e3b62b98a8d28754ca48b8e48d4206405f18b6bb9cb069eed9119c8299e86404ea3815ea4676 WHIRLPOOL 8ad780bceef7008fc12adb090aa6a65d78c5bc6f9b674a5a87a5de7510ef1dfd0b0be35537fb2c67ae2bab73c4ffe186fe008ce89a2cf40d8103f90a8551be90
 MISC metadata.xml 1409 SHA256 a34f34c1a8940990b36b4e2b90b438aa20bd27248379bd25ad6d1fb5fb2d005c SHA512 46a7870945deac5e43b90f5c25c5d742c10926356a0f122bf7c8f79cd0f814e81a8560b4317ecc5f2bbe1807867667e2840529432fd58d6c5f547db453bb33be WHIRLPOOL 7ad416d13c6052026ab76d9c50810a708c70af7ea44450ca422dfd9ede924b41e2f4a71a4ab5c6ce2c66507a7b8282c6bfeaed278dec65c5a2cc11968ea8eabc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBewpAACgkQuUQtlDBCeQJbmQCdGghrdoGIiDMHBJCZ64FAal5u
-Xv8AnAz+lfZM6MvzggkqNCn/s11JVcXR
-=kjvT
+iQEcBAEBCAAGBQJQzQaDAAoJEFpvPKfnPDWz82kH/RUVip6F7nk6Xiv0zNHkdsn2
+AF9pNTN+pnYs/xn9SY+AsYM377uAGeFaGH/qDvEC1JDHHqJ0jeQ3LaFjzujFAw0p
+Up0Pv4Rbgx51YP9nR/2EH3AJS7HfXbJDwgyoTiUgYqEadin83H6SkVxUqEwN5RGv
+vkynHQqNG66IbqiXHPzwZOR7PMwwKefcr+DKF3SOVZNOpG11UyT2keka/RhTR3++
+bE7z9nWJ9+yttKyu5zID0Xl96ejrGTxujd92KAJtjacJkOAp1wxGCmBZBzVFhgS8
+tXSZzMzX/LQlhagpw6aCbfroWiIpuy2qx1ASYZpZu1gyyuoDrhLln0l9uUSrGls=
+=R1b8
 -----END PGP SIGNATURE-----
diff --git a/games-engines/odamex/files/odamex-0.6.2-build.patch b/games-engines/odamex/files/odamex-0.6.2-build.patch
new file mode 100644
index 000000000000..f5a7905e3788
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.6.2-build.patch
@@ -0,0 +1,204 @@
+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.2/CMakeLists.txt
++++ odamex-src-0.6.2/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.2)

+ set(PROJECT_COPYRIGHT "2006-2012")

+ 

+@@ -40,13 +60,31 @@
+ 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.2/client/CMakeLists.txt
++++ odamex-src-0.6.2/client/CMakeLists.txt
+@@ -55,11 +55,11 @@
+   "Path to PortMIDI base directory.  Only necessary if you get errors about PortMIDI not being found, or if you want to use a different installation of PortMIDI.")

+ set(ENV{PORTMIDI_DIR} ${PORTMIDI_DIR})

+ find_package(PortMidi)

+-if(PORTMIDI_FOUND)

++if(PORTMIDI_FOUND AND ENABLE_PORTMIDI)

+   include_directories(${PORTMIDI_INCLUDE_DIR})

+   add_definitions(-DPORTMIDI)

+ else()

+-  message(WARNING "PortMidi not found, client will not be built with PortMidi support.")

++  message(WARNING "PortMidi not found or disabled, client will not be built with PortMidi support.")

+ endif()

+ 

+ # Find Mac frameworks

+@@ -79,7 +79,7 @@
+     ${CLIENT_SOURCES} ${CLIENT_HEADERS} ${CLIENT_WIN32_RESOURCES}

+     ${CLIENT_MAC_OBJC_SOURCES})

+   target_link_libraries(odamex ${SDL_LIBRARY} ${SDLMIXER_LIBRARY})

+-  if(PORTMIDI_FOUND)

++  if(PORTMIDI_FOUND AND ENABLE_PORTMIDI)

+     target_link_libraries(odamex ${PORTMIDI_LIBRARIES})

+   endif()

+   if(WIN32)

+@@ -146,6 +146,8 @@
+         ${CMAKE_CURRENT_BINARY_DIR}/odamex.app/Contents/MacOS/odamex)

+         " )

+     endif()

+-

++    # UNIX install rules

++    elseif(UNIX)

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

+   endif()

+ endif()

+--- odamex-src-0.6.2/master/CMakeLists.txt
++++ odamex-src-0.6.2/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.2/odalaunch/CMakeLists.txt
++++ odamex-src-0.6.2/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.2/server/CMakeLists.txt
++++ odamex-src-0.6.2/server/CMakeLists.txt
+@@ -50,3 +50,8 @@
+     target_link_libraries(odasrv socket nsl)

+   endif()

+ #endif()

++

++# install rules

++if(UNIX)

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

++endif()

+--- /dev/null
++++ odamex-src-0.6.2/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.2/common/d_main.cpp
++++ odamex-src-0.6.2/common/d_main.cpp
+@@ -23,6 +23,7 @@
+ //-----------------------------------------------------------------------------

+ 

+ #include "version.h"

++#include "config.h"

+ 

+ #include <sstream>

+ #include <string>

+@@ -493,6 +494,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.2/odalaunch/src/dlg_main.cpp
++++ odamex-src-0.6.2/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.2.ebuild b/games-engines/odamex/odamex-0.6.2.ebuild
new file mode 100644
index 000000000000..242d6ebf8987
--- /dev/null
+++ b/games-engines/odamex/odamex-0.6.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/odamex-0.6.2.ebuild,v 1.1 2012/12/15 23:23:42 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? (
+		>=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 )
+	)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+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
+}