reinit the tree, so we can have metadata

8 files changed, 234 insertions, 0 deletions

diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
new file mode 100644
index 000000000000..d3ab2013117b
--- /dev/null
+++ b/games-strategy/glob2/Manifest
@@ -0,0 +1,10 @@
+AUX glob2-0.9.4.4-gcc44.patch 184 SHA256 21b1c25ecb2f55d71c0b5723b8ad8737a414f7565e08e1e527a2cbbfb794ec41 SHA512 e3d5d84c4c9240806ec97eace315b92288da4cbb28da230f91e3dc9aa224d4b7e010d4e132b53a538ae7d477a72320b27b482e9423182d1496751dbec58f461f WHIRLPOOL 303f1fa9f84251dd611f7f86e7afd08a5f13e52e1aca5a8a363038f737c7c2831f61cf57e9e1dde7becea7790a0b49025b96a3cd3236170dda0c456b153e4049
+AUX glob2-0.9.4.4-gcc49.patch 907 SHA256 23075c7e19f250c676df19cf2d3694230b1859fc1dba40aa780cc852d0036937 SHA512 7a1f19fe40effa577b2eb03ec4f2ddd7df78bff1c3df25c8b15df37d9feb03e4583e1776e4c2240130f318f9fa643d2d662492c9c5be46ed659bd587f88eafac WHIRLPOOL 08ffdef267939e8a08c6cd906123b74699f6771e18f866d59d476f9fb3b28b4b21dfb41df792d7f886b1cf1393512c98350924c090a1e263b6211259978db15b
+AUX glob2-0.9.4.4-gcc6.patch 1767 SHA256 629af154ef2e13525860e3105856d7d9ed33c87432b51bd3d82fe5ebd79f6b45 SHA512 d2eddfe657f81a1ec085298f09aafb904d22a80d601aca6405d92d6f17b28d0f3f3b5b445a9423988b7bc8869ca41698783e4139928f9f2ba33093ded6a3cb02 WHIRLPOOL d79cbdf20691fcf4deded9146959658b92bdb88bd2b68e6f3ae793a40cead7388408add4cdceb35ac81477e04516535c8678f196b7a2346d0bdcb7f9b0530f97
+AUX glob2-0.9.4.4-scons-blows.patch 904 SHA256 9676b6477c7f95d346c3d4ee53654cb5a03afcbeee8e676b895dd7a4f7b81214 SHA512 1018f2481d82df9b5e8ddd497fc1878a58a13e54c369e3e3f3a9f541f5140a92fec54460da5ff76c6913ad202385c53534d4c88e0140b8d4f65b759e23393a7b WHIRLPOOL 0f1441e56a8fe5f779a117d4399e5273e57cf22655bfa450553a94775cc98fd79ada683a21e87beba56a8b1d9e77d1e2ce55c00a4cd2c23f665a8b2fde408fea
+AUX glob2-0.9.4.4-underlinking.patch 672 SHA256 51536fd699ded8f36523ea77d1e7819ffdff744a9055be29de9e1f860d277c24 SHA512 24551c73af34badaa4a464da30c771c95082f0bfe83f351b264abddc578d5486a71f1a79b02d13ff48753e67059f8350752e77eb89397029833647bb74d79d21 WHIRLPOOL 2b6fa95e55aa3bd5e3f046ff31a86fbea41bd366954d0ead63254e1803883b5f7ad2e34456f42e63a93966639ea16562170e9ea49bc55ceecc2b2cfffa271bab
+DIST glob2-0.9.4.4.tar.gz 11338986 SHA256 0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8 SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca WHIRLPOOL d151bc9601eb283a366d98ae23bd5eb6b793024c5f9b9cf49ddc55910142885e5b2f89bfdce4f879190368466f2cc01e836a9178fd899d27d4342bee4c1f9a3a
+EBUILD glob2-0.9.4.4-r1.ebuild 1357 SHA256 ac9d8eb64ccfcf7a48f86a9c054ac030dfff2aed717677e6a423e8b097cbd238 SHA512 84b1c1ba7259ccaca698538ea1a91ba6667d9d68e07766a68a10c06f26ac94125f7b558773a51b66eb66828f48b014f4dc8339dce4d053b06bae92b13ecd16b4 WHIRLPOOL 0ad52014a2735b8a2ba650d204343f189edc5f8f0543889c0c4b6b73ab335600d30f191ad2f3e9a4779ea1c46fa7cdba389640b8223726684cb4b8beda4cc205
+MISC ChangeLog 2592 SHA256 44915cc1a1430a4b06031232866abc216e769698f0031fa1927768ee2593aaac SHA512 36987de31274817e15155f2b94c6335da0701c3d782b119eec5d3a0bbbf24ddca928ff02a34a4bc1ce1e6b9313180900e827e2c60f941cc3e5c44f411ae810e0 WHIRLPOOL 17fdfc3f0857694a848eba5763e2959d5303acd1f2f78c99d7800ce62e8e51cb5610cb9b5514b0d922ecc8f0fa8fd7578687a12f8d194b0311c0cd3280423b82
+MISC ChangeLog-2015 7772 SHA256 6a518b2a029f396bbc6c7c2360c64d93e0d7f236e5024ca05fd4868438be92f6 SHA512 0f63287038b177425d37545c0397b7906cf1909d740777552f05ea5771cee5945f9a6e946b44874eb07a8bd6aec277d8e88c11622ea632f59a52c483ee14c0d4 WHIRLPOOL 939381eb90ce7eed262df66f563eb90ada8c1135950312427df5c216f16af3b066b3afecb6f65f10911e8492dd6d85bbcea578f9d0dd235057d2670d9a78ddfe
+MISC metadata.xml 637 SHA256 55cc42f813cd185cebbdae05d178f21bc8d33621d47336aaea0dc282de929f4a SHA512 af021418808275511478f34bcbd4a3fadd193a583c7e94c676e94d39d10fb23c8d2de7b3ef5c8da81f2f6291a3bf9d0cc09448aea1b16959e7c811ba38d64e66 WHIRLPOOL f10239194f10cd58a73ff4a18c52f2235ac698a26488864aec9e48a74f151ffcffe564cb1fb56b6988187fe23ab9b3bf56fcb2995cfba5b414dbd575623a64f0
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
new file mode 100644
index 000000000000..5ce62ea6e46c
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
@@ -0,0 +1,12 @@
+--- libgag/include/StreamBackend.h.old
++++ libgag/include/StreamBackend.h
+@@ -28,6 +28,9 @@
+ #ifdef putc
+ #undef putc
+ #endif
++#ifdef getc
++#undef getc
++#endif
+ 
+ namespace GAGCore
+ {
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch
new file mode 100644
index 000000000000..fca1efb5891a
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch
@@ -0,0 +1,35 @@
+From https://bugs.gentoo.org/show_bug.cgi?id=538580
+
+Works around this build failure:
+
+In file included from src/AICastor.cpp:26:0:
+src/Game.h: In member function 'void AICastor::computeBuildingNeighbourMap(int, int)':
+src/Game.h:152:9: error: 'struct Game::BuildProject' is private
+  struct BuildProject
+         ^
+src/AICastor.cpp:2296:23: error: within this context
+  for (std::list<Game::BuildProject>::iterator bpi=game->buildProjects.begin(); bpi!=game->buildProjects.end(); bpi++)
+                       ^
+scons: *** [src/AICastor.o] Error 1
+scons: building terminated because of errors.
+
+patch submitted by zimous
+
+--- glob2-0.9.4.4.orig/src/Game.h
++++ glob2-0.9.4.4/src/Game.h
+@@ -149,6 +149,7 @@
+ 		BOTTOM_TO_TOP
+ 	};
+ 	
++public:
+ 	struct BuildProject
+ 	{
+ 		int posX;
+@@ -159,6 +160,7 @@
+ 		int unitWorkingFuture;
+ 	};
+ 	
++private:
+ 	///Initiates Game
+ 	void init(GameGUI *gui, MapEdit* edit);
+ 
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch
new file mode 100644
index 000000000000..f1152c3ba1cc
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch
@@ -0,0 +1,49 @@
+Bug: https://bugs.gentoo.org/610382
+Upstream commit: https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a
+
+# HG changeset patch
+# User Jonathan Wakely <jwakely@redhat.com>
+# Date 1485875296 0
+# Node ID c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a
+# Parent  c4da01699846179d8bf21e8dae2b973158ec0775
+Fix last argument to ChooseMapScreen constructor
+
+Since C++14 'false' is not a valid null pointer constant, so cannot be passed
+to functions expecting pointer arguments.
+
+diff --git a/src/EditorMainMenu.cpp b/src/EditorMainMenu.cpp
+--- a/src/EditorMainMenu.cpp
++++ b/src/EditorMainMenu.cpp
+@@ -90,7 +90,7 @@
+ 		}
+ 		else if (par1==LOADMAP)
+ 		{
+-			ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", false);
++			ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", NULL);
+ 			int rc=chooseMapScreen.execute(globalContainer->gfx, 40);
+ 			if (rc==ChooseMapScreen::OK)
+ 			{
+diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp
+--- a/src/LANMenuScreen.cpp
++++ b/src/LANMenuScreen.cpp
+@@ -62,7 +62,7 @@
+ 		}
+ 		else if(par1 == HOST)
+ 		{
+-			ChooseMapScreen cms("maps", "map", false, "games", "game", false);
++			ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
+ 			int rc = cms.execute(globalContainer->gfx, 40);
+ 			if(rc == ChooseMapScreen::OK)
+ 			{
+diff --git a/src/YOGClientLobbyScreen.cpp b/src/YOGClientLobbyScreen.cpp
+--- a/src/YOGClientLobbyScreen.cpp
++++ b/src/YOGClientLobbyScreen.cpp
+@@ -326,7 +326,7 @@
+ 
+ void YOGClientLobbyScreen::hostGame()
+ {
+-	ChooseMapScreen cms("maps", "map", false, "games", "game", false);
++	ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
+ 	int rc = cms.execute(globalContainer->gfx, 40);
+ 	if(rc == ChooseMapScreen::OK)
+ 	{
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
new file mode 100644
index 000000000000..b0fb92d47974
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
@@ -0,0 +1,26 @@
+--- SConstruct.orig
++++ SConstruct
+@@ -1,6 +1,7 @@
+ EnsureSConsVersion(0, 96, 92)
+ import sys
+ import os
++import SCons.Util
+ import glob
+ sys.path.append( os.path.abspath("scons") )
+ import bundle
+@@ -268,6 +269,15 @@
+     env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz"
+     env["TARFLAGS"] = "-c -z"
+     env.Alias("dist", env["TARFILE"])
++    # Using suggestions for https://dev.gentoo.org/~vapier/scons-blows.txt
++    if os.environ.has_key('CC'):
++           env['CC'] = os.environ['CC']
++    if os.environ.has_key('CXX'):
++           env['CXX'] = os.environ['CXX']
++    if os.environ.has_key('CXXFLAGS'):
++           env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++    if os.environ.has_key('LDFLAGS'):
++           env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ 
+     def PackTar(target, source):
+         if "dist" in COMMAND_LINE_TARGETS:
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
new file mode 100644
index 000000000000..65eba48717db
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
@@ -0,0 +1,19 @@
+--- glob2-0.9.4.4.orig/SConstruct
++++ glob2-0.9.4.4/SConstruct
+@@ -110,6 +110,16 @@
+             print "Could not find libz or zlib1.dll"
+             missing.append("zlib")
+ 
++    boost_system = ''
++    if conf.CheckLib("boost_system"):
++        boost_system="boost_system"
++    elif conf.CheckLib("boost_system-mt"):
++        boost_system="boost_system-mt"
++    else:
++        print "Could not find libboost_system or libboost_system-mt"
++        missing.append("libboost_system")
++    env.Append(LIBS=[boost_system])
++
+     boost_thread = ''
+     if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"):
+         boost_thread="boost_thread"
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
new file mode 100644
index 000000000000..3017798e40f6
--- /dev/null
+++ b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils gnome2-utils scons-utils games
+
+DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs"
+HOMEPAGE="http://globulation2.org/"
+SRC_URI="mirror://nongnu/glob2/${PV:0:5}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.34[threads]
+	dev-libs/fribidi
+	media-libs/libsdl[opengl]
+	media-libs/libvorbis
+	media-libs/sdl-image[png]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	media-libs/speex
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch
+}
+
+src_configure() {
+	myesconsargs=(
+		INSTALLDIR="${GAMES_DATADIR}"/${PN}
+		DATADIR="${GAMES_DATADIR}"/${PN}
+	)
+	escons data
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	dogamesbin src/${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r campaigns data maps scripts
+	find "${D}/${GAMES_DATADIR}"/${PN} -name SConscript -exec rm -f '{}' +
+	newicon -s 48 data/icons/glob2-icon-48x48.png ${PN}.png
+	make_desktop_entry glob2 "Globulation 2"
+	dodoc README*
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/glob2/metadata.xml b/games-strategy/glob2/metadata.xml
new file mode 100644
index 000000000000..181fc4eec533
--- /dev/null
+++ b/games-strategy/glob2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+Globulation2 is an innovative high quality Real-Time Strategy [RTS], 
+which minimizes micro-management by automatically assigning tasks to 
+the units. The player has to choose the number of units he wants for 
+the different tasks, and the units will do their best to satisfy the 
+requests. This allows to manage more units and to focus on strategies.
+</longdescription>
+</pkgmetadata>