diff --git a/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild b/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild
index b702108c..98e5cce7 100644
--- a/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild
+++ b/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild
@@ -6,21 +6,24 @@ EAPI=3
 
 inherit games
 
-MY_PV="r${PV%_*}-alpha"
-MY_PN=${PN%-data}
-MY_P=${MY_PN}-${MY_PV}
+MY_PN="${PN%-data}"
+MY_P="${MY_PN}-r${PV%_*}-alpha"
 
 DESCRIPTION="Data files for 0ad"
 HOMEPAGE="http://wildfiregames.com/0ad/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
 
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 LPPL-1.3c BitstreamVera"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
 src_install() {
 	insinto "${GAMES_DATADIR}"/${MY_PN}
 	doins -r binaries/data/* || die
diff --git a/games-strategy/0ad-data/0ad-data-11863_alpha10.ebuild b/games-strategy/0ad-data/0ad-data-11863_alpha10.ebuild
new file mode 100644
index 00000000..0a85cde5
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-11863_alpha10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit games
+
+MY_PN="${PN%-data}"
+MY_P="${MY_PN}-r${PV%_*}-alpha"
+
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="http://wildfiregames.com/0ad/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
+
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/${MY_PN}
+	doins -r binaries/data/* || die
+	prepgamesdirs
+}
diff --git a/games-strategy/0ad-data/ChangeLog b/games-strategy/0ad-data/ChangeLog
new file mode 100644
index 00000000..7fa75315
--- /dev/null
+++ b/games-strategy/0ad-data/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for games-strategy/0ad-data
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*0ad-data-11863_alpha10 (15 May 2012)
+
+  15 May 2012; Julian Ospald <hasufell@gentoo.org>
+  +0ad-data-11863_alpha10.ebuild:
+  version bump
+
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 3c02d8c9..f0800df6 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,2 +1,6 @@
 DIST 0ad-r11339-alpha-unix-data.tar.xz 294663484 RMD160 0955d2cc141f16bb1b0cbd58265e72e2b906cb7d SHA1 9178093bd71251b27bc2c85189f657a91c4e34b5 SHA256 ac4cb17478eed633e1b0c975b052706797628fac399147d6301c4001100170b4
-EBUILD 0ad-data-11339_alpha9.ebuild 563 RMD160 1979c73f79198c3a0720173c983ea2ab43d112af SHA1 9685a40f59b7077474ee061f06c5f4db5b9ad339 SHA256 e5c7f1da1ed3594ef05919c09033071d4942b9ba769519d241c4a54d7bb6a947
+DIST 0ad-r11863-alpha-unix-data.tar.xz 310994700 RMD160 2cbbd285d3710bf18c78cfdf2ebb9cf59ab7d188 SHA1 d46831056023be70e9c2c3bed5bb84bdbcd9b2aa SHA256 76702023402361d27b61eea37034b08e9e19b282e4cdd69954495d2dd087b90a
+EBUILD 0ad-data-11339_alpha9.ebuild 641 RMD160 96b5d90351c641146796e41f61e7253e5d51421b SHA1 d02d71523117bacf37e8e9f7f1131b99e21a9380 SHA256 91762c45347be536bfa017eec464cf7f60745ae40eda6c2ec2e8315ee746cd92
+EBUILD 0ad-data-11863_alpha10.ebuild 646 RMD160 3eee9cf45eef4d984dc50bff8042801380b02736 SHA1 041dae6d0db03d5e8645edc6072cf2b2bfe70e93 SHA256 99fb276d2b5e803b353b1e238be540b7f02b9d47297cc144bc97bfbd89b2c2f6
+MISC ChangeLog 264 RMD160 a7ed9698426aaa19f2ee2a4a9fd9b48e5bd23d8a SHA1 20383082036313b049fed22fbf8aa2a9fa967dda SHA256 4a7f4fc4d77a2709d22139340f3f958d63a1c085876b8de7c8ad59854880148c
+MISC metadata.xml 215 RMD160 99304bade5657c954cc3bcec3354e9fb69a9c572 SHA1 0255376b4f976b5f674aaebab88e2616289ba447 SHA256 592b21f1ecb71d6f5ff9509c8a334b54992e17a7845383c0e447e495c71601a3
diff --git a/games-strategy/0ad-data/metadata.xml b/games-strategy/0ad-data/metadata.xml
new file mode 100644
index 00000000..841f145b
--- /dev/null
+++ b/games-strategy/0ad-data/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-wanted@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/games-strategy/0ad/0ad-10803.ebuild b/games-strategy/0ad/0ad-10803.ebuild
deleted file mode 100644
index ef5061b9..00000000
--- a/games-strategy/0ad/0ad-10803.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils wxwidgets games
-
-MY_P="0ad-r${PV}-alpha"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="0 A.D. is a free, real-time strategy game currently under development by Wildfire Games."
-HOMEPAGE="http://wildfiregames.com/0ad/"
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz
-	mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug editor pch test"
-
-RDEPEND=">=dev-lang/spidermonkey-1.8.5
-	dev-libs/boost
-	dev-libs/libxml2
-	media-libs/devil
-	media-libs/openal
-	media-libs/libogg
-	media-libs/libpng
-	media-libs/libsdl[joystick]
-	media-libs/libvorbis
-	net-libs/enet:1.3
-	net-misc/curl
-	sys-libs/zlib
-	virtual/fam
-	virtual/jpeg
-	virtual/opengl
-	editor? ( x11-libs/wxGTK:2.8 )"
-
-DEPEND="${RDEPEND}
-	app-arch/zip
-	dev-lang/nasm
-	dev-util/cmake"
-
-RESTRICT="strip mirror"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-pkg_setup() {
-	games_pkg_setup
-	if use editor ; then
-		WX_GTK_VER=2.8 need-wxwidgets unicode
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/premake-archless.patch
-	epatch "${FILESDIR}"/premake-script-archless.patch
-}
-
-src_compile() {
-	UPDATE_ARGS="--with-system-enet --with-system-mozjs185"
-
-	if ! use editor ; then
-		UPDATE_ARGS="${UPDATE_ARGS} --disable-atlas"
-	fi
-
-	cd "${S}/build/workspaces"
-	einfo "Running update-workspaces.sh with ${UPDATE_ARGS}"
-	./update-workspaces.sh ${UPDATE_ARGS} || die "update-workspaces.sh failed"
-	cd gcc
-
-	TARGETS="pyrogenesis Collada"
-	if use test ; then
-		TARGETS="${TARGETS} test"
-	fi
-	if use editor ; then
-		TARGETS="${TARGETS} AtlasUI"
-	fi
-	if use debug ; then
-		CONFIG=Debug
-	else
-		CONFIG=Release
-	fi
-	CONFIG=${CONFIG} emake ${TARGETS} || die "Can't build"
-}
-
-src_test() {
-	cd "${S}/binaries/system"
-	if use debug ; then
-		./test_dbg || die "Tests failed"
-	else
-		./test || die "Tests failed"
-	fi
-}
-
-src_install() {
-	cd "${S}"/binaries
-	insinto "${dir}"
-	doins -r data || die "doins -r failed"
-
-	insinto "${dir}"/system
-
-	doins "${S}"/binaries/system/libnvcore.so || die "doins failed"
-	doins "${S}"/binaries/system/libnvimage.so || die "doins failed"
-	doins "${S}"/binaries/system/libnvmath.so || die "doins failed"
-	doins "${S}"/binaries/system/libnvtt.so || die "doins failed"
-
-	if use debug ; then
-#		doins "${S}"/binaries/system/libmozjs185-ps-debug.so.1.0 || die "doins failed"
-		doins "${S}"/binaries/system/libCollada_dbg.so || die "doins failed"
-		if use editor ; then
-			doins "${S}"/binaries/system/libAtlasUI_dbg.so || die "doins failed"
-		fi
-		EXE_NAME=pyrogenesis_dbg
-	else
-#		doins "${S}"/binaries/system/libmozjs185-ps-release.so.1.0 || die "doins failed"
-		doins "${S}"/binaries/system/libCollada.so || die "doins failed"
-		if use editor ; then
-			doins "${S}"/binaries/system/libAtlasUI.so || die "doins failed"
-		fi
-		EXE_NAME=pyrogenesis
-	fi
-
-	exeinto "${dir}"/system
-	doexe "${S}"/binaries/system/${EXE_NAME} || die "doexe failed"
-
-	games_make_wrapper ${PN} ./system/${EXE_NAME} ${dir}
-	doicon "${S}"/build/resources/0ad.png
-	make_desktop_entry "${dir}"/system/${EXE_NAME} "0 A.D."
-
-	prepgamesdirs
-}
diff --git a/games-strategy/0ad/0ad-11339_alpha9.ebuild b/games-strategy/0ad/0ad-11339_alpha9.ebuild
index 529b43ab..dfe31a85 100644
--- a/games-strategy/0ad/0ad-11339_alpha9.ebuild
+++ b/games-strategy/0ad/0ad-11339_alpha9.ebuild
@@ -8,103 +8,86 @@ WX_GTK_VER="2.8"
 
 inherit eutils wxwidgets games
 
-MY_PV="r${PV%_*}-alpha"
-MY_P=${PN}-${MY_PV}
+MY_P="${PN}-r${PV%_*}-alpha"
 
 DESCRIPTION="A free, real-time strategy game"
 HOMEPAGE="http://wildfiregames.com/0ad/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1 MIT CCPL-Attribution-ShareAlike-3.0 as-is"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+audio +editor fam pch test"
+KEYWORDS="~amd64 ~x86"
+IUSE="+audio editor fam pch test"
 
 RDEPEND="
-	>=dev-lang/spidermonkey-1.8.5
+	~dev-lang/spidermonkey-1.8.5
 	dev-libs/boost
 	dev-libs/libxml2
 	~games-strategy/0ad-data-${PV}
+	media-gfx/nvidia-texture-tools
 	media-libs/libpng:0
-	media-libs/libsdl[X,audio?,opengl,video]
+	media-libs/libsdl[X,opengl,video]
 	net-libs/enet:1.3
 	net-misc/curl
 	sys-libs/zlib
 	virtual/jpeg
 	virtual/opengl
+	x11-libs/libX11
 	audio? ( media-libs/libogg
 		media-libs/libvorbis
 		media-libs/openal )
-	editor? ( x11-libs/wxGTK:2.8[X] )
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 	fam? ( virtual/fam )
 	"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	# respect flags for 3rd party fcollada
-	epatch "${FILESDIR}"/11339_alpha9-fcollada-makefile.patch
+	epatch "${FILESDIR}"/${P}-{fcollada-makefile,test}.patch
 }
 
 src_configure() {
 	cd build/workspaces || die
 
-	# custom configure script
-	local myconf
-	myconf="--without-nvtt"
-	use fam || myconf="${myconf} --without-fam"
-	use pch || myconf="${myconf} --without-pch"
-	use test || myconf="${myconf} --without-tests"
-	use audio || myconf="${myconf} --without-audio"
-
-	# don't use bundled sources
 	./update-workspaces.sh \
 		--with-system-nvtt \
 		--with-system-enet \
 		--with-system-mozjs185 \
+		$(usex fam "" "--without-fam") \
+		$(usex pch "" "--without-pch") \
+		$(usex test "" "--without-tests") \
+		$(usex audio "" "--without-audio") \
 		$(use_enable editor atlas) \
 		--bindir="${GAMES_BINDIR}" \
 		--libdir="$(games_get_libdir)"/${PN} \
-		--datadir="${GAMES_DATADIR}"/${PN} \
-		${myconf} || die
+		--datadir="${GAMES_DATADIR}"/${PN}
 }
 
 src_compile() {
-	cd build/workspaces/gcc || die
-
-	emake CONFIG=Release verbose=1 || die
+	emake -C build/workspaces/gcc verbose=1 || die
 }
 
 src_test() {
 	cd binaries/system || die
-
-	if use nvtt ; then
-		./test || die "test phase failed"
-	else
-		ewarn "Skipping tests because USE nvtt is disabled"
-	fi
+	./test || die "test phase failed"
 }
 
 src_install() {
-	# bin
 	dogamesbin binaries/system/pyrogenesis || die
 
-	# libs
 	exeinto "$(games_get_libdir)"/${PN}
 	doexe binaries/system/libCollada.so || die
 	if use editor ; then
 		doexe binaries/system/libAtlasUI.so || die
 	fi
 
-	# other
-	dodoc binaries/system/readme.txt || die
-	doicon build/resources/${PN}.png || die
+	dodoc binaries/system/readme.txt
+	doicon build/resources/${PN}.png
 	games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
-	make_desktop_entry ${PN} ${PN} ${PN}
+	make_desktop_entry ${PN}
 
-	# permissions
 	prepgamesdirs
 }
diff --git a/games-strategy/0ad/0ad-11863_alpha10.ebuild b/games-strategy/0ad/0ad-11863_alpha10.ebuild
new file mode 100644
index 00000000..60c0818b
--- /dev/null
+++ b/games-strategy/0ad/0ad-11863_alpha10.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+WX_GTK_VER="2.8"
+
+inherit eutils wxwidgets games
+
+MY_P="${PN}-r${PV%_*}-alpha"
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://wildfiregames.com/0ad/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CCPL-Attribution-ShareAlike-3.0 as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+audio editor fam pch test"
+
+RDEPEND="
+	~dev-lang/spidermonkey-1.8.5
+	dev-libs/boost
+	dev-libs/libxml2
+	~games-strategy/0ad-data-${PV}
+	media-gfx/nvidia-texture-tools
+	media-libs/libpng:0
+	media-libs/libsdl[X,opengl,video]
+	net-libs/enet:1.3
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/libX11
+	audio? ( media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal )
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	fam? ( virtual/fam )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	cd build/workspaces || die
+
+	./update-workspaces.sh \
+		--with-system-nvtt \
+		--with-system-enet \
+		--with-system-mozjs185 \
+		$(usex fam "" "--without-fam") \
+		$(usex pch "" "--without-pch") \
+		$(usex test "" "--without-tests") \
+		$(usex audio "" "--without-audio") \
+		$(use_enable editor atlas) \
+		--bindir="${GAMES_BINDIR}" \
+		--libdir="$(games_get_libdir)"/${PN} \
+		--datadir="${GAMES_DATADIR}"/${PN}
+}
+
+src_compile() {
+	emake -C build/workspaces/gcc verbose=1 || die
+}
+
+src_test() {
+	cd binaries/system || die
+	./test || die "test phase failed"
+}
+
+src_install() {
+	dogamesbin binaries/system/pyrogenesis || die
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe binaries/system/libCollada.so || die
+	if use editor ; then
+		doexe binaries/system/libAtlasUI.so || die
+	fi
+
+	dodoc binaries/system/readme.txt
+	doicon build/resources/${PN}.png
+	games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
+	make_desktop_entry ${PN}
+
+	prepgamesdirs
+}
diff --git a/games-strategy/0ad/0ad-99999.ebuild b/games-strategy/0ad/0ad-99999.ebuild
index 0143b1db..85c6a2e2 100644
--- a/games-strategy/0ad/0ad-99999.ebuild
+++ b/games-strategy/0ad/0ad-99999.ebuild
@@ -21,25 +21,27 @@ KEYWORDS=""
 IUSE="+audio +editor fam +pch test"
 
 RDEPEND="
-	>=dev-lang/spidermonkey-1.8.5
+	~dev-lang/spidermonkey-1.8.5
 	dev-libs/boost
 	dev-libs/libxml2
 	!games-strategy/0ad-data
+	media-gfx/nvidia-texture-tools
 	media-libs/libpng:0
-	media-libs/libsdl[X,audio?,opengl,video]
+	media-libs/libsdl[X,opengl,video]
 	net-libs/enet:1.3
 	net-misc/curl
 	sys-libs/zlib
 	virtual/jpeg
 	virtual/opengl
+	x11-libs/libX11
 	audio? ( media-libs/libogg
 		media-libs/libvorbis
 		media-libs/openal )
-	editor? ( x11-libs/wxGTK:2.8[X] )
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 	fam? ( virtual/fam )
 	"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
 S=${WORKDIR}/trunk
@@ -57,48 +59,30 @@ src_unpack() {
 	subversion_src_unpack
 }
 
-src_prepare() {
-	# respect flags for 3rd party fcollada
-	epatch "${FILESDIR}"/11339_alpha9-fcollada-makefile.patch
-}
-
 src_configure() {
 	cd build/workspaces || die
 
-	# custom configure script
-	local myconf
-	myconf="--without-nvtt"
-	use fam || myconf="${myconf} --without-fam"
-	use pch || myconf="${myconf} --without-pch"
-	use test || myconf="${myconf} --without-tests"
-	use audio || myconf="${myconf} --without-audio"
-
-	# don't use bundled sources
 	./update-workspaces.sh \
 		--with-system-nvtt \
 		--with-system-enet \
 		--with-system-mozjs185 \
+		$(usex fam "" "--without-fam") \
+		$(usex pch "" "--without-pch") \
+		$(usex test "" "--without-tests") \
+		$(usex audio "" "--without-audio") \
 		$(use_enable editor atlas) \
 		--bindir="${GAMES_BINDIR}" \
 		--libdir="$(games_get_libdir)"/${PN} \
-		--datadir="${GAMES_DATADIR}"/${PN} \
-		${myconf} || die
+		--datadir="${GAMES_DATADIR}"/${PN}
 }
 
 src_compile() {
-	cd build/workspaces/gcc || die
-
-	emake CONFIG=Release verbose=1 || die
+	emake -C build/workspaces/gcc verbose=1 || die
 }
 
 src_test() {
 	cd binaries/system || die
-
-	if use nvtt ; then
-		./test || die "test phase failed"
-	else
-		ewarn "Skipping tests because USE nvtt is disabled"
-	fi
+	./test || die "test phase failed"
 }
 
 src_install() {
@@ -117,10 +101,10 @@ src_install() {
 	fi
 
 	# other
-	dodoc binaries/system/readme.txt || die
-	doicon build/resources/${PN}.png || die
+	dodoc binaries/system/readme.txt
+	doicon build/resources/${PN}.png
 	games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
-	make_desktop_entry ${PN} ${PN} ${PN}
+	make_desktop_entry ${PN}
 
 	# permissions
 	prepgamesdirs
diff --git a/games-strategy/0ad/ChangeLog b/games-strategy/0ad/ChangeLog
new file mode 100644
index 00000000..948d8fcd
--- /dev/null
+++ b/games-strategy/0ad/ChangeLog
@@ -0,0 +1,21 @@
+# ChangeLog for games-strategy/0ad
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*0ad-11863_alpha10 (15 May 2012)
+
+  15 May 2012; Julian Ospald <hasufell@gentoo.org> +0ad-11863_alpha10.ebuild:
+  version bump
+
+  24 Apr 2012; hasufell <julian.ospald@googlemail.com> 0ad-11339_alpha9.ebuild,
+  0ad-99999.ebuild:
+  fix test phase (was referring to non-existent useflag)
+
+*0ad-99999 (14 Apr 2012)
+*0ad-11339_alpha9 (14 Apr 2012)
+
+  14 Apr 2012; hasufell <julian.ospald@googlemail.com>
+  +files/11339_alpha9-fcollada-makefile.patch, +0ad-11339_alpha9.ebuild,
+  +0ad-99999.ebuild, +metadata.xml:
+  New Ebuild for bug 278541 thanks to mgorny and binki
+
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index fa5fc354..9274fb07 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,7 +1,9 @@
-AUX 11339_alpha9-fcollada-makefile.patch 1069 RMD160 d9155d60bd47eb83876f3b65c92d6c2384f87bdc SHA1 a04d8aea0c8ea6e13d0c123c5590eaf3b45d10cf SHA256 11ed3a1d83c2784d590ec047750cd1cc56932ad2e10203f70f72d19fe879464f
-DIST 0ad-r10803-alpha-unix-build.tar.xz 8609092 RMD160 bab976f5f4b04c6256418293758a19fc6471fc40 SHA1 9c9ee04bf1327bfd9161f51b18180ec8d3c6547b SHA256 fbf91d8482267384f8fb3fdd8a71e79ed71d73489c531f814fca70840043b928
-DIST 0ad-r10803-alpha-unix-data.tar.xz 264532800 RMD160 5dcdc8c2e01c6880b4a695e5380bc6824b8ecc42 SHA1 98d17a118d0a5cfe79140ddb2a24bfd3a376c28a SHA256 cb4d2b4c4ce1eadff4d34127664a6de02f9b062007275507d80d9ee6ebbae7d9
+AUX 0ad-11339_alpha9-fcollada-makefile.patch 1069 RMD160 d9155d60bd47eb83876f3b65c92d6c2384f87bdc SHA1 a04d8aea0c8ea6e13d0c123c5590eaf3b45d10cf SHA256 11ed3a1d83c2784d590ec047750cd1cc56932ad2e10203f70f72d19fe879464f
+AUX 0ad-11339_alpha9-test.patch 970 RMD160 88e2994e54aceecc25c0775d61daf90f02cf53fc SHA1 16c073d53a114d0d26e67feb04556b49b32b15dc SHA256 5439c079d32225c2f29ec73b920cb8294a9beffdf6edea41bc01a8a02c453f0b
 DIST 0ad-r11339-alpha-unix-build.tar.xz 8593664 RMD160 5e7fc6449f7bde30611880ac2575c7cd2ef021d2 SHA1 e44f8484ca7082b1a9f2761a48aa8f54c8e833d1 SHA256 1e69bc02c1af1bfbe30244467761d13e1aaff164fe583d962cc8e13faf4a56cb
-EBUILD 0ad-10803.ebuild 3188 RMD160 cc08c1d288b3cb903d2ee5c9df1fe33b38cb7e3d SHA1 28c466764e7d3d4b20845a887d28781568365774 SHA256 d0997f7857468b5a68655ae327242f7e2392234ec3d40ff788f030be6e0a28f8
-EBUILD 0ad-11339_alpha9.ebuild 2398 RMD160 beb996e92b1f19975464ae9f85cdfac1ef0818b3 SHA1 99cbae548eb1d790cd0fa39911c284b3a301cab8 SHA256 9e12c630db167088d27afc6716dbc932228fb9d7cc3d25386821af46d37c7a61
-EBUILD 0ad-99999.ebuild 2666 RMD160 7023a0334f8f2584a7d98c19e7edcba06788bec6 SHA1 57ddc702b47bde6c753a894de57e47d8b830115e SHA256 69f8428f42ec755c7323d6f540b9ebb473dc1ce73be9d02a5cd3dbcf085fe479
+DIST 0ad-r11863-alpha-unix-build.tar.xz 8657204 RMD160 0c2a4efec65b8df48fe7b5e3af292c5e32c47e84 SHA1 e52a2a86b585d9bb6fee38ec7a1964b1a704c367 SHA256 46c08d380ce098d3d8f577d04d602bb245dfbb7f7da7b1ad009e7a0d4751435f
+EBUILD 0ad-11339_alpha9.ebuild 2066 RMD160 4299d37dc46688c827d50164df93ee395371f31e SHA1 39c8493265b962560864b9d047a9d1b616ed4467 SHA256 924abb35a21f2043b2aabae580c3642e1da22cbb4b3293b089fb8bae5b59b804
+EBUILD 0ad-11863_alpha10.ebuild 1994 RMD160 4f1eff7db2afe474a08996fcb85a4140419e8e05 SHA1 67080d28d9ec56070abecf291c6249d59649b9b8 SHA256 bd09fdf19ff54e5cef27eb37dc8c994557f60280600eb31a2734ae17b3689e11
+EBUILD 0ad-99999.ebuild 2312 RMD160 be88f06c1010dab6bde3abc2d1ad37129f29f492 SHA1 88b3f19118dc7cb1f2958931bb39f6026b90d9c4 SHA256 e5ac8c3f870dd8e32fc79797016aa531e25605560067de50f7531c82c65f388f
+MISC ChangeLog 683 RMD160 6e682e7657dbb77fa8de7294f3955b167df61b18 SHA1 b8a5254e4fe8eaec292b6ad3cb64a920a8a12a9c SHA256 43c02cdd92a0769d8acb6a74ed9671f3e2060824dbc298e0a0618df6be012992
+MISC metadata.xml 340 RMD160 6ac942a82ac7f194dd3e3c6437c6870c7e54af18 SHA1 59ffafa67aee64665a8cb7404f26b694a8a9705a SHA256 79e3cad447e25c2749b646cf284cda9c44abb3865a89998a08f7e3df1561b73e
diff --git a/games-strategy/0ad/files/0ad-11339_alpha9-fcollada-makefile.patch b/games-strategy/0ad/files/0ad-11339_alpha9-fcollada-makefile.patch
new file mode 100644
index 00000000..e397e869
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-11339_alpha9-fcollada-makefile.patch
@@ -0,0 +1,26 @@
+From: hasufell <julian.ospald@googlemail.com>
+Date: Wed Apr 11 14:45:32 UTC 2012
+
+FCollada Makefile does not respect CXX and flags
+
+--- libraries/fcollada/src/Makefile
++++ libraries/fcollada/src/Makefile
+@@ -7,14 +7,14 @@
+ PIC_FLAGS ?= -fpic
+ endif
+ 
+-CXX := g++
+-CXXFLAGS := -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
++CXX ?= g++
++CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
+ CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
+ CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
+ # (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1)
+ CXXFLAGS_TEST := -O0 -g -D_DEBUG
+-LIBS := `pkg-config libxml-2.0 --libs`
+-INCLUDES := -IFCollada `pkg-config libxml-2.0 --cflags`
++LIBS += `pkg-config libxml-2.0 --libs`
++INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
+ INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
+ 
+ # FCollada is not aliasing-safe, so disallow dangerous optimisations
diff --git a/games-strategy/0ad/files/0ad-11339_alpha9-test.patch b/games-strategy/0ad/files/0ad-11339_alpha9-test.patch
new file mode 100644
index 00000000..82f737aa
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-11339_alpha9-test.patch
@@ -0,0 +1,46 @@
+upstream patch: http://trac.wildfiregames.com/changeset/11661
+
+Build test executable with same linker settings as game executable,
+to fix --without-fam
+
+--- build/premake/premake4.lua
++++ build/premake/premake4.lua
+@@ -1167,13 +1167,20 @@
+ 
+ 		project_add_manifest()
+ 
+-	elseif os.is("linux") or os.is ("bsd") then
+-
+-		links {
+-			"fam",
+-			-- Utilities
+-			"rt",
+-		}
++	elseif os.is("linux") or os.is("bsd") then
++
++		if not _OPTIONS["without-fam"] then
++			links { "fam" }
++		end
++
++		if not _OPTIONS["android"] then
++			links { "rt" }
++		end
++
++		if _OPTIONS["android"] then
++			-- NDK's STANDALONE-TOOLCHAIN.html says this is required
++			linkoptions { "-Wl,--fix-cortex-a8" }
++		end
+ 
+ 		if os.is("linux") then
+ 			links {
+@@ -1189,7 +1196,9 @@
+ 
+ 		-- Threading support
+ 		buildoptions { "-pthread" }
+-		linkoptions { "-pthread" }
++		if not _OPTIONS["android"] then
++			linkoptions { "-pthread" }
++		end
+ 
+ 		-- For debug_resolve_symbol
+ 		configuration "Debug"
diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml
new file mode 100644
index 00000000..b699881d
--- /dev/null
+++ b/games-strategy/0ad/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-wanted@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="audio">Audio support</flag>
+		<flag name="editor">Include Atlas scenario editor projects</flag>
+	</use>
+</pkgmetadata>
+