version bump, remove old

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

8 files changed, 304 insertions, 236 deletions

diff --git a/games-engines/odamex/ChangeLog b/games-engines/odamex/ChangeLog
index e5c21361fc1b..f42dd2918b93 100644
--- a/games-engines/odamex/ChangeLog
+++ b/games-engines/odamex/ChangeLog
@@ -1,6 +1,16 @@
 # 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.11 2013/07/06 16:25:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.12 2013/07/31 01:45:09 hasufell Exp $
+
+*odamex-0.6.4 (31 Jul 2013)
+
+  31 Jul 2013; Julian Ospald <hasufell@gentoo.org> -odamex-0.6.1.ebuild,
+  -files/odamex-0.6.1-build.patch, +odamex-0.6.4.ebuild,
+  +files/2-odamex-0.6.4-cmake-options.patch,
+  +files/1-odamex-0.6.4-install-rules.patch,
+  +files/4-odamex-0.6.4-odalauncher-bin-path.patch,
+  +files/3-odamex-0.6.4-wad-search-path.patch:
+  version bump, remove old
 
   06 Jul 2013; Agostino Sarubbo <ago@gentoo.org> odamex-0.6.3.ebuild:
   Stable for x86, wrt bug #474376
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 262548e88ebd..61d5ae74b6dc 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,32 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX odamex-0.6.1-build.patch 5903 SHA256 9654f26beaf684831347a2970ab959b27561b9772595a4a900ce589683a5b062 SHA512 29df1ad3f86dbf6e1dc92c2c01ce3e223ed0d38eb1fe8c1e1a06c2d158f67330f68e7fa542770fe0bf68ce8d8785371959f391cf98b8334b40fd0b9cb4b635c3 WHIRLPOOL 67d757cd882831fd86a007081d465183d184a4f06f3bd7d930b634bcc6b5124c2c793ef891420a77a243e686cc46a53a9f0a44bdf65e2902187aba76aeb6491a
+AUX 1-odamex-0.6.4-install-rules.patch 2101 SHA256 cb276c2caff6e2c005c819dc21d5fc141bd159d2b1ae434892d83e15409e940e SHA512 ee3b626b1a98fa01152c7796af1614d3ffc2a09204304b5ad38d7e140007661d66638843048429feb772b10e896dc40729f681485d290ad4f29528d1539d1983 WHIRLPOOL 20e1ef6df3b64e28cef2dc56c331e44ffd48baab101b4e87d32ebff5f8f8888aea64bc1a8161c55f36f0711706398634c358a3c5bdfcc0f2325db691bf51a310
+AUX 2-odamex-0.6.4-cmake-options.patch 2343 SHA256 3905e764d877a7e5b73c05c4cf9c2470689af7474b3fb10255423e40ef48578c SHA512 6b19c4454c22c25479a33c5bfca7b524b196a7b0e42c2d12d8ed53ea37f3a04b34ae4bff18aca1dd03112504e8ad3b86046fc26ff7f3846514f943b727b7c3d1 WHIRLPOOL b3a696d85425920947f11ec9ce05d5af8f5920363fa24a3eee8fa953c065237daba71a333dd50b96f1f0b0e61c79a887742b50f7e8399cc3ee55ea3b0e0f21b0
+AUX 3-odamex-0.6.4-wad-search-path.patch 1784 SHA256 47b9e26c15638b431166d90a199618e83e1eac87ecfc66d7330b4d8ca13f041d SHA512 49fa51ca2dfdfc37ab8ee2b7a09fb433071d06531107285cc2c0c2513c4088a336772e4e93a65357b0dc1bf13ef455d40eb84bde59504845d354c3e281a149ba WHIRLPOOL 303386a6b81ca57ab7bd9faeaaeead89acd7c210a38f3286759d20fe328945f9086e2f8b7d81da63c18ca7b7b09641594928a314c69e94b50a88cef358e5ee39
+AUX 4-odamex-0.6.4-odalauncher-bin-path.patch 1497 SHA256 220ff799bc9329603b90bb4bff44238b20a7dad8b1ae093b76be9bbeeba34586 SHA512 86316f70bccbcf53b34d121636f099c6324bb79e6b85f450cea2767fdf6e475ccdcfd6da55b00b0c788144bdafe208ed39786375126a3c3e86107a54eb2fa704 WHIRLPOOL a1a3108ed3ba1077018d14a4a7e7e9bd050439b0e7e8760ad809a0806beaa28fa49758d81284b18d8ae81c12b85371a661b1663e09bca34d1479ff05bd21dd7d
 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
