gentoo resync : 14.07.2018

5 files changed, 180 insertions, 0 deletions

diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
new file mode 100644
index 000000000000..342d46e88b80
--- /dev/null
+++ b/games-puzzle/xlogical/Manifest
@@ -0,0 +1,6 @@
+AUX xlogical-1.0.7-gcc41.patch 1121 BLAKE2B 6e1f94c128cfc771deca86da18eb924e11b611e54c4150ed39cb53aeda46257de21ff6bdfd9d1688dd6aa559900089d457107ea78eb347466792c353aacbb602 SHA512 eb98b351ae14f9c3f4f5783ef48633957c21ddb3debd7ba00e9c651be395cb11a30b6109bd26fef12845111ff320c71ef2b43bee6ec1b8748ac6ac34dd8cb87b
+AUX xlogical-1.0.7-gcc43.patch 915 BLAKE2B c99de173bbd18bec630a8c3605ad77a6d56d3e4a4bb44fab011bb6f10a6140a4d843c7768557728deddb1edddbc6abc66445f1797bf8ca5d6b108f29598374ad SHA512 59cc10ec999aff4c8f5630e534ea834ff9a8b2d27e45752abdc46df812841e40de27ca406a45278f28a3a609c021c7753a6980edfaffd3c79b1bb7cf97336209
+DIST xlogical-1.0-7.tar.bz2 1853575 BLAKE2B 6f78f92a14313cf65f171b99c28a4377f7685bf73705a91b92fcf370ad1f3555b7aefe99e6004aa32c62cf8b71f2d754d64acadf3bda345cc8cf3e3f91647d02 SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d
+DIST xlogical_gfx.zip 347801 BLAKE2B b9c2f963e8ddc5af9fcd7adac691a71c6ee12bc3b3164ce243d076f85c36044b4aa523d27c5dd1480388ff97356ddabd3c7f2c4d223aeeff1a8660fc7c595995 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42
+EBUILD xlogical-1.0.7.ebuild 1458 BLAKE2B 8b2e9ff71f5bfca2863c622d446d5345bf702d3b4596be2344048b105442fe32e6b1b0892b47254b295464a2d4b6eadfa5e1f4de60ee803a6000fa3bf60eee29 SHA512 9ab4b8547c0afc8264c875906b8d6db776691534fe3ba49770ee5d86083885f1fc55737a25eb6f4e86b58cca8e6f910edc7b0b01c062f21e104ee91d28034d11
+MISC metadata.xml 554 BLAKE2B f7cc61f4cc79271b95e37334918f71934f91954f5a70d1601e817f6f134cd36117ed155b91a7929da537fcb7d423a627c1990c3c57f92a60fcbd6b3668329b8a SHA512 538cff1d408baf95b2d172490a3a038a8fd79edef5b8c1b64e3c495307b632870548dc0f33b6ed6bc77599d20e883a73a2c2d658b6ca85e131e404bc72e018ee
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
new file mode 100644
index 000000000000..19cd188b0e0e
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
@@ -0,0 +1,49 @@
+--- properties.h.old	2007-01-11 17:33:45.000000000 +0100
++++ properties.h	2007-01-11 17:34:32.000000000 +0100
+@@ -33,9 +33,7 @@
+ #include <map>
+ #include <string>
+ 
+-#ifdef WIN32
+ using namespace std;
+-#endif
+ 
+ #include "defs.h"
+ 
+--- anim.h.old	2007-01-11 17:36:20.000000000 +0100
++++ anim.h	2007-01-11 17:36:37.000000000 +0100
+@@ -27,9 +27,7 @@
+ // Language Includes
+ #include <list>
+ 
+-#ifdef WIN32
+ using namespace std;
+-#endif
+ 
+ // Application Includes
+ #include "graph.h"
+--- exception.h.old	2007-01-11 17:37:37.000000000 +0100
++++ exception.h	2007-01-11 17:38:21.000000000 +0100
+@@ -27,10 +27,9 @@
+ 
+ // Language Includes
+ #include <string>
++#include <iostream>
+ 
+-#ifdef WIN32
+ using namespace std;
+-#endif
+ 
+ #define CatchEx(aEx)		catch( CXLException aEx )
+ #define ThrowEx(aError)		throw CXLException(aError,__FILE__,__LINE__)
+--- gamelogic.cpp.old	2007-01-11 17:38:52.000000000 +0100
++++ gamelogic.cpp	2007-01-11 17:39:12.000000000 +0100
+@@ -154,7 +154,7 @@
+ 		levelFile = NULL;
+ 	}
+ 
+-	currentMap = NULL;
++	currentMap = gameLevels.begin();
+ 
+ 	playerName = new char[32+1];
+ 	strcpy( playerName, "nobody" );
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
new file mode 100644
index 000000000000..4b64fcd67783
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
@@ -0,0 +1,51 @@
+--- gamelogic.cpp
++++ gamelogic.cpp
+@@ -25,6 +25,7 @@
+ #include<fstream>
+ #include<cstdio>
+ #include<cctype>
++#include <cstdlib>
+ 
+ #ifndef WIN32
+ #include<unistd.h>
+--- levelmap.cpp
++++ levelmap.cpp
+@@ -21,6 +21,7 @@
+ ////////////////////////////////////////////////////////////////////////

