gentoo resync : 14.07.2018

6 files changed, 125 insertions, 0 deletions

diff --git a/games-arcade/xrick/Manifest b/games-arcade/xrick/Manifest
new file mode 100644
index 000000000000..15a2fff52d07
--- /dev/null
+++ b/games-arcade/xrick/Manifest
@@ -0,0 +1,6 @@
+AUX xrick-021212-exit.patch 702 BLAKE2B 58323696fb2abde318706e0d37c50d31d7bc65ce3a86163991019d2d43675dcc5d6562d65e13d96a0476164bc1dfd6db1270e63e405449d798cb5996dc9e6b6d SHA512 8d22419f6912297a900d3ad7101684af1c52c093ea3ea513aea52220b41b5b2a5c2b474883da887b4160b16ab3c9f90a885e48694a48a68470083b643be6d551
+AUX xrick-021212-fullscreen.patch 950 BLAKE2B e46b147ef3283f64d985b2e6fa1445b31c27c29a28a6a5859ff420ebc3bda2a15e633f85799cd2c32751ec25e726c6a57f13cead5d6b0829572f3a1a29e10ec8 SHA512 694d56f9094483bf5e11b905bb21408a684669b3c6d1fc150de8c1300b56ca2349dfbceefff5c936328eb202776bc3f5b6ea74b54ffbb082de27aa7827d7ce7c
+AUX xrick-021212-zlib.patch 372 BLAKE2B 9811ee9464790c7cb804a06a3f8cc71dff3489ae00bf30f7f56e8bf10f88d7d2eed5c92abda943a47d7913a4885f5f04b0fbfa41afc7653028fa23f86dbcaf35 SHA512 48933852c71f2979ae865fb72e89edeb7a3d314710472bd572e37877ff5fc627ecaa9c39661f8968c19d1e8b3e820600ab0d9985da029739cb78abedd2ff7d0f
+DIST xrick-021212.tgz 1648538 BLAKE2B d8ba387f4645d4ef0fd97b346ee202fb8573fd694e4f278791115ea5a2ab6ca509a8fffec3c5754e0160eec919aaa7a90509858bd80ae0244f28c32055070636 SHA512 7a6547dfce586512c3c4aa7fd5aa0d7d8bd223dbec6a9211e858034bd73d44f168266441d8f3475cddbed8f3a19c7c0df31345b62e2ecfb860664e54facb48bf
+EBUILD xrick-021212-r2.ebuild 1189 BLAKE2B 2d46e88e5a217eb37cf643849b0ffe95396985046eac28784a60f3e8cfb10cc2441f1eae8076a8cb2b596f50e25b47e2f61810aeacb046f0adcce2b2e92ad102 SHA512 55bf54b1fd439bd6ed6d5ffe4ef026201ab74558dd7af431a796a86889ea4d902c8691c78451db95f116d2b78c726ce81734ddbd4fc1ee94268402b358f8a057
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xrick/files/xrick-021212-exit.patch b/games-arcade/xrick/files/xrick-021212-exit.patch
new file mode 100644
index 000000000000..4486a969b346
--- /dev/null
+++ b/games-arcade/xrick/files/xrick-021212-exit.patch
@@ -0,0 +1,23 @@
+diff -ur xrick-021212/src/sysjoy.c xrick-021212.patched/src/sysjoy.c
+--- xrick-021212/src/sysjoy.c	2010-10-23 00:33:33.000000000 +0400
++++ xrick-021212.patched/src/sysjoy.c	2010-10-23 00:42:25.000000000 +0400
+@@ -56,6 +56,7 @@
+ {
+   if (j)
+     SDL_JoystickClose(j);
++  j = NULL;
+ }
+ 
+ #endif /* ENABLE_JOYSTICK */
+diff -ur xrick-021212/src/xrick.c xrick-021212.patched/src/xrick.c
+--- xrick-021212/src/xrick.c	2010-10-23 00:33:33.000000000 +0400
++++ xrick-021212.patched/src/xrick.c	2010-10-23 00:40:47.000000000 +0400
+@@ -29,7 +29,7 @@
+ 		data_setpath("/usr/games/lib/xrick/data.zip");
+ 	game_run();
+ 	data_closepath();
+-	sys_shutdown();
++    /* sys_shutdown is called via atexit */
+ 	return 0;
+ }
+ 
diff --git a/games-arcade/xrick/files/xrick-021212-fullscreen.patch b/games-arcade/xrick/files/xrick-021212-fullscreen.patch
new file mode 100644
index 000000000000..97271a33a28e
--- /dev/null
+++ b/games-arcade/xrick/files/xrick-021212-fullscreen.patch
@@ -0,0 +1,21 @@
+diff -ur xrick-021212/src/sysvid.c xrick-021212.patched/src/sysvid.c
+--- xrick-021212/src/sysvid.c	2002-12-24 16:33:43.000000000 +0300
++++ xrick-021212.patched/src/sysvid.c	2011-01-14 03:03:16.636668016 +0300
+@@ -145,10 +145,14 @@
+     IFDEBUG_VIDEO(sys_printf("xrick/video: SDL says, use these modes:\n"););
+     for (i = 0; modes[i]; i++) {
+       IFDEBUG_VIDEO(sys_printf("  %dx%d\n", modes[i]->w, modes[i]->h););
+-      if (modes[i]->w <= modes[mode]->w && modes[i]->w >= SYSVID_WIDTH &&
+-	  modes[i]->h * SYSVID_WIDTH >= modes[i]->w * SYSVID_HEIGHT) {
++      if ((!fszoom && modes[i]->w <= modes[mode] &&
++	   modes[i]->w >= SYSVID_WIDTH) ||
++	  (fszoom && modes[i]->w > modes[mode]->w)) {
+ 	mode = i;
+-	fszoom = modes[mode]->w / SYSVID_WIDTH;
++	if (modes[i]->h * SYSVID_WIDTH >= modes[i]->w * SYSVID_HEIGHT)
++	  fszoom = modes[mode]->w / SYSVID_WIDTH;
++	else
++	  fszoom = modes[mode]->h / SYSVID_HEIGHT;
+       }
+     }
+     if (fszoom != 0) {
diff --git a/games-arcade/xrick/files/xrick-021212-zlib.patch b/games-arcade/xrick/files/xrick-021212-zlib.patch
new file mode 100644
index 000000000000..bd7d6287925f
--- /dev/null
+++ b/games-arcade/xrick/files/xrick-021212-zlib.patch
@@ -0,0 +1,13 @@
+--- a/include/unzip.h.old	2012-03-24 16:13:16.012854948 +0100
++++ b/include/unzip.h	2012-03-24 16:15:42.744346771 +0100
+@@ -49,6 +49,10 @@
+ #include "zlib.h"
+ #endif
+ 
++#ifdef _Z_OF
++#define OF _Z_OF
++#endif
++
+ #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+ /* like the STRICT of WIN32, we define a pointer that cannot be converted
+     from (void*) without cast */
diff --git a/games-arcade/xrick/metadata.xml b/games-arcade/xrick/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-arcade/xrick/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 type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-arcade/xrick/xrick-021212-r2.ebuild b/games-arcade/xrick/xrick-021212-r2.ebuild
new file mode 100644
index 000000000000..9e95cbe3a4b2
--- /dev/null
+++ b/games-arcade/xrick/xrick-021212-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Clone of the Rick Dangerous adventure game from the 80's"
+HOMEPAGE="http://www.bigorno.net/xrick/"
+SRC_URI="http://www.bigorno.net/xrick/${P}.tgz"
+
+LICENSE="GPL-1+ xrick"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+RESTRICT="mirror bindist" # bug #149097
+
+DEPEND="media-libs/libsdl[video]"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unpack ./xrick.6.gz
+}
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}*.patch
+	sed -i \
+		-e "/^run from/d" \
+		-e "/data.zip/ s:the directory where xrick is:$(get_libdir)/${PN}.:" \
+		xrick.6 || die
+
+	sed -i \
+		-e "s:data.zip:/usr/$(get_libdir)/${PN}/data.zip:" \
+		src/xrick.c || die
+
+	sed -i \
+		-e "s/-g -ansi -pedantic -Wall -W -O2/${CFLAGS}/" \
+		-e '/LDFLAGS/s/=/+=/' \
+		-e '/CC=/d' \
+		-e "/CPP=/ { s/gcc/\$(CC)/; s/\"/'/g }" \
+		Makefile || die
+}
+
+src_install() {
+	dobin xrick
+	insinto /usr/"$(get_libdir)"/${PN}
+	doins data.zip
+	newicon src/xrickST.ico ${PN}.ico
+	make_desktop_entry ${PN} ${PN} /usr/share/pixmaps/${PN}.ico
+	dodoc README KeyCodes
+	doman xrick.6
+}