+DIST odamex-src-0.6.4.tar.bz2 8449818 SHA256 7832fed1e0cca992c746fd0f7e876b090c0f244f2d1d5230ffa3df8b33ce0f6a SHA512 0a917568cfc4bd4d9921cb82185cbbc318bce493bc66e489093e45401ec4c7596148778648e5078f13c50824470a040a995aa50c7956e2446c90920254c8129f WHIRLPOOL 9d95a9422ab382ccd5f4fc7d89f0558e30c604e18a33eec3bb074ae446258f030ec67d4738e1c517d89c9a4e09aea6e3a84651d7c8b1df9a88a26077c1b319b4
 EBUILD odamex-0.6.2.ebuild 2215 SHA256 beeaa771aa0daa33959f06f808100a59a48c95a712159790ed0f4cac1df67eb3 SHA512 364439cdae5956c9edd67d32e3995339c81e5c830a410e69d8ddd07d46d45464d90e19d3710d911f686bfadaddb13e215f5cf4a6cdde8e51ae9d5bd755c7559f WHIRLPOOL 15e45f6522e0b5c9c16e5acf7269ffd2c1cb8f472c2ac85164469ba07c9b90ce0ec3e23580b0fc59d1d4bb2b977382e5bad0b736d0995307861f7a3390749232
 EBUILD odamex-0.6.3.ebuild 2253 SHA256 51748738a9e1ee2a2c0d6c30394b3509428c4332c0e7f57e5ad5108ff67f463a SHA512 321e5a7ffc37c3e0ac8913226522d6edacbdc6fd7d01b6cccf7833fb5de5fed282fab3d4d53a1408c2703ec4b264eff042b6c9c4b7911f51aa1ba727c992f726 WHIRLPOOL 7eff8898c0ffc3c2d43fa59ee9c240afc0bd2784362c183307e12d701f9c43f9a7dc22b942dfbc7a4851a08377e99446acff81b47bb1561ba66f8ad7732c9c44
-MISC ChangeLog 1539 SHA256 b48eeec9ab4251cd7b8dbf1ccbd833ea79b1dad61032db898cfa3f28e63ec6cd SHA512 c9453cadfaceb217671ffe12f03c5cbafabbc25e8771e81f143417652327ed2f91baa1c3ee2df34a88e96cb32fd046c2889b0fbc45bdd7763ca6772c5c6bbe86 WHIRLPOOL fe00cb9df60b527f74a70e8af4f07637412deb57504a4c70de8e4e2b398ad6ceaadad123d8316d72d25c6615cddd39c2e5d9b87c4de1d773f7b63559a4908639
+EBUILD odamex-0.6.4.ebuild 2414 SHA256 ded88ed25350b523b0d1dad98cea7c68ed168fecceb865f08e05bd205e2366ac SHA512 dafab042ea22da1dc42f5341dae4fab095c27436ed6b4d88091bd59256991030b41f065d30bd8ecf43a622d0d7c5252af04edb7c3b9743c30c56b8f86bf3e7f3 WHIRLPOOL adcbdc26af5cd86ae345f9f3995c8753a914863af416a522e032eebd055780ff28804d1a2056c6944411cc07d9a18584d3d0b870464bcfbb05eec13a670cb764
+MISC ChangeLog 1920 SHA256 98a2949cbfe1207e4ee82b030d0bfe190f5354fd0487489709941d54fe5c378e SHA512 140ff8e44b048a0a834fb4990e50dba42e7f23494406ccaafc422e4586ac3cdca28667dc2043644022318e87e824e24d8593ad7dfc04942854448d66e785b189 WHIRLPOOL 20c6a90bb9d494afd72574418dc0c3353bf8958a074786db9d84a45dc0ea0b2b60ec370f82859abdc34a556d1eeff121a659bd3f698d054f4f25b4cdc7ede744
 MISC metadata.xml 1441 SHA256 f1c8278351d9be40c517a5b7ad079c4d1e37e23af8ecaa4e4a5f9508e360fee3 SHA512 6c9a2a5702fdfdf6c612db4fe5938c3b4ab726c1dac18ce9a9d9e21c3238a5d5a2fe0082e4b57f002a5999736e0465da304e68dbb9e172e408a90dc6ef38f7ae WHIRLPOOL d6683a9f7718e4183f8d549afc30e7e6426cf6bb9fecab023f3faa52e31c12892095a5b82052170749de666d779d1ccf96fda7e5c560580c506dd0918aded8d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR2ETeAAoJELp701BxlEWfrtwP/jgA8KBi1i8epe/5wwb0IsaQ
