version bump

Package-Manager: portage-2.2.9-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

8 files changed, 512 insertions, 18 deletions

diff --git a/games-engines/odamex/ChangeLog b/games-engines/odamex/ChangeLog
index c04cf5c25c43..8d1a998b2255 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.14 2013/09/30 17:16:29 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.15 2014/03/27 21:20:52 hasufell Exp $
+
+*odamex-0.7.0 (27 Mar 2014)
+
+  27 Mar 2014; Julian Ospald <hasufell@gentoo.org> +odamex-0.7.0.ebuild,
+  +files/2-odamex-0.7.0-cmake-options.patch,
+  +files/1-odamex-0.7.0-install-rules.patch,
+  +files/odamex-0.7.0-miniupnpc.patch,
+  +files/4-odamex-0.7.0-odalauncher-bin-path.patch,
+  +files/3-odamex-0.7.0-wad-search-path.patch:
+  version bump
 
   30 Sep 2013; Agostino Sarubbo <ago@gentoo.org> odamex-0.6.4.ebuild:
   Stable for x86, wrt bug #486232
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 4fb308f8ba36..c56945512d35 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,35 +1,44 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
+AUX 2-odamex-0.7.0-cmake-options.patch 3459 SHA256 c396f5fe451178af9c60fa52eecbd21ccaa81b33a1cf1ca4faeb16b3c6df5fa2 SHA512 ef5ac9a88b189fb4276989e1de6e2723491777fa0cc12cd5dd38b9c992ed22e6be6892371efa4cf4af28eda85883056c27efa3ed074b878f89325333476dd19d WHIRLPOOL 561e424f12795c091aeebfb88cb15ba033d859a598b90972f7b6629e0f760921a8a03405df3c99997471db6680360d0337ab8363e7485eb84b6d2d722003e8ca
 AUX 3-odamex-0.6.4-wad-search-path.patch 1784 SHA256 47b9e26c15638b431166d90a199618e83e1eac87ecfc66d7330b4d8ca13f041d SHA512 49fa51ca2dfdfc37ab8ee2b7a09fb433071d06531107285cc2c0c2513c4088a336772e4e93a65357b0dc1bf13ef455d40eb84bde59504845d354c3e281a149ba WHIRLPOOL 303386a6b81ca57ab7bd9faeaaeead89acd7c210a38f3286759d20fe328945f9086e2f8b7d81da63c18ca7b7b09641594928a314c69e94b50a88cef358e5ee39
+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 2215 SHA256 beeaa771aa0daa33959f06f808100a59a48c95a712159790ed0f4cac1df67eb3 SHA512 364439cdae5956c9edd67d32e3995339c81e5c830a410e69d8ddd07d46d45464d90e19d3710d911f686bfadaddb13e215f5cf4a6cdde8e51ae9d5bd755c7559f WHIRLPOOL 15e45f6522e0b5c9c16e5acf7269ffd2c1cb8f472c2ac85164469ba07c9b90ce0ec3e23580b0fc59d1d4bb2b977382e5bad0b736d0995307861f7a3390749232
 EBUILD odamex-0.6.3.ebuild 2253 SHA256 51748738a9e1ee2a2c0d6c30394b3509428c4332c0e7f57e5ad5108ff67f463a SHA512 321e5a7ffc37c3e0ac8913226522d6edacbdc6fd7d01b6cccf7833fb5de5fed282fab3d4d53a1408c2703ec4b264eff042b6c9c4b7911f51aa1ba727c992f726 WHIRLPOOL 7eff8898c0ffc3c2d43fa59ee9c240afc0bd2784362c183307e12d701f9c43f9a7dc22b942dfbc7a4851a08377e99446acff81b47bb1561ba66f8ad7732c9c44
 EBUILD odamex-0.6.4.ebuild 2407 SHA256 43d0fdc7271f512f072784af3f333f2ceffb718ceaca0f7e1b0eec9bae2d7572 SHA512 a0a10e66ba33153f7366beeb12e3eae5537ca1a3ad15d735fa432803c5368d69f9d8693c055200248b1739a1b64e8b765028cfe35792fb3e75fb70a25f828cd8 WHIRLPOOL c41d5c1703e79ecbd40a30471a66b4b2c2f8bfb9d326dcf00f810987b272f5cc7e7fece966f804003b0613611c4145cbb1e48bb1fcb5804e1b76e9c051b2e76f
