gentoo resync : 25.11.2020

1 files changed, 25 insertions, 17 deletions

diff --git a/games-arcade/xrick/xrick-021212-r2.ebuild b/games-arcade/xrick/xrick-021212-r2.ebuild
index c24058e2784b..3ef05387653d 100644
--- a/games-arcade/xrick/xrick-021212-r2.ebuild
+++ b/games-arcade/xrick/xrick-021212-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Clone of the Rick Dangerous adventure game from the 80's"
 HOMEPAGE="http://www.bigorno.net/xrick/"
@@ -11,44 +12,51 @@ SRC_URI="http://www.bigorno.net/xrick/${P}.tgz"
 LICENSE="GPL-1+ xrick"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist" # bug #149097
 
 DEPEND="media-libs/libsdl[video]"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-exit.patch
+	"${FILESDIR}"/${P}-fullscreen.patch
+	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd "${S}" || die
 	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}.:" \
+		-e "/data.zip/ s:the directory where xrick is:$(get_libdir)/xrick.:" \
 		xrick.6 || die
 
 	sed -i \
-		-e "s:data.zip:/usr/$(get_libdir)/${PN}/data.zip:" \
+		-e "s:data.zip:${EPREFIX}/usr/$(get_libdir)/xrick/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_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin xrick
-	insinto /usr/"$(get_libdir)"/${PN}
+
+	insinto /usr/$(get_libdir)/xrick
 	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
+
+	newicon src/xrickST.ico xrick.ico
+	make_desktop_entry xrick xrick /usr/share/pixmaps/xrick.ico
 }