-UaW4LdIsJutgssLTlulCvpHBfz+K1zR2tv6riYlpa/D3x21VIPdm7JYbHg0zO+kP
-QjbecZeqIEZug3tgQzHd/FP1UpGvBqDZtcnq4BZ3UwOTZfXY10Aq8asWQiqWoCJ1
-brflwTb/nAFwy8+1UGvX7eRUBzgdzU8MIuL4PNkoJrGN8GFx9+UjAPEvi2rcjVlE
-P7Ht40gMPDGfNzockTBeUhhK87xhAbWir0FxVncNdHJfl5E/hVjNu2tRoB0YsyGD
-oWcvG5Nux+Pc92N39L4x2GHXCn7hE/XFGYOdbNmhzgFeibhHbEjlLKTaOS1pKSVU
-DCPQNRpxvei6XUGAkNNPXmg4b4BE7T4+n7sdlR6jXkraNdRNlDf299sL1IIzae0Z
-2AKlgXoXRrMog6zoDOPC90fdECi+MVlIZipaOyKOIRf4SoO1sBh+h1hbi6EXy2Kh
-+KW0L/cq2pVNNCb/+0QvajQZWSD/9IJxDOghoXsT/asA+tHQbbxbKDqjKidifSUs
-2EmUQlGDglXfgq5E7+aTJrEtfZP7hR+1iUgmkZ1VCrW2h1v3CpR8s+7w5R1sqG+m
-9wQ8dUW6yM2QhqgeofcoKqPXCHOSjpvGYuQbB3/6wN19ap6hf4TfKEkopEipS70e
-xirX3G75SEzqyFKn/yub
-=UcPZ
+iQEcBAEBCAAGBQJR+GwtAAoJEFpvPKfnPDWz2BUIAKSJwvnw02BYXNp9RqVJPm1x
+2LwyLiwk5D9cAfHeucOIHNVqPtpTWHjA6f+FvPT+g1WYGln3+5jJ0kPzhIBq7MT0
+4qzA979C/N68pO61S5hx81MYeUvMxsEgCpjZq5UUdGG2QQoYVG55OlPQsh94rMZ1
+7DZS3EGVzSvuS2vNZgzFqRYPSmLwGaxlrKPTObTKyAubhwr93lmwVF2OH6V3G9in
+5jozOQWJb8Zog4bBfq4PveCQi2p9kU45AKQCLVeUKliUt+uBs5Pb/RK4fBk9fc/N
+m5TEeXZPdjA07aLVxd412smQRJj7QW7WtcinpQ/lEmXil/lb3/GmVruulGw6Eb4=
+=UAd0
 -----END PGP SIGNATURE-----
diff --git a/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch b/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch
new file mode 100644
index 000000000000..48205033d621
--- /dev/null
+++ b/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch
@@ -0,0 +1,79 @@
+commit 04fff802ee72c08d2e1730c6c5506fc2e708d5fe
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jul 31 03:34:29 2013 +0200
+
+    BUILD: add unix install rules
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b77096a..f49a1e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,6 +2,8 @@
+ project(Odamex)

+ cmake_minimum_required(VERSION 2.8)

+ 

++# cmake modules

++include( GNUInstallDirs )

+ set(PROJECT_VERSION 0.6.4)

+ set(PROJECT_COPYRIGHT "2006-2013")

+ 

+@@ -64,3 +66,8 @@ add_subdirectory(odalaunch)
+ 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()

+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 5dd5d43..1fde0ff 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -168,5 +168,8 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
+         " )

