old

Package-Manager: portage-2.2.14/cvs/Linux x86_64

7 files changed, 8 insertions, 648 deletions

diff --git a/games-engines/odamex/ChangeLog b/games-engines/odamex/ChangeLog
index c5d3f42cfa16..0e53dd28046f 100644
--- a/games-engines/odamex/ChangeLog
+++ b/games-engines/odamex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-engines/odamex
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.17 2014/11/25 23:10:12 hasufell Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.18 2015/01/26 22:40:56 mr_bones_ Exp $
+
+  26 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/odamex-0.6.2-build.patch, -files/odamex-0.6.2-libagar.patch,
+  -files/odamex-0.6.3-build.patch, -odamex-0.6.2.ebuild, -odamex-0.6.3.ebuild:
+  old
 
   25 Nov 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   drop maintainership
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index ce07666ad5e5..5ad9abb99f11 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 1-odamex-0.6.4-install-rules.patch 2101 SHA256 cb276c2caff6e2c005c819dc21d5fc141bd159d2b1ae434892d83e15409e940e SHA512 ee3b626b1a98fa01152c7796af1614d3ffc2a09204304b5ad38d7e140007661d66638843048429feb772b10e896dc40729f681485d290ad4f29528d1539d1983 WHIRLPOOL 20e1ef6df3b64e28cef2dc56c331e44ffd48baab101b4e87d32ebff5f8f8888aea64bc1a8161c55f36f0711706398634c358a3c5bdfcc0f2325db691bf51a310
 AUX 1-odamex-0.7.0-install-rules.patch 2713 SHA256 0cad5518c87542de22b74a1031c334c0a1ae450126d2470b35fe55b0c6737a23 SHA512 8ad2f8eaaf6697275daec6ff3076c3f8359eed46bc89bb8567f25e5c825ef065ae875c7c607a5bb99fd62bf8e616e4c0296af374817e9fe02abcd311b306a453 WHIRLPOOL 1d9dee520cf3a56497268df38fe8d8f88d302726d4e8c2394249d050b40b0a2008145e6a4b35abc8bd39b5e669262857ab79e6837be37b78fa53dbc9bcb5de52
 AUX 2-odamex-0.6.4-cmake-options.patch 2343 SHA256 3905e764d877a7e5b73c05c4cf9c2470689af7474b3fb10255423e40ef48578c SHA512 6b19c4454c22c25479a33c5bfca7b524b196a7b0e42c2d12d8ed53ea37f3a04b34ae4bff18aca1dd03112504e8ad3b86046fc26ff7f3846514f943b727b7c3d1 WHIRLPOOL b3a696d85425920947f11ec9ce05d5af8f5920363fa24a3eee8fa953c065237daba71a333dd50b96f1f0b0e61c79a887742b50f7e8399cc3ee55ea3b0e0f21b0
@@ -9,36 +6,10 @@ AUX 3-odamex-0.6.4-wad-search-path.patch 1784 SHA256 47b9e26c15638b431166d90a199
 AUX 3-odamex-0.7.0-wad-search-path.patch 1758 SHA256 15c841ac0b99e5a185295fbdd74fea300260620f6b70e1b882cdcb8a00228627 SHA512 031507d97734e75cddbcde5b09a7e483f1110dd08e692652b71a79e7f90b703090798916b3f25a74e18f29e0091e2f018d93662d82f994fb11317ba0215dfd10 WHIRLPOOL 0712c836a422e9094856e144ded6ca68dc582f199deb3d29defdec05eef4fea6427ed6061840ce3f0fdb55ae3b160ce4f87005e3335c153273ad70e4144239f3
 AUX 4-odamex-0.6.4-odalauncher-bin-path.patch 1497 SHA256 220ff799bc9329603b90bb4bff44238b20a7dad8b1ae093b76be9bbeeba34586 SHA512 86316f70bccbcf53b34d121636f099c6324bb79e6b85f450cea2767fdf6e475ccdcfd6da55b00b0c788144bdafe208ed39786375126a3c3e86107a54eb2fa704 WHIRLPOOL a1a3108ed3ba1077018d14a4a7e7e9bd050439b0e7e8760ad809a0806beaa28fa49758d81284b18d8ae81c12b85371a661b1663e09bca34d1479ff05bd21dd7d
 AUX 4-odamex-0.7.0-odalauncher-bin-path.patch 1671 SHA256 aef75036f4e44ffaca38fb12eb9b61cbce939d87d71d7d1607e73d633998388d SHA512 4ab5c84d5e3e1465fb02c775fad0208bf177264137d82297515c8f2bf188e9f4ce79a5510e28dfc4811392ecef407b89267e2baf45d37c236fb86cfc066c1ed2 WHIRLPOOL 5a69fe2877687ed8f296b648e943064bc67bbd3cf0dbeb8940fc372edb07455a2700b35d6033fa3e21b4b17d2dc4c7251055e2a3899b092a6d36c0357bc816db
