update ufo-ai - work in progess (not functional)

2 files changed, 63 insertions, 45 deletions

diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index 864973f..11d6d67 100644
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -1,4 +1,4 @@
 DIST ufoai-2.5-data.tar 1269913600 SHA256 0d12041cba3aaaba1ce114650c36586d286dcce51c721844c06fdace06e307b8 SHA512 429ddc33391aa33ca5ff1788a01114a5c8eb0bb6d66a5bedb1c88c3a46810813cade2ecd69b4ef4f18e9dd6b41485c1bf9f9b0f13fc9255cbf1f9484186f883b WHIRLPOOL d10e517ebd158a65e427f3d105df89d0ee5eb2900b99142d0e5b044c3bdd9f5063c6774c4570f93da87f408b0099a364e48ad7cec1638b4e6c6282c495557f8e
 DIST ufoai-2.5-source.tar.bz2 24239539 SHA256 0c7cc3bc9efeb276f71cbe6ee8ff7c76f98d183de79f1a069fa63059cf182a8f SHA512 072fe8820b1b242bb13f0820459fc27092b8597573231c8921c711859df39c8e28d9854e8a0300ebabb38cdeb99db16bed388a1391ba9f54100268b831db056f WHIRLPOOL 23cf4c88e88a85f5e6857e8c91e55e19bfce3c59d49168d16deca58a4ce9de25f942f86d7219c6d07f4b8dab2649068462616b38191ceb3b03973fed165bf058
-EBUILD ufo-ai-2.5.ebuild 2943 SHA256 fdbaf60e2cc070e268f7c9f272d0ce6d6d7f3b142eb56668680824ddaa9bbec8 SHA512 c2860b16ddb9cd6d322d70f39f30dbf522d943e177f4728f3dd28d75e93a82091df400a854e854a27ae646d773e2644aabd0ebea497dd7262529708062cc5ad8 WHIRLPOOL 10ff1aef36a7a1eba67eea3f0129b9e497131092472828b16c77ecdee58d299af1017d22d2d05ff06366e4e4f7fe5e9d6217ce9839797eeaa1e1cd4ab176f3d2
+EBUILD ufo-ai-2.5.ebuild 3425 SHA256 673704e0de6402adb4443b1d378b57502ee1ebf3160b551fb76bae4e8b9bba7b SHA512 34a1bb373413410b64694bbf287624289cb241f79081d2f7be6405f22cd882c8a5d1e9cbc5431ad9c9312e484eb10d2c3c85c04a4efada78f8c402b353fbc349 WHIRLPOOL f623bd4176c6c01643ae44a1dfbf961ca74351867d6df6fb20414163a9f8b4385f6ec10f9b3f1aa38aa0af0416de051b8a021a11f207c305daf65dc5d996c3cb
 MISC metadata.xml 576 SHA256 bca6d83a44b1e9cc92df1882f98d84eadc5fdbd22f0c245c3f62953b77c6ea58 SHA512 26c1e83fad5f07cd061246bbd592c46ea975e29623bc09537429687cce4628bd100b09d2ab5e7c6b9da2b7cbfd7b220e0d6c56d0cd92dff6e4d26d330851fdf7 WHIRLPOOL 56acaa6cbf93423abcdae6db82b4df1b4e9c4706a9402bcc57470e3e9a4123ca0f872006537567595293cfedf5f7fab5d4d603e5ef30c83d976b4ba4924d8746
diff --git a/games-strategy/ufo-ai/ufo-ai-2.5.ebuild b/games-strategy/ufo-ai/ufo-ai-2.5.ebuild
index 13f8a9c..ac815f6 100644
--- a/games-strategy/ufo-ai/ufo-ai-2.5.ebuild
+++ b/games-strategy/ufo-ai/ufo-ai-2.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=3
+EAPI=5
 inherit eutils flag-o-matic games
 
 MY_P=${P/o-a/oa}
@@ -15,33 +15,43 @@ SRC_URI="mirror://sourceforge/ufoai/${MY_P}-source.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug server editor +client sse profile"
+IUSE="debug dedicated editor profile sdl2 server static-libs sse test"
 
 # Dependencies and more instructions can be found here:
 # http://ufoai.ninex.info/wiki/index.php/Compile_for_Linux