+     endif()

+ 

++    # UNIX install rules

++  elseif(UNIX)

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

+   endif()

+ endif()

+diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
+index c1c3853..3e94b34 100644
+--- a/master/CMakeLists.txt
++++ b/master/CMakeLists.txt
+@@ -12,3 +12,8 @@ if(WIN32)
+ elseif(SOLARIS)

+   target_link_libraries(odamast socket nsl)

+ endif()

++

++# install rules

++if(UNIX)

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

++endif()

+diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
+index ff9b6e3..d2d2171 100644
+--- a/odalaunch/CMakeLists.txt
++++ b/odalaunch/CMakeLists.txt
+@@ -61,3 +61,8 @@ if(wxWidgets_FOUND)
+     )

+   endif()

+ endif()

++

++# install rules

++if(UNIX)

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

++endif()

+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index 2284a8a..a079434 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -61,3 +61,7 @@ if(UNIX AND NOT APPLE)
+   target_link_libraries(odasrv rt)

+ endif()

+ 

++# install rules

++if(UNIX)

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

++endif()

diff --git a/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch b/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch
new file mode 100644
index 000000000000..de0f0784ca97
--- /dev/null
+++ b/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch
@@ -0,0 +1,77 @@
+commit 7abf37ed186701f0170bded26df8cbb8a99a21e1
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jul 31 03:35:46 2013 +0200
+
+    BUILD: add various cmake options
+    
+    to control building client/server/odalaunch
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f49a1e8..ca01bba 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,15 @@ 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 )

+ set(PROJECT_VERSION 0.6.4)

+ set(PROJECT_COPYRIGHT "2006-2013")

+ 

+@@ -56,10 +64,22 @@ endmacro(define_platform)
+ 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.

+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 1fde0ff..9f06fa6 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -48,7 +48,7 @@ endif()
+ 

+ # 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 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
+   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()

+ 

diff --git a/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch b/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch
new file mode 100644
index 000000000000..3eb6953cfe85
--- /dev/null
+++ b/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch
@@ -0,0 +1,59 @@
+commit 3a5209e2595e459a31c111f6040dbac347df1967
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jul 31 03:38:10 2013 +0200
+
+    add odamex.wad install destination to wad search path
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca01bba..83a0e30 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,6 +12,16 @@ 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.4)

+ set(PROJECT_COPYRIGHT "2006-2013")

+ 

+diff --git a/common/d_main.cpp b/common/d_main.cpp
+index 010bdcb..6dc2e5f 100644
+--- a/common/d_main.cpp
++++ b/common/d_main.cpp
+@@ -23,6 +23,7 @@
+ //-----------------------------------------------------------------------------

+ 

+ #include "version.h"

++#include "config.h"

+ 

+ #include <sstream>

+ #include <string>

+@@ -493,6 +494,7 @@ static std::string BaseFileSearch(std::string file, std::string ext = "", std::s
+ 	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);

+diff --git a/config.h.in b/config.h.in
+new file mode 100644
+index 0000000..e91b3a6
+--- /dev/null
++++ b/config.h.in
+@@ -0,0 +1,6 @@
++#ifndef CONFIG_H
++#define CONFIG_H
++
++#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@"
++
++#endif
diff --git a/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch b/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch
new file mode 100644
index 000000000000..22244987d458
--- /dev/null
+++ b/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch
@@ -0,0 +1,51 @@
+commit a6c55c51dc251924be7eccf6637fc719a2b7ace0
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jul 31 03:38:24 2013 +0200
+
+    use CMAKE_BINDIR as default bin patch in odalauncher
+
+diff --git a/config.h.in b/config.h.in
+index e91b3a6..7019a02 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -2,5 +2,6 @@
+ #define CONFIG_H
+ 
+ #define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@"
++#define CMAKE_BINDIR "@CMAKE_INSTALL_BINDIR@"
+ 
+ #endif
+diff --git a/odalaunch/src/dlg_main.cpp b/odalaunch/src/dlg_main.cpp
+index 915b527..f01224a 100644
+--- a/odalaunch/src/dlg_main.cpp
++++ b/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>
+ #include <wx/cmdline.h>
+ 
+ #ifdef __WXMSW__
+@@ -200,10 +202,12 @@ dlgMain::dlgMain(wxWindow* parent, wxWindowID id)
+     }
+     #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.1-build.patch b/games-engines/odamex/files/odamex-0.6.1-build.patch
deleted file mode 100644
index 152d19211200..000000000000
--- a/games-engines/odamex/files/odamex-0.6.1-build.patch
+++ /dev/null
@@ -1,212 +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.1/CMakeLists.txt
-+++ odamex-src-0.6.1/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.1)

