games-arcade/late: EAPI6->8, misc fixes

* fix score file, was in an odd location (/var/lib/lib/games) and
  gamestat group wasn't used
* tidy patches and add bugref for one (haven't found for the other)
* GPL-2 -> GPL-2+
* depend on libsdl[sound]
* replace .bmp icon, neither right format nor size (800x600!) to be
  valid for XDG and no guarantees it can be displayed by everything

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

5 files changed, 57 insertions, 48 deletions

diff --git a/games-arcade/late/Manifest b/games-arcade/late/Manifest
index 35ecf444686e..ef23ab3133e7 100644
--- a/games-arcade/late/Manifest
+++ b/games-arcade/late/Manifest
@@ -1 +1,2 @@
 DIST late-0.1.0.tar.bz2 1560232 BLAKE2B c8d80639fba66d605ea37dbd3ad1fb790b50854f7b2223b4bba0c4f6b94fed2471a725e3e9be66a74526ef4666464377e773b93b0de5dba0b3bcf6fd5ad33fac SHA512 6b3f4d27a723ae450bd8dda375c8663c1a3f457ffbe0a91f5eb96efdd797c2370ec68894df7a4d31e7124b28f3b41b3b952805901427c6ea3502b0d4d13cd72e
+DIST late.png 6564 BLAKE2B 9170d82259c632f44ba6149333e33c61fc8d39cf2b5002d3142b685e3ae6bd642dbc137cd5955cd807a412eb1270446a7b3d1b8cc0b92ceb0fd0d53516a0846d SHA512 2038e18857266dcb1aea3ab9c5c2a09b6d3d43c9e97bb4e141d1d7f650b20d743262e29aafe7fc04ecb6583ea209513f49cb3787ed15c7eb96fbbda86f9ee185
diff --git a/games-arcade/late/files/late-0.1.0-gcc43.patch b/games-arcade/late/files/late-0.1.0-gcc43.patch
index 8cfead22a27d..a769f61465ab 100644
--- a/games-arcade/late/files/late-0.1.0-gcc43.patch
+++ b/games-arcade/late/files/late-0.1.0-gcc43.patch
@@ -1,11 +1,7 @@
 --- a/src/init.cpp
 +++ b/src/init.cpp
-@@ -26,6 +26,8 @@
- #include "scorescreen.h"
- #include <fstream>
+@@ -28,2 +28,4 @@
  #include <iostream>
 +#include <cstdlib>
 +#include <cstring>
  using namespace std; 
- 
- 
diff --git a/games-arcade/late/files/late-0.1.0-gcc46.patch b/games-arcade/late/files/late-0.1.0-gcc46.patch
index 95d18ba7ed11..a40d93914f8f 100644
--- a/games-arcade/late/files/late-0.1.0-gcc46.patch
+++ b/games-arcade/late/files/late-0.1.0-gcc46.patch
@@ -1,11 +1,7 @@
-diff -ru late-0.1.0.orig/src/ball.h late-0.1.0/src/ball.h
---- late-0.1.0.orig/src/ball.h	2003-08-07 18:26:13.000000000 -0400
-+++ late-0.1.0/src/ball.h	2011-04-07 21:32:14.189799689 -0400
-@@ -25,6 +25,7 @@
- class ball;
- 
+https://bugs.gentoo.org/362367
+--- a/src/ball.h
++++ b/src/ball.h
+@@ -27,2 +27,3 @@
  #include "square.h"
 +#include <cstddef>
  
- class ball_base
- {
diff --git a/games-arcade/late/late-0.1.0-r1.ebuild b/games-arcade/late/late-0.1.0-r1.ebuild
deleted file mode 100644
index de1a4c7a13c5..000000000000
--- a/games-arcade/late/late-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A game, similar to Barrack by Ambrosia Software"
-HOMEPAGE="http://late.sourceforge.net/"
-SRC_URI="mirror://sourceforge/late/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image[jpeg]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
-	sed -i \
-		-e "/chown/d" \
-		Makefile.in \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-	newicon graphics/latebg2.jpg ${PN}.jpg
-	make_desktop_entry late Late /usr/share/pixmaps/${PN}.jpg
-}
diff --git a/games-arcade/late/late-0.1.0-r2.ebuild b/games-arcade/late/late-0.1.0-r2.ebuild
new file mode 100644
index 000000000000..47ca9482589c
--- /dev/null
+++ b/games-arcade/late/late-0.1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Game similar to Barrack by Ambrosia Software"
+HOMEPAGE="http://late.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/late/${P}.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+)
+
+src_prepare() {
+	default
+
+	# handle score file and permissions ourselves
+	sed -i '/score/d;/chgrp/d' Makefile.in || die
+
+	# want /var/games rather than /var/lib/lib/games
+	sed -i "s|LOCALSTATEDIR\"/lib|\"${EPREFIX}/var|" src/arch.cpp || die
+}
+
+src_install() {
+	default
+
+	dodir /var/games
+	:> "${ED}"/var/games/${PN}.scores || die
+
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.scores
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}