-MISC ChangeLog 2127 SHA256 bbb731a56027473da52c2a9b1227ea64bfa575c37361792d5c55027db5030cf3 SHA512 e2ae2643387580bea936cdffd5690212180df4d14cafc478b29bf5d114701bcf89dbe8a77fafe33a91141200ad6dd66f61eeaad96f3b6d86d321e64c4f8a3ccf WHIRLPOOL dc2de3c1bfd30d91d29ef665372340da891409eca1f61c9f0378f4cc4678741311ff0dc7ce7d218e2505eebbc49aa579b24eed02b27b2595ffa7ae3faab62716
+EBUILD odamex-0.7.0.ebuild 2716 SHA256 628b88418a3cb65e3348fdb4e39cd985087fde7237ead336b31702e192f92906 SHA512 6c3ced2193cb330a1d02cfa1c78965f51b90cc3bd4a8ecf058ec6e7e063a5b7b8ea802df1a74444d5d019a37fbc6dafa4e40415d246948ac5a440b6aa34100b1 WHIRLPOOL 260f01b9123c08ea34b4d15176a2996ac54e159b737cba6c1bfbdf60f812da07e944389cea5557fddd1cfb8f7793aa3de1528d370c8bca8e2588e3edb92b86cd
+MISC ChangeLog 2478 SHA256 240fabd9b08a3a7c0f8655da4e5bdc685a0c0746f91d7ba1d5755b6204bc7dc1 SHA512 5786283b1e8df3c93c9036e1c08ea78d60c5277bf9c4185055f009083bd3fe063e2c0f183619541e6b74bc7c94ea8bd4213941ed92da95151452ca60c64c5295 WHIRLPOOL 1594fcb541a88c81e8e00d6ee2017e2bdbb73003942626797100d121dfa918d27fd7ea9e790fe87fcb7af2060370dd394c1ba6d4080c83d4312bab78b41bed64
 MISC metadata.xml 1441 SHA256 f1c8278351d9be40c517a5b7ad079c4d1e37e23af8ecaa4e4a5f9508e360fee3 SHA512 6c9a2a5702fdfdf6c612db4fe5938c3b4ab726c1dac18ce9a9d9e21c3238a5d5a2fe0082e4b57f002a5999736e0465da304e68dbb9e172e408a90dc6ef38f7ae WHIRLPOOL d6683a9f7718e4183f8d549afc30e7e6426cf6bb9fecab023f3faa52e31c12892095a5b82052170749de666d779d1ccf96fda7e5c560580c506dd0918aded8d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSSbHkAAoJELp701BxlEWfkJEP/0uAXTKzcNtSnZLsaRrgUx+P