-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
 AUX odamex-0.7.0-miniupnpc.patch 1144 SHA256 189ff82d8e921348239caba5d55d236e8e4a0b18b522259ec29be700665e7b0e SHA512 0a805aca36687f183aa168972ecc9bfcd04c117787e42967fbf62b08873943b9f6c5118f15089a70ede43335ce571216255f315e08ce08f89ff23f6859507951 WHIRLPOOL cf4a8e873c7c7c88d708841fbadcd18290ce448b7db0f7c8c515316935f4d03d6b31aff79af141e4234d3540e3593a1838784783fd7549d14ceb63658153fa2a
-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
 DIST odamex-src-0.6.4.tar.bz2 8449818 SHA256 7832fed1e0cca992c746fd0f7e876b090c0f244f2d1d5230ffa3df8b33ce0f6a SHA512 0a917568cfc4bd4d9921cb82185cbbc318bce493bc66e489093e45401ec4c7596148778648e5078f13c50824470a040a995aa50c7956e2446c90920254c8129f WHIRLPOOL 9d95a9422ab382ccd5f4fc7d89f0558e30c604e18a33eec3bb074ae446258f030ec67d4738e1c517d89c9a4e09aea6e3a84651d7c8b1df9a88a26077c1b319b4
 DIST odamex-src-0.7.0.tar.bz2 8435860 SHA256 d0306ddca3d5534672e6f0c547092d8f3f6f815686e4f6b21d6521afae1fd73b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b WHIRLPOOL 91ca8f658435f4503df8a2d5f52b1ef1cf34229373c4e1c3918b7eb919ae54e3a416618ce184d54c6ebc25bdfe6fea96f8933f98d859562b4972f89bd5c320ff
-EBUILD odamex-0.6.2.ebuild 2210 SHA256 0237058f8b03f0a5af77806d98a20d145e2520a21aa829b82205fa2889a5efff SHA512 c16cefd608bdf3454f37d8829e57174025c64a9d207654640b77161e1c6ec6b8511df9ec3c211601ce53ffe22367970c62b6a5319c857a671436e7edc6fb6e53 WHIRLPOOL 1fbd1cffa975d48090d9eb8148509a125c4ead2a503aca4f3e1550063f62719ed73c1c1a6aaa9b25c099903efd1dbe55fd9f699466e2a22880d40ccec91ff5c2
-EBUILD odamex-0.6.3.ebuild 2253 SHA256 976dee6e1645e31812937536463d304595b1d75d745fbd93964786dfe8d85f13 SHA512 59c6e0dba9dc2c391b5509ae4bd26cfc71b21afbf44e9372cb0923b1fc4a3c9fb80b5fcf0b8608681d6e500ed3e0b94a34afde93d0cdd0eb970283285487e70b WHIRLPOOL 3f50ef9ad8bfc9f6300c016e787a625a5cafaa73647df700f2f2502d3b4bf95e79ffebc5dc9f644661bf92a9bfbf72f7f31005e56e0c2886a60934b159eaaa83
 EBUILD odamex-0.6.4.ebuild 2407 SHA256 328bc72b0311260a57b9e970f4a70c864feb3fc71a87ace298ea6b8be5e1d2ff SHA512 f2a8d8a528d92d952bb69864c8b982e1d5eda0656821aad44d1b20fc0bb85e7db6945bde94752ae78e894592affa58fcfef6aecc3bde8df87e54831fe2dd36da WHIRLPOOL 65ee05fd033806939736c647530d1d0454f400354b5848b27db1786fec0b58e305773bdd1a8d7e714930bbf39897c5e87d690365a46735f6c1403025760fbfd4
 EBUILD odamex-0.7.0.ebuild 2711 SHA256 a0f82b84b4637c8bc2b69b40839575241de5a24fe16a24fe61e22cae2b63f0e2 SHA512 8596e50999e2d9ccee1173976c378ea8c31e17104576c98d27ad8d8d8b0ce8fb41451d099946049dd36621f8aa42a01cc3fbfb49e7e948b2b2553ebd18929094 WHIRLPOOL 968c9746f0862121d43e99a8c8ceb3fb0e77c11ffc5e5f37e1b5c5718cc3c9fd1c1249ebaeb9fe329b84e71a91fd43e8691f1f14a6fd1e39d7c89417c2934dde
