fix broken d2k mod caused by incomplete install rule

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

5 files changed, 486 insertions, 10 deletions

diff --git a/games-strategy/openra/ChangeLog b/games-strategy/openra/ChangeLog
index 84b0cfc9f3ce..3135e0cdba17 100644
--- a/games-strategy/openra/ChangeLog
+++ b/games-strategy/openra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/openra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.17 2013/06/29 18:41:44 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.18 2013/07/03 22:39:27 hasufell Exp $
+
+*openra-20130514-r1 (03 Jul 2013)
+
+  03 Jul 2013; Julian Ospald <hasufell@gentoo.org> +openra-20130514-r1.ebuild,
+  +files/openra-20130514-makefile.patch:
+  fix broken d2k mod caused by incomplete install rule
 
   29 Jun 2013; Julian Ospald <hasufell@gentoo.org> openra-20130514.ebuild:
   don't build stuff in src_install
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
index 7b63eda46f61..756c12252830 100644
--- a/games-strategy/openra/Manifest
+++ b/games-strategy/openra/Manifest
@@ -3,22 +3,24 @@ Hash: SHA256
 
 AUX README.gentoo 4754 SHA256 fe5d3a65472701fdfa44fe3e27aad694a13881932f75dbbba5c1fc3464ca006f SHA512 423c2682c3a9e69ccb078399ffec2ed2cb4bf1445c86db730756457e65f90d6f56c80e09b4f5e0b0eb0501a2a692d7d2add3847f77794aaf7555574a76c75392 WHIRLPOOL 1b3a698506170f86926548ee28cd9bccb3438f39baa961a47e26dad2c3f18c31df609c7dfbb46a89237c134c264c886417143fc5cfd1dccaaedf4b931f1d0b2e
 AUX openra-20120630-sound.patch 616 SHA256 6270dee1ead19c3abefdd1f3742cffbc0af9675f50d8fbcef5a0fb1a856ce16a SHA512 a6d04128fa53cdb70bb6d5de0b529ed283349c3748b3d3d455462f9ec6e3e5defeb49dede887072f52ffe4025b5f43ade42c66708a2deeacd82f06e1b1d68f1c WHIRLPOOL ff14e623e1e0daba621ab9eb701c3665bef32ef2bd838ddf22e181885ab1245f02b5c6f4fca3de95c12bc250ff1588eb1b0becd3897df8a2261d1ab66be9de65
