gentoo resync : 28.04.2021

6 files changed, 63 insertions, 50 deletions

diff --git a/games-arcade/emilia-pinball/Manifest b/games-arcade/emilia-pinball/Manifest
index 25c8b07d5a6e..b9488306c57c 100644
--- a/games-arcade/emilia-pinball/Manifest
+++ b/games-arcade/emilia-pinball/Manifest
@@ -1,7 +1,7 @@
-AUX emilia-pinball-0.3.1-gcc46.patch 887 BLAKE2B 1b850fc066b2f33edde6c5f9e0ce58af86b4ae5eda7bb77b3d364e45548572b48f34a7e0a50f9ca660585ca0282e0ec9c3031449ca9ffa7b60d2c3cae920c794 SHA512 758d2d42f40b7d020aeeef75331b6a392c18eb9f9f34242d449ee233ef2f1b12900b69d572a40930a6dbd986e98be9258ccb2130746e36c8729c011ce294fda3
-AUX emilia-pinball-0.3.1-glibc210.patch 379 BLAKE2B 5eb1a6885265f7c5ca3ca73108ba54890e0f1551e8b0efcfca62637385b9700a900ce7181c7f5a7100f265c82df7b0ef98765bc6bd05ad079e7941b12d384541 SHA512 a949474aa76dc0b503635c40fb8b641daaab59b51d1d680fc9ac3f6e94566f9064526fe21107e5e549a02c3264dfa0fc6d94a5f8a833a88defd4e9b3a6bb9be0
-AUX emilia-pinball-0.3.1-libtool.patch 2371 BLAKE2B 625fc092dfe779ca1cb7b17c305e21de5113314f59ea7e2cd214b59a1c49b45668b3a76e9e56141d18df0e42eb72c295cf84aa4df50d7e070b6b1864250b506b SHA512 c60940620ba70c725774c9e0dfb930d2e5760fad9e64ec951ca3ab973f3e9f0884d88c0e7b4d8bf01f91651a7e5bd2111bcf5a38a63b46319436c7d2f270d71e
-AUX emilia-pinball-0.3.1-parallel.patch 428 BLAKE2B 368bf4e511f362e3daff200bee164fc0fa5c8bedde5f81cbe8778159e5f5157ff7a48b611541942703cc76f78e85b8e1b8bc42b6a305770feaf4577204576071 SHA512 8c8d0ef2bbb59579cf3e0f12e624bc28c27e810cad2d140a4c85f998d482101d97bdb7109fd01fb4bb9f2e77369c503b51c5a704b2f0768e570e7eb094f4f3c6
+AUX emilia-pinball-0.3.1-gcc46.patch 671 BLAKE2B 89e637e5110f00abc0e8b1eaed28cdf0b5ea86c0441655530659cac0772f9d0bb00f7183f955cc9d0cc72bc306f6dc4a951537923a96237a4706823a5172c927 SHA512 e214820d787c2c9170759f4cf796ed43d49a7831f3f589eea4c216bf2b8180d0f596a12e990da4d4b5e61c55ecb5bca18834696716c1c05b95eda1343a37c90c
+AUX emilia-pinball-0.3.1-glibc210.patch 383 BLAKE2B 3d4eaf146dcef5dacbc1e61d667a73972e2c67d1881fe60b7724720cf391f32103f039b56d32b55d32b93e16cbb1179f681f417f41dbd56e8047e43c03c9d1e4 SHA512 67d0494816f1d4827a8b88e52acc8ef9ca687956ecdc725051df367205d75f437bc66501be9277a2abc1095d978b9b6fafda36c041a7b0825d66aee34584b691
+AUX emilia-pinball-0.3.1-libtool.patch 1683 BLAKE2B 8ee0b3bf1a913310993e45a37b3cd0b59adcc32e004994a093d63d5cfcaa5c22cd3fa80f0407b6b77f8381d9bf6b2dc36dc4396406f703d7925ee93bef3bd0c7 SHA512 43f09fd61f158c62abec979f45d019821099789318b22394618f94f5b49a15cda3759cbe4f4fc74f7dbe5f89856138a0d1dcd5fd335817bd71326d90ab50c719
+AUX emilia-pinball-0.3.1-parallel.patch 356 BLAKE2B 5944a0dcec80a6c593be6c451912a6eed1d6afe7998ff48e83dd3d8b8d635c117a253c9a2dee288e3d38d6e77ad05eac83a4c46789389ea329f8be0a3d8177bf SHA512 54d467c4e7aae9902c3c4cfde999c2c8245bb92c6ede5464c229852ba0a29858e86a0781408eb7de40022b13635ef7826323ef510e80ef2b9758c1bdbdb9aff0
 DIST pinball-0.3.1.tar.gz 6082982 BLAKE2B 307fd8fa6a6a64a15423f2cdacf6711affec4d0a94beca4c660316fa2db268b857fe80d3a672a078fd4454e858fdbf235ab3c62ba9695ee6df422b56536ba2d2 SHA512 d54f2635f583be8a7e4bf3463c69c1ab368e1c069dd7c4edffb95df0448faf7e82ddb8f8607d22a7336e2db176134555ca65b613e9d008b38fecb8ad5a818498