-DEPEND="!server? (
-		virtual/opengl
-		 virtual/glu
-		media-libs/libsdl2
-		media-libs/sdl2-image[jpeg,png]
-		media-libs/sdl2-ttf
-		media-libs/sdl2-mixer
-		virtual/jpeg
-		media-libs/libpng:0
+DEPEND="
+		dev-libs/libxml2
+		dev-libs/mini-xml
+		media-libs/openal
 		media-libs/libogg
+		media-libs/libtheora
 		media-libs/libvorbis
+		media-libs/xvid
+		virtual/jpeg:0
+		(
+			( media-libs/sdl-image[jpeg,png]
+				media-libs/libsdl
+				media-libs/sdl-mixer
+				media-libs/sdl-ttf )
+			|| ( media-libs/sdl2-image[jpeg,png]
+				media-libs/libsdl2
+				media-libs/sdl2-mixer
+				media-libs/sdl2-ttf
+			)
+		)
+		editor? (
+			x11-libs/gtk+:2
+			x11-libs/gtkglext
+			x11-libs/gtksourceview:2.0
+		)
+		net-misc/curl
+		virtual/glu
+		virtual/opengl
 		x11-proto/xf86vidmodeproto
-	)
-	net-misc/curl
-	sys-devel/gettext
-	sys-libs/zlib
-	editor? (
-		dev-libs/libxml2
-		virtual/jpeg
-		media-libs/openal
-		x11-libs/gtkglext
-		x11-libs/gtksourceview:2.0
-	)"
+		sys-devel/gettext
+		sys-libs/zlib
+		test? ( dev-util/cunit )
+"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}-source
@@ -54,44 +64,52 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}-source.tar.bz2
-	cd "${S}"
-	pwd
+	cd "${S}" || die
 	unpack ${MY_P}-data.tar
 }
 
 src_configure() {
-	# they are special and provide hand batched configure file
 	local myconf="
-		--disable-cgame-campaign
-		--disable-cgame-multiplayer
-		--disable-cgame-skirmish
+		--enable-game
 		--disable-memory
-		--disable-testall
-		--disable-ufomodel
-		--disable-ufoslicer
 		$(use_enable !debug release)
-		$(use_enable editor uforadiant)
+		$(use_enable debug execinfo)
+		$(use_enable debug signals)
+		$(use_enable dedicated cgame-campaign)
+		$(use_enable dedicated cgame-multiplayer)
+		$(use_enable dedicated cgame-skirmish)
+		$(use_enable !dedicated ufo)
 		$(use_enable editor ufo2map)
+		$(use_enable editor ufomodel)
+		$(use_enable editor ufoslicer)
+		$(use_enable editor uforadiant)
+		$(use_enable profile profiling)
 		$(use_enable server ufoded)
-		$(use_enable client ufo)
+		$(use_enable static-libs hardlinkedgame)
+		$(use_enable static-libs hardlinkedcgame)
+		$(use_enable static-libs static)
 		$(use_enable sse)
-		--enable-game
+		$(use_enable test testall)
 		--disable-paranoid
-		$(use_enable profile profiling)
-		--bindir="${GAMES_BINDIR}"
-		--libdir="$(games_get_libdir)"
-		--datadir="${GAMES_DATADIR}/${PN/-}"
-		--localedir="${EPREFIX}/usr/share/locale/"
-		--prefix="${GAMES_PREFIX}"
+		--bindir=${GAMES_BINDIR}
+		--libdir=$(games_get_libdir)
+		--datadir=${GAMES_DATADIR}/${PN/-}
+		--localedir=${EPREFIX}/usr/share/locale/
+		--prefix=${GAMES_PREFIX}
 	"
+	if use !sdl2; then
+		myconf=${myconf}"
+		--disable-sdl2"
+	fi
+
 	echo "./configure ${myconf}"
 	./configure ${myconf} || die
+	echo ${PWD}
 }
 
 src_compile() {
-	echo "Running emake!"
+	echo ${PWD}
 	emake || die
-	echo "Running emake lang!"
 	emake lang || die
 
 	if use editor; then
@@ -105,13 +123,13 @@ src_install() {
 		dobin ufoded || die
 		make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN}
 	fi
-	if use client; then
+	if not use dedicated; then
 		dobin ufo || die
 		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
 	fi
 
 	if use editor; then
-		dobin ufo2map ufomodel || die
+		dobin ufo2map ufomodel ufoslicer uforadiant ^|| die
 	fi
 
 	# install data