+AUX openra-20130514-makefile.patch 12019 SHA256 9e9591c44da2336379bb8ad12114e87efff174789d4bf8a07c8b3658f0fc58e8 SHA512 8842ecb840f854acd343774db83cac6c312b9aff2380ecf0b57a1778c2a765ca133d712d92a0c424bf105ade0978c92ca2ace3b2d629dce3a47727ebad6c0278 WHIRLPOOL 311cf8188db7bea665afa8d1d7d451db483e38dff49705dfe36b3e9b7b5343b15f4ac75dad08ce86a41ba7770da73b96bd1d0b00ffd5a03adefce891dbb8e5d9
 DIST openra-20120630.tar.gz 10330304 SHA256 f95b9d41ea4b4094ea61519f6fb0185fa242af156e2ec26dc1f2d55197470a3c SHA512 ab5996a3f48d8be227edc029d3fa7948a80756a64bca65d1936c3f4480ef5258cb62365d079cc28ba2be59796db91326c4f8c8d500ea4d2bbf3a8439d783fceb WHIRLPOOL 390b5fa57ef322e6204a23006fc3a7755178d28e115fd52fa4ca5b46ecf58f8df61b44a90ba2fe143a7fadd0be42aaf3488c3b938eaea11171636b562dfe344d
 DIST openra-20121019.tar.gz 11338976 SHA256 016dd79f759c539889c290e7bd90b3faa92e88c35c6cd20789803b30135978e9 SHA512 199a88b2a34c05787e1d5ebced15975c76b2fb45d70c613db679e7faaa158942a7ddc842ff8e0f912e4e70beb3dab4f281e62dee76899fc67582ec8c067b3556 WHIRLPOOL bf694d4e94d35dd31343b127e7c4855b3bcf56cd6559d5f6a3c3f4ee9e40f627880e79ba599d5929d8c5b49643b93c09ee9d55f35c426d08526736190a9029a2
 DIST openra-20130514.tar.gz 12592295 SHA256 0912303c7a02cf3907f618405c3605c56bcf30f053dcbbd110aba7dbad012210 SHA512 a9efddffb74b215cc9f5319f6b4613aa23116d328226c0cb428e8d2be97b03dfe45024c532c34e91d959434700a6170faa91a56b324aa2bfe1f1ce7ce96d46c4 WHIRLPOOL d91b911b76a7e3f6286f50d4d33beb6a7cb3e0035ef8b3331e6033e2487a13be8e8aac70fde30b7cbc139b71bd8bf5259a97ce0a642fcb386a3e5136223322ea
 EBUILD openra-20120630.ebuild 2040 SHA256 b3c3891ad26a81d27d4c8a68eed507026d4ce5f47eaae9fb4f485de8be114aad SHA512 a2c9fad65e1791464d6c40da95680eca2c11d745598ca2572d24783fdaf2b6d70b5a142b6938d2407b49415dad46ca53049aae15bf77c820e29bcf947afc6ed2 WHIRLPOOL 0eaf9e7aac412df5cc8d284bbe36e191c6d954dfc8fe610177b894572f7c508f2dedc7c5d5ec8e9a8ffee5e54e4f81acce4d4bc9959380447c7e6a85d5de4baf
 EBUILD openra-20121019.ebuild 2107 SHA256 13e09c553eefe18ab63a4adfc1bf8b5e7bf8d761d6a7b1c3f911a630e62ab887 SHA512 594822765e56ee6507f2bec899638736ea664bfd8bc7428608a7fc5fec0ec5cf88f912c9e5ea653a56d52eda753a9e537d589ef8b7aeaf308cc22641068d5c5b WHIRLPOOL 02a73b867ea0f10069fd9626d5a9a10e529302710e0b7749bb12db3b9c56428751ddf9e20aa1ef695395be124601ce2c125211f6ab169ec7000336057bc8aac0
+EBUILD openra-20130514-r1.ebuild 2269 SHA256 bb776516efb93d4528de42ebcc1f2f7cb462df3df6cc711660184289d647b36c SHA512 97fe19ff3418e4e781470932cd95ecad7fdc3d871535cd0433dec64328f5a2b786705d3bb584dc912914e25a6046c259f853f0f7b7421575bb5bacf9cd7d69bc WHIRLPOOL 180292c844819937d6883c88437014f2f1cfecfabe9abe3b5f1874f9fe026aa50ddbb65ad0245a6aed4c79883487b90ec796aca948ba1eefe17778abd4703021
 EBUILD openra-20130514.ebuild 2166 SHA256 957af080362d37832c45a979ff1a4b060b732214a746fc5c4aa58d9f20b7a7cd SHA512 281c9fe0d1b132ed80a6b31293796f1dd58fb26803e300fcd3b112d2ed06514c3b3d8d01f22a65f291c16f3c8f3319b1e94b07883fb6c0ec7a83866e317bf962 WHIRLPOOL e15d01658b7647c02068a127be807566fd90cfdd54b638d5e357f0e8db0d9e1cbe4bba24a5be21d4c9d84d274df28fd1e45d6303db8a7c23b7d7799fac963ac4