-EBUILD emilia-pinball-0.3.1-r1.ebuild 1394 BLAKE2B 8bed8fccd73785e0e96b622b7775e1caf45e8b7c0c97dbbbe4f9819b8d500f8c41d98cbbcd9b42d7c09bfe985c90731dfc0ab5183e74ce98bbdc77695184f49c SHA512 097011fdfb136fb98f1aa840014b904de05461c642dacd3a8b229f3d04cc46210db2bb7ffd11778692370e5d14fb35fa4f56a346051647ccbd667283b2e625e8
+EBUILD emilia-pinball-0.3.1-r2.ebuild 1401 BLAKE2B e49ed85390c012c546176f670a73ba0fdab545abbf222f92f64fb0d658a07998fb16e0eb13b360afff3611c332690f565189bb20a8144b8621ea9cc28cbe43fc SHA512 ecc2a81fef12517337e8162aa8993f145625c807267fb7bd623bc8a89b612db82ccae7c55296ce92bc56c299e93f712919544115eb4251ea03a6f666ef237155
 MISC metadata.xml 330 BLAKE2B 7deaad70c752f4c41009dfd6ec073f972e9ee484d4497c0b23d184cd48bdb5aaa45f2644c412ab2a885aea6655e1a737a612bb65b3d8147272f63a2de932825c SHA512 8432311fd9fb74150e0571245c2afda26de63a3a3671905cb7f221984933e5971c1f5f355517c54b7c31de3a3d3349d06116a4e67c57c44489147af5ae80e8cf
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild
index 56747f703846..523439876ec8 100644
--- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
+++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r2.ebuild
@@ -1,43 +1,57 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils games
+EAPI=7
+
+inherit autotools desktop
 
 MY_PN=${PN/emilia-/}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="SDL OpenGL pinball game"
 HOMEPAGE="http://pinball.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pinball/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="virtual/opengl
-	x11-libs/libSM
+RDEPEND="
+	dev-libs/libltdl:0
 	media-libs/libsdl[joystick,opengl,video,X]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
-	dev-libs/libltdl:0"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
+	x11-libs/libICE
+	x11-libs/libSM
+	virtual/opengl
+	virtual/glu
+"
+DEPEND="
+	${DEPEND}
+	x11-libs/libXt
+"
 