-+LtL7+u1bnIDDkE5yMF3KuHel/Qf4AnxMxY+vE1pJi+r8TwmOV+15mtXawqAcqT8
-54myAO2VXwCEizr/e6XZjqnX1yFYXwBHaT8z5IgUaGAeKPjM/ha890TqIYCCBxoC
-AiYXDg8mmUXwa771FENJt9EseaM1IqPqV2dJplK5xaUJ6V3i7+r6lBDjY5SVVRxS
-NcRo3GI1wP2WIwk4ExLiH1fgruw2JGFsHoUUtqK/qvtL4oABgxz91iulNDKl64pP
-yIdRNNqrwks4WBCINFSpBVosGVgBnMp1QE9ChhbpoMz4LXXf4MPghOKPBa6Pr3A1
-y/NjY9Y5eszaHSlLbrA0GFkBnbiZsLXve75fnMzuxd/AI8gsGBY/krgWcIL3VyPP
-AWpfSog8c3AgCQVfKyCHPmQZtAaDRLJ5F1pBMzL/Z3uNNUR1Ry1Y82hoLJmYArWC
-rG0CVFYBeNLbxKj3K6ArUPaCk9MHw2i7LABLOHolFg0pF0EdADxpvcw4+eTZy+7k
-AaAYhsVfJSnTgzZuX3Z1936q+Aw+DwI/iiTE/quXk3/IdG6/IpPtQGd8VEWucA8u
-2S5TFeZifTcN6u0pbqvFi6orSOeYZ/Otj0iIiqMushirC1SglvNg57Yb05/AxExB
-YnCMnmyi9nSm6vYtgbfX
-=ga2E
+iQJ8BAEBCABmBQJTNJY3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg1FMP/3IeOp1kA3JKks3QPG2RuXDG
+x5Rz6OMrkMbI8loLwrpyJtBLU3XiUQ1g58KpKXP+432sB7xuW8p65tlUOsiU4F2z
+X+UzBk9kVNT3nOZ1H3GipI6fQ6tmiozwMrmo/GLSRjKLR2JrqpIDtwQqoPf8lIeW
+Zf7PAbkHhIqIJCfZlBEuWRYqmGb89FMH4kKj6JGudRwzXU1hkfUsuQmUcx4E73CW
+fS+kbCrcePXoj17D43beq3Wi2rc37gPK0p+BFPycopupKnbk/KBX15JdSLGs6G1g
+ltb6nOg8QGGEesCH6pSYOsoExGcu7ekgnYQ9uLaWPFkRhP5kpDIjts/hv2Sm0awx
+a+v4/0kYwaP5fSacrWvDY61cNiwezA+pixLX+4wwFBBerILsWm0zZ0zz39qz/gEC
+v+U6JnPHXq8iyjtITdxxpeVXDHFlfBzLMG3mEo59DCvQViwl6e4X39fHoYxjGe+n
+YCRvsBAUw3YZu7xGIJfS6qDFfx+1IWNxQXz/F7LsGldhRVLClmmWSqnNkxfpmNXu
+c4cbEAG9hh602ztRNhF3Jjxp/s8mOkEWcs1fupmHnv86nlxQ+jsqQLv8SghNPqoM
+aAih+ovmFXHHy0UVleuZfUVB3tD4fd2duKF3lDwjVKGDRqyaL4ZNkLJmUI+5rNaF
+ozZMMjNz3UiWU5psHbG2
+=fY4C
 -----END PGP SIGNATURE-----
diff --git a/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch b/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch
new file mode 100644
index 000000000000..618f9fd87c2c
--- /dev/null
+++ b/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch
@@ -0,0 +1,89 @@
+From 1352b633388dd9d82b8cb7e3d11932d0b569da4e Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Thu, 27 Mar 2014 21:07:37 +0100
+Subject: [PATCH 1/4] make install destinations modifiable
+
+---
+ CMakeLists.txt           | 5 +++--
+ client/CMakeLists.txt    | 2 +-
+ master/CMakeLists.txt    | 4 ++++
+ odalaunch/CMakeLists.txt | 2 +-
+ server/CMakeLists.txt    | 2 +-
+ 5 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 11e52d1..262e3db 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ include(CMakeDependentOption)

++include(GNUInstallDirs)

+ 

+ project(Odamex)

+ cmake_minimum_required(VERSION 2.8)

+@@ -113,10 +114,10 @@ if(NOT APPLE)
+       set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)

+   else()

+     install(FILES odamex.wad LICENSE README

+-      DESTINATION share/odamex

++      DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex

+       COMPONENT common)

+     install(FILES ${CONFIG_SAMPLES}

+-      DESTINATION share/odamex/config-samples

++      DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex/config-samples

+       COMPONENT common)

+ 

+     option(ODAMEX_COMPONENT_PACKAGES "Create several rpm/deb packages for repository maintainers." OFF)

+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 510b820..3f73ab5 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -228,7 +228,7 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
+       COMPONENT client)

+   else()

+     install(TARGETS odamex

+-      RUNTIME DESTINATION bin

++      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

+       COMPONENT client)

+   endif()

+ endif()

+diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
+index 7fc386b..5bdc048 100644
+--- a/master/CMakeLists.txt
++++ b/master/CMakeLists.txt
+@@ -14,3 +14,7 @@ if(WIN32)
+ elseif(SOLARIS)