-MISC ChangeLog 2248 SHA256 9e8b1ef99e5de67e8b1c8ab7367ff3dd838216528502e37ff18d061203476d44 SHA512 ad3a40d2c6d57bb1f2b25b7978d4e21a2e17a30f50b236b3c1b810911236278d41bdec5738beca60f1134eb43fbcd82593c40b08ceb732958ef961c04afb3677 WHIRLPOOL f90ad17932916d46264447b6805374a1e181f156ddd0a15d19376f4f00865ac4df368a24bf1f9ab548f496343793fee134f2833ac6b6d25d30ac8791809e120c
-MISC metadata.xml 736 SHA256 81c8f238c77facfb9945cc6bb8af13ea97507b52c03d15544225de17380c0693 SHA512 6f6a505c531c6e6b1d1606c699c9d007f16a6445b61e7818908b92e566836fa7eb81028e2be134966ffcc164de0249a21ffa30d33533f43701cf0ead9688802b WHIRLPOOL 10be0c58e8725ce811f9b4bf88a16c8c581c4c2a165e46fc2999a9843277f8180195c6530ea4ea4e6bc48e04f3439ab6ef014da9333338fdbe8cb4314974a29d
+MISC ChangeLog 2459 SHA256 3e3832c5d5f93aa1704a3c9894acf480f78952580f5e551afd56576b05fc2ec8 SHA512 59f04586974bce7371515a330cf55889c20c2759cd743d4c1d53e17e955650138355eb5db0422ac4edebd1b44db34a95e88ebec05388db9a7216d1bd06338f93 WHIRLPOOL 0bd8fd801dffcb88210a9754d32220694708aab3764726106699b6dccc8ebba963299dc6eac81016d7c382330494c3f6d8c8f9dff443f3844e311c9f08704901
+MISC metadata.xml 814 SHA256 d2ef2dd5e230dd87190de36198e86a1cd368837e1c71de2212b63d0c18831d81 SHA512 1712ccc1d0f096de8da71119e21060586c2b7e232b21b85a4a34df3d5682116abf784be03cd753a64b6f34277e1e347b0295ead2cee8d8ac0aa5468421156379 WHIRLPOOL f5aa621739cd3506a768e405d9c57ef3095237c10bbe0d5fcba05ad8616307f012101928b7985c507af1f8bbffaf88b2431615cc2db5d0af2c74ab97c2c1c433
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRzy9IAAoJEFpvPKfnPDWza0AH/3CCdbltDbDXKOgdNii3L6/D
-4Wdg02vj18HNny6kb+xx/h8PRiySd+4eV7zmasCOaR2SByxTlz+ytUJ7BDE6rN7T
-KTR8znNBai+CgYWpKMM0kYgGNvl1//FH2I4K94RAMDRbjL5RWj/PeBIQ9cfiuLjR
-GQEskF3wuzSfx2ecYOq40hgXHGaFd/8bWoVrkZoPsx5VydqutuahHy2yWlBSh3qj
-ktL/L+i6nKb6KMIge8wk6Kfm0Bd3aoYC85yxOMMI4B0mwqtZ7A+Y3h7sggQcxp2a
-/t5MHBIWaKXuCGB0rmyOAbwJr43P0ZFSRxiL7Va1ba+fUTAKMu44jR9ewqP2BgY=
-=++Fq
+iQEcBAEBCAAGBQJR1KgiAAoJEFpvPKfnPDWzP+IH/0KjNVU7PMB8Siue8uAhqZhV
+3CIsmi9117UP3jlGhPIhSmiMwGkyvhr2os1C8003lI9RtXyrkB37z28CLKPs36kb
+n7yYr+x71dsCIDtqZAje49uwAzg1++Hh8i7AvWwyQtkPZH8Sl+MgCGuzoj39OfMj
+FvGCbuv8ec4wb2CKJBWT0bd/PI2y/z7IcpBTzGIq8eITFMagbsw1Qcq5cH0SDcWa
+mwCp9zFuKKNgYpkmsS1Crc8pZmZDWejMXYZULHN260+Ho3m/8CcicwR540326t5x
+FaldcouZc7f5zq54IOJMsdhrJHzp9Um4f81j3KWktfRQ/eF9KhtcRzRNeYsxbJM=
+=UaAL
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/openra/files/openra-20130514-makefile.patch b/games-strategy/openra/files/openra-20130514-makefile.patch
new file mode 100644
index 000000000000..7bc9e5486684
--- /dev/null
+++ b/games-strategy/openra/files/openra-20130514-makefile.patch
@@ -0,0 +1,369 @@
+https://github.com/OpenRA/OpenRA/pull/3500
+
+diff --git a/Makefile b/Makefile
+index 343d413..291eb4d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,34 +1,69 @@
++############################# INSTRUCTIONS #############################
++#
++# to compile, run:
++#   make
++#
++# to compile with development tools, run:
++#   make all
++#
++# to install, run:
++#   make [prefix=/foo] [bindir=/bar/bin] install
++#
++# to install with development tools, run:
++#   make [prefix=/foo] [bindir=/bar/bin] install-all
++#
++# to uninstall, run:
++#   make uninstall
++#
++# for help, run:
++#   make help
++#
++# to start the game, run:
++#   openra
++
++
++
++############################## TOOLCHAIN ###############################
++#
+ CSC         = gmcs
+ CSFLAGS     = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror
+ DEFINE      = DEBUG;TRACE
+ COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll
+-PHONY       = core tools package all mods clean distclean dependencies version
++
++
++
++######################### UTILITIES/SETTINGS ###########################
++#
++# install locations
++prefix ?= /usr/local
++datarootdir ?= $(prefix)/share
++datadir ?= $(datarootdir)
++bindir ?= $(prefix)/bin
++BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
++DATA_INSTALL_DIR = $(DESTDIR)$(datadir)/openra
++
++# install tools
++RM = rm
++RM_R = $(RM) -r
++RM_F = $(RM) -f
++CP = cp
++CP_R = $(CP) -r
++INSTALL = install
++INSTALL_DIR = $(INSTALL) -d
++INSTALL_PROGRAM = $(INSTALL) -m755
++INSTALL_DATA = $(INSTALL) -m644
++
++# program targets
++CORE = fileformats rcg rgl rsdl rnull game utility
++TOOLS = editor tsbuild ralint
++
+ VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
+ 
+-.SUFFIXES:
+-core: game renderers mods utility tsbuild
+-tools: editor ralint tsbuild
+-package: dependencies core editor docs version
+-mods: mod_ra mod_cnc mod_d2k
+-all: dependencies core tools
+-clean:
+-	@-rm -f *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+-distclean: clean
+-dependencies:
+-	@ cp -r thirdparty/*.dl* .
+-	@ cp -r thirdparty/Tao/* .
+-version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml
+-	@for i in $? ; do \
+-		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
+-		mv -f $${i}.tmp $${i} ; \
+-	done
+-default: dependencies core
+ 
+-.DEFAULT_GOAL := default
+ 
++######################## PROGRAM TARGET RULES ##########################
+ #
+ # Core binaries
+-#
+ fileformats_SRCS	:= $(shell find OpenRA.FileFormats/ -iname '*.cs')
+ fileformats_TARGET	= OpenRA.FileFormats.dll
+ fileformats_KIND	= library
+@@ -39,16 +74,14 @@ fileformats: $(fileformats_TARGET)
+ game_SRCS			:= $(shell find OpenRA.Game/ -iname '*.cs')
+ game_TARGET			= OpenRA.Game.exe
+ game_KIND			= winexe
+-game_DEPS			= $(fileformats_TARGET) 
++game_DEPS			= $(fileformats_TARGET)
+ game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
+ 					thirdparty/Tao/Tao.OpenAl.dll thirdparty/SharpFont.dll
+ game_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico
+ PROGRAMS 			+= game
+ game: $(game_TARGET)
+ 
+-#
+ # Renderer dlls
+-#
+ rsdl_SRCS			:= $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs')
+ rsdl_TARGET			= OpenRA.Renderer.SdlCommon.dll
+ rsdl_KIND			= library
+@@ -82,14 +115,13 @@ rnull_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
+ PROGRAMS 			+= rcg rgl rnull rsdl
+ renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(rsdl_TARGET)
+ 
+-#
+-# Official Mods
+-#
+-# Red Alert
++
++##### Official Mods #####
+ 
+ STD_MOD_LIBS	= $(fileformats_TARGET) $(game_TARGET)
+ STD_MOD_DEPS	= $(STD_MOD_LIBS) $(ralint_TARGET)
+ 
++# Red Alert
+ mod_ra_SRCS			:= $(shell find OpenRA.Mods.RA/ -iname '*.cs')
+ mod_ra_TARGET			= mods/ra/OpenRA.Mods.RA.dll
+ mod_ra_KIND			= library
+@@ -119,9 +151,9 @@ mod_d2k_EXTRA_CMDS	= mono --debug RALint.exe d2k
+ PROGRAMS 		+= mod_d2k
+ mod_d2k: $(mod_d2k_TARGET)
+ 
+-#
+-# Tools
+-#
++
++##### Tools #####
++
+ # Map Editor
+ editor_SRCS			:= $(shell find OpenRA.Editor/ -iname '*.cs')
+ editor_TARGET			= OpenRA.Editor.exe
+@@ -163,13 +195,8 @@ OpenRA.TilesetBuilder.Surface.resources:
+ 	resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null
+ tsbuild: OpenRA.TilesetBuilder.frmBuilder.resources OpenRA.TilesetBuilder.frmNew.resources OpenRA.TilesetBuilder.Surface.resources $(tsbuild_TARGET)
+ 
+-#
+-# Launchers / Utilities
+-#
+-# Patches binary headers to work around a mono bug
+-fixheader.exe: packaging/fixheader.cs
+-	@echo CSC fixheader.exe
+-	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
++
++##### Launchers / Utilities #####
+ 
+ # Backend for the launcher apps - queries game/mod info and applies actions to an install
+ utility_SRCS		:= $(shell find OpenRA.Utility/ -iname '*.cs')
+@@ -180,11 +207,13 @@ utility_LIBS        = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.Shar
+ PROGRAMS 			+= utility
+ utility: $(utility_TARGET)
+ 
+-.PHONY: $(PHONY) $(PROGRAMS)
+ 
+-#
++# Patches binary headers to work around a mono bug
++fixheader.exe: packaging/fixheader.cs
++	@echo CSC fixheader.exe
++	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
++
+ # Generate build rules for each target defined above in PROGRAMS
+-#
+ define BUILD_ASSEMBLY
+ 
+ $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
+@@ -203,68 +232,65 @@ endef
+ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
+ 
+ 
++
++########################## MAKE/INSTALL RULES ##########################
+ #
+-# Install / Uninstall for *nix
+-#
+-prefix ?= /usr/local
+-datarootdir ?= $(prefix)/share
+-datadir ?= $(datarootdir)
+-bindir ?= $(prefix)/bin
+-BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
+-INSTALL_DIR = $(DESTDIR)$(datadir)/openra
+-INSTALL = install
+-INSTALL_PROGRAM = $(INSTALL)
+-CORE = fileformats rcg rgl rsdl rnull game editor utility tsbuild
++default: dependencies core
++
++core: game renderers mods utility tsbuild
++
++tools: editor tsbuild ralint
++
++package: dependencies core editor docs version
++
++mods: mod_ra mod_cnc mod_d2k
++
++all: dependencies core tools
++
++clean:
++	@-$(RM_F) *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
++
++distclean: clean
++
++dependencies:
++	@ $(CP_R) thirdparty/*.dl* .
++	@ $(CP_R) thirdparty/Tao/* .
++
++version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml
++	@for i in $? ; do \
++		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
++		mv -f $${i}.tmp $${i} ; \
++	done
+ 
+ # Documentation (d2k depends on all mod libraries)
+-docs:
++docs: utility
+ 	@mono --debug OpenRA.Utility.exe --docs d2k > DOCUMENTATION.md
+ 
+-install: all
+-	@-echo "Installing OpenRA to $(INSTALL_DIR)"
+-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)
+-	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
+-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/cnc
+-	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) $(INSTALL_DIR)/mods/cnc
+-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
+-	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(INSTALL_DIR)/mods/ra
+-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/d2k
+-	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) $(INSTALL_DIR)/mods/d2k
+-
+-	@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
+-	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
+-	@cp -r mods/cnc/chrome $(INSTALL_DIR)/mods/cnc
+-	@cp -r mods/cnc/bits $(INSTALL_DIR)/mods/cnc
+-	@cp -r mods/cnc/rules $(INSTALL_DIR)/mods/cnc
+-	@cp -r mods/cnc/sequences $(INSTALL_DIR)/mods/cnc
+-	@cp -r mods/cnc/tilesets $(INSTALL_DIR)/mods/cnc
+-	@cp -r mods/cnc/uibits $(INSTALL_DIR)/mods/cnc
+-
+-	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
+-	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
+-	@cp -r mods/ra/bits $(INSTALL_DIR)/mods/ra
+-	@cp -r mods/ra/chrome $(INSTALL_DIR)/mods/ra
+-	@cp -r mods/ra/rules $(INSTALL_DIR)/mods/ra
+-	@cp -r mods/ra/tilesets $(INSTALL_DIR)/mods/ra
+-	@cp -r mods/ra/uibits $(INSTALL_DIR)/mods/ra
+-	
+-	@-cp $(foreach f,$(shell ls mods/d2k --hide=*.dll),mods/d2k/$(f)) $(INSTALL_DIR)/mods/d2k
+-	@cp -r mods/d2k/maps $(INSTALL_DIR)/mods/d2k
+-	@cp -r mods/d2k/bits $(INSTALL_DIR)/mods/d2k
+-	@cp -r mods/d2k/chrome $(INSTALL_DIR)/mods/d2k
+-	@cp -r mods/d2k/rules $(INSTALL_DIR)/mods/d2k
+-	@cp -r mods/d2k/tilesets $(INSTALL_DIR)/mods/d2k
+-	@cp -r mods/d2k/uibits $(INSTALL_DIR)/mods/d2k
+-
+-	@cp -r glsl $(INSTALL_DIR)
+-	@cp -r cg $(INSTALL_DIR)
+-	@cp *.ttf $(INSTALL_DIR)
+-	@cp thirdparty/Tao/* $(INSTALL_DIR)
+-	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
+-	@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll $(INSTALL_DIR)
+-	@$(INSTALL_PROGRAM) thirdparty/SharpFont.dll $(INSTALL_DIR)
+-	@cp thirdparty/SharpFont.dll.config $(INSTALL_DIR)
+-	@$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll $(INSTALL_DIR)
++install: install-core
++
++install-all: install-core install-tools
++
++install-core: default
++	@-echo "Installing OpenRA to $(DATA_INSTALL_DIR)"
++	@$(INSTALL_DIR) $(DATA_INSTALL_DIR)
++	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(DATA_INSTALL_DIR)
++	@$(INSTALL_DIR) $(DATA_INSTALL_DIR)/mods
++	@$(CP_R) mods/cnc $(DATA_INSTALL_DIR)/mods/
++	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) $(DATA_INSTALL_DIR)/mods/cnc
++	@$(CP_R) mods/ra $(DATA_INSTALL_DIR)/mods/
++	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(DATA_INSTALL_DIR)/mods/ra
++	@$(CP_R) mods/d2k $(DATA_INSTALL_DIR)/mods/
++	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) $(DATA_INSTALL_DIR)/mods/d2k
++
++	@$(CP_R) glsl $(DATA_INSTALL_DIR)
++	@$(CP_R) cg $(DATA_INSTALL_DIR)
++	@$(CP) *.ttf $(DATA_INSTALL_DIR)
++	@$(CP) thirdparty/Tao/* $(DATA_INSTALL_DIR)
++	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(DATA_INSTALL_DIR)
++	@$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll $(DATA_INSTALL_DIR)
++	@$(INSTALL_PROGRAM) thirdparty/SharpFont.dll $(DATA_INSTALL_DIR)
++	@$(CP) thirdparty/SharpFont.dll.config $(DATA_INSTALL_DIR)
++	@$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll $(DATA_INSTALL_DIR)
+ 
+ 	@echo "#!/bin/sh" 				>  openra
+ 	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra
+@@ -273,6 +299,16 @@ install: all
+ 	@echo 'cd "$${DATADIR}/openra"' 		>> openra
+ 	@echo 'exec mono OpenRA.Game.exe "$$@"' 	>> openra
+ 
++	@$(INSTALL_DIR) $(BIN_INSTALL_DIR)
++	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
++
++	@-$(RM) openra
++
++install-tools: tools
++	@-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)"
++	@$(INSTALL_DIR) $(DATA_INSTALL_DIR)
++	@$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) $(DATA_INSTALL_DIR)
++
+ 	@echo "#!/bin/sh" 				>  openra-editor
+ 	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra-editor
+ 	@echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' 	>> openra-editor
+@@ -280,14 +316,42 @@ install: all
+ 	@echo 'cd "$${DATADIR}/openra"'			>> openra-editor
+ 	@echo 'exec mono OpenRA.Editor.exe "$$@"'	>> openra-editor
+ 
+-	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
+-	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
++	@$(INSTALL_DIR) $(BIN_INSTALL_DIR)
+ 	@$(INSTALL_PROGRAM) -m +rx openra-editor $(BIN_INSTALL_DIR)
+ 
+-	@-rm openra
+-	@-rm openra-editor
++	@-$(RM) openra-editor
+ 
+ uninstall:
+-	@-rm -r $(INSTALL_DIR)
+-	@-rm $(DESTDIR)$(bindir)/openra
+-	@-rm $(DESTDIR)$(bindir)/openra-editor
++	@-$(RM_R) $(DATA_INSTALL_DIR)
++	@-$(RM_F) $(BIN_INSTALL_DIR)/openra
++	@-$(RM_F) $(BIN_INSTALL_DIR)/openra-editor
++
++help:
++	@echo to compile, run:
++	@echo \ \ make
++	@echo
++	@echo to compile with development tools, run:
++	@echo \ \ make all
++	@echo
++	@echo to install, run:
++	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install
++	@echo
++	@echo to install with development tools, run:
++	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install-all
++	@echo
++	@echo to uninstall, run:
++	@echo \ \ make uninstall
++	@echo
++	@echo to start the game, run:
++	@echo \ \ openra
++
++
++
++
++########################### MAKEFILE SETTINGS ##########################
++#
++.DEFAULT_GOAL := default
++
++.SUFFIXES:
++
++.PHONY: core tools package all mods clean distclean dependencies version $(PROGRAMS)
diff --git a/games-strategy/openra/metadata.xml b/games-strategy/openra/metadata.xml
index 3fa146948ba2..c49b86241916 100644
--- a/games-strategy/openra/metadata.xml
+++ b/games-strategy/openra/metadata.xml
@@ -19,5 +19,7 @@
 	</upstream>
 	<use>
 		<flag name="cg">NVIDIA toolkit plugin</flag>
+		<flag name="tools">Install some development tools
+			such as editor.</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-strategy/openra/openra-20130514-r1.ebuild b/games-strategy/openra/openra-20130514-r1.ebuild
new file mode 100644
index 000000000000..a5ed03b1fdcb
--- /dev/null
+++ b/games-strategy/openra/openra-20130514-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/openra-20130514-r1.ebuild,v 1.1 2013/07/03 22:39:27 hasufell Exp $
+
+EAPI=5
+
+inherit eutils mono-env gnome2-utils vcs-snapshot games
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
+HOMEPAGE="http://open-ra.org/"
+SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg tools"
+
+DEPEND="dev-dotnet/libgdiplus
+	dev-lang/mono
+	media-libs/freetype:2[X]
+	media-libs/libsdl[X,opengl,video]
+	media-libs/openal
+	virtual/jpeg
+	virtual/opengl
+	cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	# register game-version
+	sed \
+		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
+		-i mods/{ra,cnc,d2k}/mod.yaml || die
+}
+
+src_compile() {
+	emake $(usex tools "all" "")
+}
+
+src_install() {
+	emake \
+		datadir="${GAMES_DATADIR}" \
+		bindir="${GAMES_BINDIR}" \
+		libdir="$(games_get_libdir)/${PN}" \
+		DESTDIR="${D}" \
+		$(usex tools "install-all" "install")
+
+	# icons
+	insinto /usr/share/icons/
+	doins -r packaging/linux/hicolor
+
+	# desktop entries
+	local myrenderer=$(usex cg Cg Gl)
+	make_desktop_entry "${PN} Game.Mods=cnc Graphics.Renderer=${myrenderer}" \
+		"OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra Graphics.Renderer=${myrenderer}" \
+		"OpenRA RA" ${PN}
+	make_desktop_entry "${PN} Game.Mods=d2k Graphics.Renderer=${myrenderer}" \
+		"OpenRA Dune2k" ${PN}
+	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
+
+	dodoc "${FILESDIR}"/README.gentoo README.md HACKING CHANGELOG
+
+	# file permissions
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	if ! use cg ; then
+		elog "If you have problems starting the game consider switching"
+		elog "to Graphics.Renderer=Cg in openra*.desktop or manually"
+		elog "run:"
+		elog "${PN} Game.Mods=\$mod Graphics.Renderer=Cg"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}