+ 

+ // Language Includes

++#include <cstdlib>
+ #include <cstdio>

+ #include <cctype>

+ #include <cstring>

+--- mapedit.cpp
++++ mapedit.cpp
+@@ -26,6 +26,8 @@
+ #include<cstdio>

+ #include<list>

+ #include<vector>

++#include <cstdlib>
++#include <cstring>
+ 

+ #ifndef WIN32

+ #include<unistd.h>

+--- modlist.cpp
++++ modlist.cpp
+@@ -22,6 +22,7 @@
+ 

+ #include <iostream>

+ #include <fstream>

++#include <cstdlib>

+ 

+ #ifdef WIN32

+ #include <afxwin.h>

+--- tile_spinner.cpp
++++ tile_spinner.cpp
+@@ -24,6 +24,7 @@
+ 
+ 
+ // Application Includes
++#include <cstdlib>
+ #include "audio.h"
+ #include "properties.h"
+ #include "defs.h"
diff --git a/games-puzzle/xlogical/metadata.xml b/games-puzzle/xlogical/metadata.xml
new file mode 100644
index 000000000000..e2b7cea129a5
--- /dev/null
+++ b/games-puzzle/xlogical/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 lang="en">
+XLogical is a puzzle game based on the Logical! game that was originally
+released by Rainbow Arts on the Commodore Amiga computer.
+</longdescription>
+  <use>
+    <flag name="alt_gfx">Use alternate graphics which are closer to the original Amiga version</flag>
+  </use>
+</pkgmetadata>
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
new file mode 100644
index 000000000000..ea6857857a7d
--- /dev/null
+++ b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools versionator eutils games
+
+MY_PV=$(replace_version_separator 2 '-' )
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="SDL logical clone"
+HOMEPAGE="http://changeling.ixionstudios.com/xlogical/"
+SRC_URI="http://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
+	alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alt_gfx"
+
+RDEPEND="media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[mod]"
+DEPEND="${RDEPEND}
+	alt_gfx? ( app-arch/unzip )"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	if use alt_gfx ; then
+		cd "${S}/images"
+		unpack xlogical_gfx.zip
+	fi
+}
+
+src_prepare() {
+	sed -i '/^CXXFLAGS/d' Makefile.am || die
+	edos2unix properties.h anim.h exception.h
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+	mv configure.in configure.ac
+	eautoreconf
+}
+
+src_install() {
+	dogamesbin ${PN}
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r ${PN}.{properties,levels} music sound images
+	find "${D}" -name "Makefile*" -exec rm -f '{}' +
+
+	insinto "${GAMES_STATEDIR}"/${PN}
+	doins ${PN}.scores
+	fperms 0660 "${GAMES_STATEDIR}"/${PN}/${PN}.scores
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	make_desktop_entry ${PN} "Xlogical"
+	prepgamesdirs
+}