gentoo auto-resync : 13:08:2022 - 14:24:01

5 files changed, 60 insertions, 51 deletions

diff --git a/games-arcade/late/Manifest b/games-arcade/late/Manifest
index d17ca6d13707..2cd6aa15a42c 100644
--- a/games-arcade/late/Manifest
+++ b/games-arcade/late/Manifest
@@ -1,5 +1,6 @@
-AUX late-0.1.0-gcc43.patch 190 BLAKE2B 4105d416951cb0c7cf15476dabd35695f2da4f491069f308b705316960c51702ba3407575b82d1a56eddb636cb69265c3ad980c90603f4944bd1bfdf5d7d8d43 SHA512 0c75110c749029b56838d0b67f6ccfb18a8861c5ddd7f4256ee4644b6a176ba9b53f3dea80035e9576904344ea6e867bfcd11087d9463898fe8b1b2458afb652
-AUX late-0.1.0-gcc46.patch 283 BLAKE2B 0e25d7738f81b3d2d626094bbe5c59426f5c859b9432ca5bdb2e4f50ebf1c06df9ec2170a76ffaa032a4c7f383d4c832930fe5369de9cb931c6d0e1763b96398 SHA512 4284066e07331e77dda457ecbb62d387eebda33cd98a1bc4095cbac11871ff5728d4a9ae9737882b0f411958d0318eadf54f661ad85884902bee8ff5ac6836b8
+AUX late-0.1.0-gcc43.patch 140 BLAKE2B 69b5ecdc6b0e56572a3dc1a7967237878885a2830d2080e858427cba24da811939c22b748cde85cf1c4036e22992d847499cb4731158547fa76a64adf5e2047c SHA512 57c6f284ce05845dc23abad176beba60febdd12a1f3af1d2ab43f3c1e636ab7c3d4a6e691398e3b5dbfcf9a8fa0d46dbef47eaabe2460826cefd60b3f3fa5633
+AUX late-0.1.0-gcc46.patch 126 BLAKE2B e22f438961f2bf9c5bf026d3ca51bb107e5afd49e12f3d81b1b0131a7e10f34bb862e8e93a07022d169b4acec43422f485fde1210c8ba9f3226edaf77e181721 SHA512 feed8d0bf53e5b9128e6e14f03a63f1cfb3531e966268d65a687bfdfc0e5ff3ce2864ba456d119fa405a5bf2231810af236d22c9347dd8b856951ee8795cc948
 DIST late-0.1.0.tar.bz2 1560232 BLAKE2B c8d80639fba66d605ea37dbd3ad1fb790b50854f7b2223b4bba0c4f6b94fed2471a725e3e9be66a74526ef4666464377e773b93b0de5dba0b3bcf6fd5ad33fac SHA512 6b3f4d27a723ae450bd8dda375c8663c1a3f457ffbe0a91f5eb96efdd797c2370ec68894df7a4d31e7124b28f3b41b3b952805901427c6ea3502b0d4d13cd72e
-EBUILD late-0.1.0-r1.ebuild 719 BLAKE2B a1aeb8074390b71d123ba7cd71b862ad00d8b91366a2c45d4c1be188333b9286480206901650b57b486c8b2fd2fabe97f0637ecad560bd4320e3d8f19204da27 SHA512 039b3de0bf2cdbdf02ea2a0ff3ef1c6c6e1d7c1db6d679f39428e23326f669e35e875b24436c091519c633125c58be482031c4978fd48b4f007557d445ce610f
+DIST late.png 6564 BLAKE2B 9170d82259c632f44ba6149333e33c61fc8d39cf2b5002d3142b685e3ae6bd642dbc137cd5955cd807a412eb1270446a7b3d1b8cc0b92ceb0fd0d53516a0846d SHA512 2038e18857266dcb1aea3ab9c5c2a09b6d3d43c9e97bb4e141d1d7f650b20d743262e29aafe7fc04ecb6583ea209513f49cb3787ed15c7eb96fbbda86f9ee185
+EBUILD late-0.1.0-r2.ebuild 1091 BLAKE2B d3247c0f2de7cac574b980c6a89ca9b4b328297f5f273103544824f57d24d6dffb1c3f7c61e985e49c132c9bc0e07b4db7aabd10d41abec6119aabc28b738a41 SHA512 2a76c158cd273f63011f24027f6d3ea21191952969f9c25ea1ab6e8d82d6349b7c66ca93fbbe798accbf0c21f89f4c7bcacbf901cff88d8ea813fb99c4589a73
 MISC metadata.xml 328 BLAKE2B 3ef0c7ae81eeb4211267b4a022b423fc2d5c416394c8896ba002146c1ad82807657c5fdbf229ac232a6e4dc6192c88ced0c50ef13269ca69d4fa7cb75c269940 SHA512 43329dddbf03b6cb3dabdf2ebfa1cdde69f9d9fe9bd6be63861e342ec21b5167a8a7b597d829407cc2ba565f8f511b93c4b249dd021bda7e1ed4597033ba6253
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^}
+}