+   target_link_libraries(odamast socket nsl)

+ endif()

++

++if(UNIX)

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

++endif()

+diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
+index 4ca5920..0b134ef 100644
+--- a/odalaunch/CMakeLists.txt
++++ b/odalaunch/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(wxWidgets_FOUND)
+       COMPONENT odalaunch)

+   else()

+     install(TARGETS odalaunch

+-      RUNTIME DESTINATION bin

++      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

+       COMPONENT odalaunch)

+   endif()

+ 

+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index b046714..d33b974 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -73,6 +73,6 @@ elseif(WIN32)
+     COMPONENT server)

+ else()

+   install(TARGETS odasrv

+-    RUNTIME DESTINATION bin

++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

+     COMPONENT server)

+ endif()

+-- 
+1.9.1
+
diff --git a/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch b/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch
new file mode 100644
index 000000000000..1de502711406
--- /dev/null
+++ b/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch
@@ -0,0 +1,110 @@
+From 851bc58a74eadd89838c924167f27df1b9d3be37 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Thu, 27 Mar 2014 21:14:20 +0100
+Subject: [PATCH 2/4] add various cmake options
+
+---
+ CMakeLists.txt        | 26 ++++++++++++++++++++++----
+ client/CMakeLists.txt | 34 ++++++++++++++++++++--------------
+ 2 files changed, 42 insertions(+), 18 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 262e3db..91d5c50 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,13 @@
+ 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 )

++

+ project(Odamex)

+ cmake_minimum_required(VERSION 2.8)

+ 

+@@ -73,10 +80,21 @@ if(USE_INTREE_PORTMIDI)
+ endif()

+ 

+ # Subdirectories for Odamex 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 3f73ab5..7363c5a 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -107,17 +107,21 @@ include_directories(${PNG_INCLUDE_DIRS})
+ add_definitions(-DUSE_PNG)

+ 

+ # PortMidi configuration

+-if(USE_INTREE_PORTMIDI)

+-  include_directories(../libraries/portmidi/pm_common/ ../libraries/portmidi/porttime/)

+-  add_definitions(-DPORTMIDI)

++if(ENABLE_PORTMIDI)

++	if(USE_INTREE_PORTMIDI)

++	  include_directories(../libraries/portmidi/pm_common/ ../libraries/portmidi/porttime/)

++	  add_definitions(-DPORTMIDI)

++	else()

++	  find_package(PortMidi QUIET)

++	  if(PORTMIDI_FOUND)

++		include_directories(${PORTMIDI_INCLUDE_DIR})

++		add_definitions(-DPORTMIDI)

++	  else()

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

++	  endif()

++	endif()

+ else()

+-  find_package(PortMidi QUIET)

+-  if(PORTMIDI_FOUND)

+-    include_directories(${PORTMIDI_INCLUDE_DIR})

+-    add_definitions(-DPORTMIDI)

+-  else()

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

+-  endif()

++	message(STATUS "Portmidi disabled.")

+ endif()

+ 

+ # Find Mac frameworks

+@@ -147,10 +151,12 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
+   target_link_libraries(odamex ${ZLIB_LIBRARY})

+   target_link_libraries(odamex ${PNG_LIBRARY} ${ZLIB_LIBRARY})

+ 

+-  if(USE_INTREE_PORTMIDI)

+-    target_link_libraries(odamex portmidi-static)

+-  elseif(PORTMIDI_FOUND)

+-    target_link_libraries(odamex ${PORTMIDI_LIBRARIES})

++  if(ENABLE_PORTMIDI)

++	  if(USE_INTREE_PORTMIDI)

++		target_link_libraries(odamex portmidi-static)

++	  elseif(PORTMIDI_FOUND)

++		target_link_libraries(odamex ${PORTMIDI_LIBRARIES})

++	  endif()

+   endif()

+ 

+   if(WIN32)

