[patch] proper repo patch

0001-games-action-xbomber-fix-building-with-Clang.patch (text/plain), 3.71 KB, created by Austin English (RETIRED) on 2016-07-13 18:45:18 UTC

From 8e7be532125550de9080af361c550f5cea4fb206 Mon Sep 17 00:00:00 2001
From: Austin English <[e-mail]>
Date: Wed, 13 Jul 2016 12:27:27 -0500
Subject: [PATCH] games-action/xbomber: fix building with Clang

Also remove deprecated games.eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082
Gentoo-Bug: https://bugs.gentoo.org/588772

Package-Manager: portage-2.3.0
Signed-off-by: Austin English <[e-mail]>
---
 games-action/xbomber/files/xbomber-101-gcc4.patch  |  4 +-
 .../xbomber/files/xbomber-101-ldflags.patch        |  4 +-
 .../xbomber/files/xbomber-101-va_list.patch        |  4 +-
 games-action/xbomber/xbomber-101-r1.ebuild         | 55 ++++++++++++++++++++++
 4 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 games-action/xbomber/xbomber-101-r1.ebuild

diff --git a/games-action/xbomber/files/xbomber-101-gcc4.patch b/games-action/xbomber/files/xbomber-101-gcc4.patch
index 8a5a063..0ee82d8 100644
--- a/games-action/xbomber/files/xbomber-101-gcc4.patch
+++ b/games-action/xbomber/files/xbomber-101-gcc4.patch
@@ -1,5 +1,5 @@
---- bomber.c.old	2006-01-28 12:06:34.000000000 -0700
-+++ bomber.c	2006-01-28 12:06:46.000000000 -0700
+--- a/bomber.c	2006-01-28 12:06:34.000000000 -0700
++++ b/bomber.c	2006-01-28 12:06:46.000000000 -0700
 @@ -1699,7 +1699,7 @@
  }
  void addtail(void *header,void *entry)
diff --git a/games-action/xbomber/files/xbomber-101-ldflags.patch b/games-action/xbomber/files/xbomber-101-ldflags.patch
index ebde164..a0bf2f8 100644
--- a/games-action/xbomber/files/xbomber-101-ldflags.patch
+++ b/games-action/xbomber/files/xbomber-101-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-19 09:17:43.000000000 +0200
-+++ Makefile	2010-10-19 09:18:12.000000000 +0200
+--- a/Makefile	2010-10-19 09:17:43.000000000 +0200
++++ b/Makefile	2010-10-19 09:18:12.000000000 +0200
 @@ -1,10 +1,8 @@
 -CFLAGS	= -O3
 -
diff --git a/games-action/xbomber/files/xbomber-101-va_list.patch b/games-action/xbomber/files/xbomber-101-va_list.patch
index cd15b84..5a1691a 100644
--- a/games-action/xbomber/files/xbomber-101-va_list.patch
+++ b/games-action/xbomber/files/xbomber-101-va_list.patch
@@ -1,5 +1,5 @@
---- bomber.c.orig	2005-11-06 16:50:04.000000000 +0100
-+++ bomber.c	2005-11-06 16:47:35.000000000 +0100
+--- a/bomber.c	2005-11-06 16:50:04.000000000 +0100
++++ b/bomber.c	2005-11-06 16:47:35.000000000 +0100
 @@ -1,5 +1,6 @@
  #include <stdio.h>
  #include <stdlib.h>
diff --git a/games-action/xbomber/xbomber-101-r1.ebuild b/games-action/xbomber/xbomber-101-r1.ebuild
new file mode 100644
index 0000000..49b6391
--- /dev/null
+++ b/games-action/xbomber/xbomber-101-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bomberman clone w/multiplayer support"
+HOMEPAGE="http://www.xdr.com/dash/bomber.html"
+SRC_URI="http://www.xdr.com/dash/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+		"${FILESDIR}"/${P}-va_list.patch
+		"${FILESDIR}"/${P}-gcc4.patch
+		"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e "/^CC/d" \
+		-e 's/gcc/$(CC)/g' \
+		-e "s:X386:X11R6:" \
+		Makefile || die
+	sed -i \
+		-e "s:data/%s:/usr/share/${PN}/%s:" bomber.c || die
+	sed -i \
+		-e "s:=\"data\":=\"/usr/share/${PN}\":" sound.c || die
+	# ${P}-ldflags.patch depends on the munged Makefile
+	default
+}
+
+src_compile() {
+	if tc-is-clang ; then
+		# Fatal on clang
+		append-cflags -Wno-return-type
+	fi
+
+	default
+}
+
+src_install() {
+	dobin matcher bomber
+	insinto /usr/share/${PN}
+	doins -r data/*
+	dodoc README Changelog
+}
-- 
2.7.3