-MISC ChangeLog 2798 SHA256 37eda4df2370d01ac30669c0baabfae4428ac38ee4a43c18105d68524f1d1331 SHA512 bcf4a78fc26df4e02ae8e9a8e4f5597f36975a2a13fbcae7adcc2e061ea86d102295c5a8f1954c1f922985f0fc5823bb4905e6e4fc527546d3388c105dfa3495 WHIRLPOOL 2c46e152a4758563248a35fd8d8920999560976e6c97c98c571d6d8559790c0d3848a48f2fd0bfd84c68e3dffb9d134a3e9bdb5d5eee082d496cd20b0149721e
+MISC ChangeLog 3010 SHA256 e7421e1876c1a1d5dbe83fff560e8e56b665b99680b8c6bd85025d7eeaf7a77e SHA512 0b4778208e3dec73ab17970e26fdb96cb2d3e2ab7d1f1f54ccce6ad1c0cc4a31c288751377af99131e39848e70222726845fd834407d078d6d2a60698e2a8620 WHIRLPOOL c9148d0a2dce676aec1fb2a22462d4cefafb964d822d0de087b05b6944f5585837ff34681d7f469765f820ff6340052cea30a2b71d81827a444e95a91ca879fe
 MISC metadata.xml 1286 SHA256 462a511bcd3a1edbcc2fce573f35495f6c974a3891f76c7ee6c0ecb427a197c2 SHA512 a14aff6b02dcaa9d31bcc1af48591e9cf32052c00ed1b66ca985c4ca8117bedf8e58616367b964774990dcccad6da88ae7f62ed45645e0c9ad117715aa39e993 WHIRLPOOL fd0258544ac0b5904a5333ca856d2a828d663178f13e085e61068d580545883c73d661413a12d5f438b53f5fcaad9bae8319348b3d18afd0eb39d679f9f96a00
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJUdQxVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgrS0P/25r73ZCvZg8M7JiHRxtZXS4
-Ceyx0lIIXOTaCA89mK3A9jwFR8MxalU4RPGWKTn13F4pipxpMbUvKuW0LNiiOgkT
-Upj+42y/GoqLTXIH5E91wnFIZ5hWDFJSrQvx1lblQ1F2iWwT30R/1YlDbg2MZpU3
-+5oLGR2gsNf8b5OtDDpYvQq5qRQV7W7T/zhpmQ0NeXHXJM6AXBqlK4wvY1KmbGbH
-kqhtu+R1D/UWXxKyHlbV++1uoS+2QCPdVnGRMgRnvH5JaWspkPy1hq4X2KY6LaMj
-pvteFgDZMT4sXIMeRazlYRHzCPfUbTeadcBlR/IzJh27TKeeFZNnNnpgxC9odVQ0
-PSQQUxKSvU3fNXTT0mEq+cwIj2rt/y0J3Y5d4lOKaxWZ20tSfix0KRYe7j7pn61V
-EIVZ7IlDFEw5+Zv2kynSfVWxhLpQ6nvVx7X/egtKCH012FaHL18qvUMsKJcR+K7j
-U5/YHLOx/2rHGYTSWt780V12HMAgxjM+fJJCbIPt623i0761378iXbxB3Be4urDf
-7L4SyQG4LUDgM0zjLebNX5/nAzCll2PhRH09VOZ2GtVhd6ZQZ6BSirxFlvmUadZ9
-ke9oEX1PE4eJRCSIj/kBUVKu9h731G4sSVuWohew/A/MBhfvKR4bpYCUfPLI33PG
-3xVfd2dmst/JcXQHtGAL
-=/k4E
------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
deleted file mode 100644
index f5a7905e3788..000000000000
--- a/games-engines/odamex/files/odamex-0.6.2-build.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-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/files/odamex-0.6.2-libagar.patch b/games-engines/odamex/files/odamex-0.6.2-libagar.patch
deleted file mode 100644
index 5f367aff1d6e..000000000000
--- a/games-engines/odamex/files/odamex-0.6.2-libagar.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://odamex.net/svn/revision.php?rev=3691
-
-Index: ag-odalaunch/src/main.cpp
-===================================================================
---- ag-odalaunch/src/main.cpp	(revision 3668)
-+++ ag-odalaunch/src/main.cpp	(working copy)
-@@ -52,7 +52,7 @@
- {
- 	AG_Window *win;
- 
--	if((win = AG_GuiDebugger(agWindowFocused)) != NULL)
-+	if((win = (AG_Window*)AG_GuiDebugger(agWindowFocused)) != NULL)
- 	{
- 		AG_WindowShow(win);
- 	}
diff --git a/games-engines/odamex/files/odamex-0.6.3-build.patch b/games-engines/odamex/files/odamex-0.6.3-build.patch
deleted file mode 100644
index 2683617871e6..000000000000
--- a/games-engines/odamex/files/odamex-0.6.3-build.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-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.2.ebuild b/games-engines/odamex/odamex-0.6.2.ebuild
deleted file mode 100644
index a0bcd5599343..000000000000
--- a/games-engines/odamex/odamex-0.6.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 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.5 2014/05/15 16:42:25 ulm 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,sound,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 \
-		"${FILESDIR}"/${P}-libagar.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
-}
diff --git a/games-engines/odamex/odamex-0.6.3.ebuild b/games-engines/odamex/odamex-0.6.3.ebuild
deleted file mode 100644
index 426b755c5ec9..000000000000
--- a/games-engines/odamex/odamex-0.6.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 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.4 2014/05/15 16:42:25 ulm 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,sound,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
-}