-S=${WORKDIR}/${MY_P}
+RDEPEND+=" acct-group/gamestat"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc210.patch
+	"${FILESDIR}"/${P}-libtool.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+	"${FILESDIR}"/${P}-parallel.patch
+)
 
 src_prepare() {
-	sed -i -e '/dnl/d' {src,test}/Makefile.am || die #334899
-	epatch "${FILESDIR}"/${P}-glibc210.patch \
-		"${FILESDIR}"/${P}-libtool.patch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-parallel.patch
-	rm -rf libltdl
+	# bug #334899
+	sed -i -e '/dnl/d' {src,test}/Makefile.am || die
+
+	default
+
+	rm -rf libltdl || die
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf --with-x
+	econf --with-x
 }
 
 src_compile() {
@@ -46,14 +60,17 @@ src_compile() {
 
 src_install() {
 	default
-	dosym "${GAMES_BINDIR}"/pinball "${GAMES_BINDIR}"/emilia-pinball
-	mv "${D}/${GAMES_PREFIX}/include" "${D}/usr/" || die
-	dodir /usr/bin
-	mv "${D}/${GAMES_BINDIR}/pinball-config" "${D}/usr/bin/" || die
+
+	dosym pinball /usr/bin/emilia-pinball
+
 	sed -i \
 		-e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \
-		"${D}"/usr/bin/pinball-config || die
+		"${ED}"/usr/bin/pinball-config || die
+
 	newicon data/pinball.xpm ${PN}.xpm
 	make_desktop_entry emilia-pinball "Emilia pinball"
-	prepgamesdirs
+
+	fperms -R 660 /var/games/pinball
+	fowners -R root:gamestat /var/games/pinball
+	fperms g+s /usr/bin/pinball
 }
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
index d78779197fce..aef1d672df62 100644
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
@@ -1,5 +1,5 @@
---- base/SignalSender.cpp.old	2011-04-26 09:39:24.303339444 +0200
-+++ base/SignalSender.cpp	2011-04-26 09:39:51.261063162 +0200
+--- a/base/SignalSender.cpp
++++ b/base/SignalSender.cpp
 @@ -11,6 +11,7 @@
  #include "SignalSender.h"
  #include "Group.h"
@@ -8,8 +8,8 @@
  
  SignalSender * SignalSender::p_SignalSender = NULL;
  
---- base/Behavior.cpp.old	2011-04-26 09:36:27.129006665 +0200
-+++ base/Behavior.cpp	2011-04-26 09:36:48.855396752 +0200
+--- a/base/Behavior.cpp
++++ b/base/Behavior.cpp
 @@ -9,6 +9,7 @@
  #include "Private.h"
  #include "Behavior.h"
@@ -18,8 +18,8 @@
  
  Behavior::Behavior() {
  	//EM_COUT("Behavior::Behavior", 1);
---- base/BehaviorVisitor.cpp.old	2011-04-26 09:37:39.759653248 +0200
-+++ base/BehaviorVisitor.cpp	2011-04-26 09:37:54.481594952 +0200
+--- a/base/BehaviorVisitor.cpp
++++ b/base/BehaviorVisitor.cpp
 @@ -9,6 +9,7 @@
  #include "BehaviorVisitor.h"
  #include "Behavior.h"
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch
index 800dbeae21a7..12f33cd21c85 100644
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch
@@ -1,5 +1,5 @@
---- base/Config.cpp
-+++ base/Config.cpp
+--- a/base/Config.cpp
++++ b/base/Config.cpp
 @@ -423,8 +423,8 @@
    m_sDataDir = string(EM_DATADIR) + "/";
    m_sExeDir = "./";
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
index 437e4eb684a4..a9bc00051bab 100644
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
@@ -1,6 +1,5 @@
-diff -ur pinball-0.3.1.orig/configure.ac pinball-0.3.1/configure.ac
---- pinball-0.3.1.orig/configure.ac	2003-11-21 09:40:18.000000000 +0200
-+++ pinball-0.3.1/configure.ac	2010-03-05 20:41:24.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -14,18 +14,13 @@
  CFLAGS="-g -W -Wall -O2"
  CXXFLAGS="-g -W -Wall -O2"
@@ -22,9 +21,8 @@ diff -ur pinball-0.3.1.orig/configure.ac pinball-0.3.1/configure.ac
  
  dnl *******************************************
  dnl PATHS AND DIRS ****************************
-diff -ur pinball-0.3.1.orig/Makefile.am pinball-0.3.1/Makefile.am
---- pinball-0.3.1.orig/Makefile.am	2003-12-10 12:15:35.000000000 +0200
-+++ pinball-0.3.1/Makefile.am	2010-03-05 20:36:48.000000000 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = gnu
  
@@ -33,9 +31,8 @@ diff -ur pinball-0.3.1.orig/Makefile.am pinball-0.3.1/Makefile.am
  
  EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
  
-diff -ur pinball-0.3.1.orig/src/Makefile.am pinball-0.3.1/src/Makefile.am
---- pinball-0.3.1.orig/src/Makefile.am	2003-11-20 18:46:17.000000000 +0200
-+++ pinball-0.3.1/src/Makefile.am	2010-03-05 20:37:08.000000000 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -7,9 +7,9 @@
  
  pinlib_LIBRARIES = libemilia_pin.a
@@ -48,9 +45,8 @@ diff -ur pinball-0.3.1.orig/src/Makefile.am pinball-0.3.1/src/Makefile.am
  pinball_LDFLAGS = -export-dynamic
  
  pinball_SOURCES = Pinball.cpp
-diff -ur pinball-0.3.1.orig/test/Makefile.am pinball-0.3.1/test/Makefile.am
---- pinball-0.3.1.orig/test/Makefile.am	2003-11-20 18:46:17.000000000 +0200
-+++ pinball-0.3.1/test/Makefile.am	2010-03-05 20:36:38.000000000 +0200
+--- a/test/Makefile.am
++++ b/test/Makefile.am
 @@ -6,8 +6,8 @@
  noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
  dnl noinst_PROGRAMS = unittest
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
index 3dfef56090c9..f5857c2b2910 100644
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.old	2011-04-26 10:46:05.102070461 +0200
-+++ src/Makefile.am	2011-04-26 10:46:16.872813136 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -9,7 +9,7 @@
  
  INCLUDES = -I../base -I../addon