- 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.1/client/CMakeLists.txt
-+++ odamex-src-0.6.1/client/CMakeLists.txt
-@@ -52,7 +52,7 @@
- 

- # Portmidi configuration

- find_package(PortMidi)

--if(PortMidi_FOUND)

-+if(PortMidi_FOUND AND ENABLE_PORTMIDI)

-   include_directories(${PortMidi_INCLUDE_DIR})

-   ADD_DEFINITIONS(-DPORTMIDI ${PortMidi_CFLAGS})

- else()

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

-     endif()

- 

-+  # UNIX install rules

-+  elseif(UNIX)

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

-   endif()

- endif()

---- odamex-src-0.6.1/master/CMakeLists.txt
-+++ odamex-src-0.6.1/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.1/odalaunch/CMakeLists.txt
-+++ odamex-src-0.6.1/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.1/server/CMakeLists.txt
-+++ odamex-src-0.6.1/server/CMakeLists.txt
-@@ -39,3 +39,8 @@
- 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.1/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.1/client/src/d_main.cpp
-+++ odamex-src-0.6.1/client/src/d_main.cpp
-@@ -25,6 +25,7 @@
- //-----------------------------------------------------------------------------
- 
- #include "version.h"
-+#include "config.h"
- 
- #include <sstream>
- #include <string>
-@@ -836,6 +837,7 @@
- 	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
- 	D_AddSearchDir(dirs, getenv("HOME"), separator);
- 	D_AddSearchDir(dirs, waddirs.cstring(), separator);
-+	D_AddSearchDir(dirs, CMAKE_WADDIR, separator);
- 
-     dirs.erase(std::unique(dirs.begin(), dirs.end()), dirs.end());
- 
---- odamex-src-0.6.1/server/src/d_main.cpp
-+++ odamex-src-0.6.1/server/src/d_main.cpp
-@@ -25,6 +25,7 @@
- //-----------------------------------------------------------------------------
- 
- #include "version.h"
-+#include "config.h"
- 
- #include <sstream>
- #include <string>
-@@ -628,9 +629,9 @@
- 	D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
- 	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
- 	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
--    D_AddSearchDir(dirs, getenv("HOME"), separator);
--    D_AddSearchDir(dirs, waddirs.cstring(), separator);
--
-+	D_AddSearchDir(dirs, getenv("HOME"), separator);
-+	D_AddSearchDir(dirs, waddirs.cstring(), separator);
-+	D_AddSearchDir(dirs, CMAKE_WADDIR, separator);
- 
- 	dirs.erase(std::unique(dirs.begin(), dirs.end()), dirs.end());
- 
---- odamex-src-0.6.1/odalaunch/src/dlg_main.cpp
-+++ odamex-src-0.6.1/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.1.ebuild b/games-engines/odamex/odamex-0.6.4.ebuild
index ff4531bfc1dc..d8110e9cc705 100644
--- a/games-engines/odamex/odamex-0.6.1.ebuild
+++ b/games-engines/odamex/odamex-0.6.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.1.ebuild,v 1.3 2012/09/23 08:04:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/odamex-0.6.4.ebuild,v 1.1 2013/07/31 01:45:09 hasufell Exp $
 
-EAPI=4
+EAPI=5
 WX_GTK_VER="2.8"
 inherit cmake-utils eutils gnome2-utils wxwidgets games
 
@@ -13,22 +13,29 @@ SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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 "${FILESDIR}"/1-${P}-install-rules.patch \
+		"${FILESDIR}"/2-${P}-cmake-options.patch \
+		"${FILESDIR}"/3-${P}-wad-search-path.patch \
+		"${FILESDIR}"/4-${P}-odalauncher-bin-path.patch
+
+	epatch_user
 }
 
 src_configure() {