[patch] ebuild diff

diff.txt (text/plain), 1.59 KB, created by Austin English (RETIRED) on 2016-07-13 18:44:26 UTC

--- xbomber-101.ebuild	2016-07-13 12:00:53.253098113 -0500
+++ xbomber-101-r1.ebuild	2016-07-13 12:37:17.159059003 -0500
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils games
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Bomberman clone w/multiplayer support"
 HOMEPAGE="http://www.xdr.com/dash/bomber.html"
@@ -11,12 +12,18 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+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" \
@@ -24,19 +31,25 @@
 		-e "s:X386:X11R6:" \
 		Makefile || die
 	sed -i \
-		-e "s:data/%s:${GAMES_DATADIR}/${PN}/%s:" bomber.c || die
+		-e "s:data/%s:/usr/share/${PN}/%s:" bomber.c || die
 	sed -i \
-		-e "s:=\"data\":=\"${GAMES_DATADIR}/${PN}\":" sound.c || die
-	epatch \
-		"${FILESDIR}"/${P}-va_list.patch \
-		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
+		-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() {
-	dogamesbin matcher bomber
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin matcher bomber
+	insinto /usr/share/${PN}
 	doins -r data/*
 	dodoc README Changelog
-	prepgamesdirs
 }