+-- 
+1.9.1
+
diff --git a/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch b/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch
new file mode 100644
index 000000000000..77fb4e48996e
--- /dev/null
+++ b/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch
@@ -0,0 +1,67 @@
+From 9af4e992ff9fa10816beba36478c711ac2c8542a Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Thu, 27 Mar 2014 21:17:21 +0100
+Subject: [PATCH 3/4] add odamex.wad install destination to wad search path
+
+---
+ CMakeLists.txt    | 9 +++++++++
+ common/d_main.cpp | 2 ++
+ config.h.in       | 6 ++++++
+ 3 files changed, 17 insertions(+)
+ create mode 100644 config.h.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 91d5c50..a06613e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,6 +13,15 @@
+ 

+ set(PROJECT_VERSION 0.7.0)

+ set(PROJECT_COPYRIGHT "2006-2014")

++

++configure_file (

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

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

++  )

++

++include_directories(

++	${PROJECT_BINARY_DIR}

++)

+ 

+ # Default build type

+ if(NOT MSVC)

+diff --git a/common/d_main.cpp b/common/d_main.cpp
+index 31d4f59..be0ffd2 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>

+@@ -506,6 +507,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
+-- 
+1.9.1
+
diff --git a/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch b/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch
new file mode 100644
index 000000000000..acb2692e75fb
--- /dev/null
+++ b/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch
@@ -0,0 +1,58 @@
+From 672b2e61f3c0347c29746a4a22fe3ab912e88d62 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Thu, 27 Mar 2014 21:19:48 +0100
+Subject: [PATCH 4/4] use CMAKE_BINDIR as default bin patch in odalauncher
+
+---
+ config.h.in                | 1 +
+ odalaunch/src/dlg_main.cpp | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+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 a95a5f6..abbfc0a 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__
+@@ -205,10 +207,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);
+-- 
+1.9.1
+
diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch
new file mode 100644
index 000000000000..34896e2a4e8b
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch
@@ -0,0 +1,35 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Mar 27 21:16:02 UTC 2014
+Subject: unbundle miniupnpc
+
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -29,8 +29,7 @@
+ set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp)

+ 

+ # MiniUPnPc

+-set(MINIUPNPC_DIR ../libraries/libminiupnpc)

+-set(MINIUPNPC_STATIC_LIBRARIES upnpc-static)

++set(MINIUPNPC_DIR /usr/include/miniupnpc)

+ 

+ # Platform definitions

+ define_platform()

+@@ -54,7 +53,7 @@
+   ${COMMON_SOURCES} ${COMMON_HEADERS}

+   ${SERVER_SOURCES} ${SERVER_HEADERS}

+   ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES})

+-target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES})

++target_link_libraries(odasrv -lminiupnpc)

+ 

+ if(WIN32)

+   target_link_libraries(odasrv winmm wsock32)

+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,7 +71,6 @@
+ set(UPNPC_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)

+ set(UPNPC_INSTALL OFF CACHE INTERNAL "" FORCE)

+ mark_as_advanced(FORCE UPNPC_INSTALL)

+-add_subdirectory(libraries/libminiupnpc)

+ 

+ # PortMidi

+ cmake_dependent_option(USE_INTREE_PORTMIDI "Compile with the version of PortMidi included in the source tree." ON "WIN32" OFF)

diff --git a/games-engines/odamex/odamex-0.7.0.ebuild b/games-engines/odamex/odamex-0.7.0.ebuild
new file mode 100644
index 000000000000..48972456a4b4
--- /dev/null
+++ b/games-engines/odamex/odamex-0.7.0.ebuild
@@ -0,0 +1,116 @@
+# 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.7.0.ebuild,v 1.1 2014/03/27 21:20:52 hasufell Exp $
+
+EAPI=5
+WX_GTK_VER="3.0"
+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/libpng:0
+		>=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}/src-${PV:2:3}
+
+pkg_pretend() {
+	if ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	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 \
+		"${FILESDIR}"/${P}-miniupnpc.patch
+
+	rm -r libraries/libminiupnpc || die
+
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_INTREE_PORTMIDI=OFF
+		-DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}"
+		-DCMAKE_INSTALL_DATADIR="${GAMES_DATADIR}"
+		$(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
+
+	append-cxxflags -std=c++11
+
+	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
+}