gentoo resync : 26.08.2021

8 files changed, 1 insertions, 283 deletions

diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index bd9119b76f5e..d8541731e452 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/speed-dreams/Manifest b/games-sports/speed-dreams/Manifest
index 36d8bb5d5487..d3a6a0b1eb41 100644
--- a/games-sports/speed-dreams/Manifest
+++ b/games-sports/speed-dreams/Manifest
@@ -1,13 +1,7 @@
-AUX speed-dreams-1.4.0-asneeded.patch 4214 BLAKE2B e0cf81e4bc04dd0a41ca813e2fbd66145bda4ad81b0137d9e09ef8cb0be5c458b7328be75605a3795f7a63f00104a85ebfe4bb34bc5437d58dee709edabb556f SHA512 908ca897a843c5bc1e1a1260adea227f445a2d7a3e09cc2cf7deb1cc85d4163fd89046db95679b8ed1288e2c104585322380765abdd65f2edd10b6027b7b4bab
-AUX speed-dreams-1.4.0-automake.patch 995 BLAKE2B 04280a67277a420108db5ae2675e99d6cdb3461120e9c04313cc6be4f910572cb87b6703d65444cb199d4b5ef2018239a843e1b64cdcb0820e4efdbdb30b0c38 SHA512 2300dd95087d0b7f0aada40041eea70976046085a9d9dc467c86691cf21058855941e642547a7eda26786b5a756d5930867616fb62534a0a2da1301dab3af8f0
-AUX speed-dreams-1.4.0-libpng15.patch 516 BLAKE2B 0464b8a006cc8a35442345d024bb301b0e3a1b4fb16110098aa27422cea35bbb67ccbd2fd689e8cc93b811ca37a4426799c9bd180e4bcca5ae3c20c76462f5b7 SHA512 f945622e791d15020370a1e31d328bc1329e08163a3c4f66fd63987e2dd357e2708338402fcfb5b2e994d4339a3d8d6df7f908b2ecbdff5cb6bd865259d40fa9
-AUX speed-dreams-1.4.0-math-hack.patch 1426 BLAKE2B 9457a89d48dc5fe1e5879ae1ee036ce87fdf51f7042fe7bb0c2213dad2e14d6009d21effc7b7a6a8832a269d0a8ed7c8e6b7e957815a24991fcf01d0a42e64ee SHA512 6187e0948b4b9b29f9934d4a760fb9bfdd81bd083d9f01a119f023fcacfe3f6163f8950934241cde24678ec4e4e081eafe6183263bc09c5f9f4db00c5f90259d
 AUX speed-dreams-2.2.3_rc1-xmlversion-rpath.patch 365 BLAKE2B e8e515f75c0300638a2354b7f07c7cf5b7c8a9cac31e1aa4f4d497fb058ec22776b032f6593558add6a301112a128e55d6f10cbd161354f6a5301cc78e567d25 SHA512 a54cb7315aaef8cf14432f7694aae9368d5e687677cdc9baf4b0270580cef15e9e15155c295e8c8d1fb840a0f66f87b1fc502d137cf7d609089caa2791b4258b
-DIST speed-dreams-1.4.0-r2307-src.tar.bz2 332667666 BLAKE2B 17455c6fc6bbe0cb4b5e00d4217eb49e0f6e39a8aa389f304771e32429c48e2e6bc834d8d0c7a01927376c5b37ae8e7b27399da88784b5f46b9549d46d01222f SHA512 6ae88691f52480351825c20c8bfb3ff54783b84bfbbc385ae2c0578991fa9025b16dcdc4ce136b85246a2a479452f2b209ecbec2be0a7ae85818929ea5fa1195
 DIST speed-dreams-src-base-2.2.3-r7616.tar.xz 238067340 BLAKE2B 5250a295fd077ab5c773bfb066416a2b0abfbd667e99c5c7a360898121af9dc757cf6afd003e220b9e76e687040d80687f8f78d445d6b98064efa396f5b1b4b7 SHA512 a98913625a78a67f7428649c6f3c426d32537b5f1b9331540bb32926568d281e1ec0e80bf45e5d847f43ee00b2d0c5945be96d86ac36d840b79dd3da82920960
 DIST speed-dreams-src-hq-cars-and-tracks-2.2.3-r7616.tar.xz 578705056 BLAKE2B 8b354211686ca6183ada892c844fa0345f2b751b786194d2d52e37a25c8dcf048e91862f2964c337e02765fba4e7bafa81539355a2b00af68476704ddc85c817 SHA512 4a488daeb1161dbc61ca95c5152d38864f759bbc2d0d8cc4d4c4a258aa143dedab55f16ba3343657b2fe8544e1f33ee0bc82e2cdeda7a7087a283e2513a8b6c6
 DIST speed-dreams-src-more-hq-cars-and-tracks-2.2.3-r7616.tar.xz 668751780 BLAKE2B f4c528eebdecc337394a08100e45eb66a8ad5e85164813a27a406d6b54089cd640874d37680588bfffcf3f1fdc274fd2329defb9d052ef2833c86dec8be21c9d SHA512 e8256c28697dd78794c41f2dc659d7aa455f0e5967b3178fbe17eb4adf6ef93ed719621f38afd78c8d0a548bcb7b61bb0859755b4867fee21096fe0925acfd89
 DIST speed-dreams-src-wip-cars-and-tracks-2.2.3-r7616.tar.xz 409517248 BLAKE2B 5dc7af87df13f87e3561dbc139366a1b7041130812d02316c103707102b352de9c3dd111411576f168b813d4c735656a098e681e70e274593762e552aabb517c SHA512 693ebd5f1f81629fe62c7c086de8a924833b3ee1b4a25f803b7214b58f8520b16f4d45cdd96e941f1f884afa3f53afd66ef9a500fda42b928c7124ae9205060a
-EBUILD speed-dreams-1.4.0-r1.ebuild 1786 BLAKE2B 2ab52173cc2029a066a241d7b48bebb578f5d8ad637fc11fbc9c9b86316e3ffaa9c8336e51c087d4556c640d3a00fef2caf97bd10adc7b28c3aeb9fba8171ae9 SHA512 6d6cf5bcb934167eb38aad7de10d2d32b71507293281e08f9413ff180428caa5387096572d962e0427c1055bc8a1ba9a0af0075153790186d372f349bec90438
 EBUILD speed-dreams-2.2.3.ebuild 2454 BLAKE2B 904bdfb5926d22f050933306c0a1270ef63467c3f9ddbb5dd1ea31d2239f77712b2e8d40fa689e1b9d5090b2f0056f1e90e4e94bd14085b779a84a924d11bc0c SHA512 e9145c46e6a685899e80f02478fef611425721c5c14bb2942d1b6b7f877d19dcbba1ba58042b7f5443199138c1e8fded37faadc9e388354d589e3647d74ebb97
-MISC metadata.xml 643 BLAKE2B a9a526d2b3abfb2ba3935d7e62c24fa39f9e43c6f68d9e9128a709bc95aa02681327594eaeb59ab63e2759066fb563360d51eabeb8c0e86ec8bbfb47cfafb5d9 SHA512 274c8d4ee746f6af0faf237710fb3406a440a5a6a660ba53312858195652875fd2a047ef6e43fd692bb0a178c617a0e004bffa03ce41b22f361655b46e8787f0
+MISC metadata.xml 572 BLAKE2B df20855fe0a1319dfbc2a7eb94d10f2d58fb0fb2d94f8d127cafea2947e7d384561725e63f531d53c906145a928d2b2b78689d5314b1954a94ee727f3157d6ab SHA512 49bb95b9a6012dbeff393980c09127531521a3162c4dcfab556d8c4a950b16bca3b526db8db629ad4792faf7c96c33757513d1ecc3dad5fe5cff18621276665a
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch
deleted file mode 100644
index 779119d995b1..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -123,8 +123,7 @@
- AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@lists.sourceforge.net with the subject \"Speed Dreams compilation problem\"]))
- AC_CHECK_LIB(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
- AC_CHECK_LIB(alut, alutLoadWAVFile,
--	LDFLAGS="$LDFLAGS -lalut",
--	LDFLAGS="$LDFLAGS")
-+	LIBS="$LIBS -lalut", )
- 
- AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@lists.sourceforge.net with the subject \"Speed Dreams compilation problem\"]))
-@@ -141,7 +140,7 @@
- AC_CHECK_LIB(glut, glutSwapBuffers,,AC_MSG_ERROR([Can't find libglut. freeglut can be found on http://freeglut.sourceforge.net/]))
- 
- dnl Checks for plib libraries.
--LDFLAGS="$LDFLAGS -lplibjs"
-+AC_CHECK_LIB(plibjs, main,,AC_MSG_ERROR([Can't find libplibjs. PLIB can be found on http://plib.sourceforge.net/]))
- AC_CHECK_LIB(plibul, main,,AC_MSG_ERROR([Can't find libplibul. PLIB can be found on http://plib.sourceforge.net/]))
- AC_CHECK_LIB(plibsg, main,,AC_MSG_ERROR([Can't find libplibsg. PLIB can be found on http://plib.sourceforge.net/]))
- AC_CHECK_LIB(plibsl, main,,AC_MSG_ERROR([Can't find libplibsl. PLIB can be found on http://plib.sourceforge.net/]))
---- a/Make-default.mk
-+++ b/Make-default.mk
-@@ -402,7 +402,7 @@
- ifdef PROGRAM
- 
- ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installprogram: ${PROGRAM}
- 	@ createdir="${INSTLIBBASE}" ; \
-@@ -420,14 +420,14 @@
- ifdef LOCALTOOLS
- 
- ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- endif
- 
- ifdef TOOLS
- 
- ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installtools: ${TOOLS}
- 	@createdir="${INSTBINBASE}/${TOOLSDIR}" ; \
-@@ -478,7 +478,7 @@
- ifdef SOLIBRARY
- 
- ${SOLIBRARY}: ${OBJECTS}
--	${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS}
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/lib" ; \
- 	$(mkinstalldirs) $$createdir ; \
-@@ -509,7 +509,7 @@
- ifdef MODULE
- 
- ${MODULE}: ${OBJECTS}
--	${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} 
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/${MODULEDIR}" ; \
- 	$(mkinstalldirs) $$createdir ; \
---- a/src/libs/client/Makefile
-+++ b/src/libs/client/Makefile
-@@ -23,6 +23,8 @@
- SOURCES   = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
- 	    optionmenu.cpp
- 
-+SOLIBS    = -lconfscreens -lraceengine
-+
- LIBS      =  -lplibssg -lplibsg -lplibul
- 
- EXPDIR    = include
---- a/src/libs/Makefile
-+++ b/src/libs/Makefile
-@@ -23,7 +23,7 @@
- 
- TOOLSUBDIRS	= txml
- 
--SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \
-+SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
- 			  portability math
- 
- PKGSUBDIRS	= $(SUBDIRS)
---- a/src/libs/raceengineclient/Makefile
-+++ b/src/libs/raceengineclient/Makefile
-@@ -23,6 +23,8 @@
- SOURCES      = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \
- 	       raceengine.cpp raceresults.cpp
- 
-+SOLIBS       = -lconfscreens -lrobottools -lracescreens
-+
- EXPDIR       = include
- 
- EXPORTS      = singleplayer.h raceinit.h
---- a/src/libs/tgf/Makefile
-+++ b/src/libs/tgf/Makefile
-@@ -29,6 +29,7 @@
- 		profiler.cpp \
- 		hash.cpp
- 
-+SOLIBS  = -ltxml
- 
- EXPDIR  = include
- 
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch
deleted file mode 100644
index 72c755af9ebd..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.in	2012-03-13 08:15:34.891163505 +0100
-+++ b/configure.in	2012-03-13 08:18:40.154092687 +0100
-@@ -14,9 +14,10 @@
- #
- ##############################################################################
- 
--AC_INIT(Make-config.in)
-+AC_INIT([speed-dreams], [1.4.0-r2307])
-+AC_CONFIG_SRCDIR([Make-config.in])
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE(speed-dreams, 1.4.0-r2307)
-+AC_DEFINE(VERSION, ["1.4.0-r2307"], [Version])
- 
- dnl Checks for programs.
- AC_PROG_CC
---- a/Makefile	2012-03-13 10:43:30.563720337 +0100
-+++ b/Makefile	2012-03-13 10:44:26.339794119 +0100
-@@ -88,17 +88,7 @@
- -include ${MAKE_DEFAULT}
- 
- Make-config: configure Make-config.in
--	rm -f config.status config.log config.cache
- 	./configure
--	rm -f config.status config.log config.cache
--
--configure: configure.in config.h.in aclocal.m4
--	rm -f config.status config.log config.cache
--	autoheader
--	autoconf
--
--aclocal.m4: acinclude.m4
--	aclocal
- 
- distclean: clean
- 	rm -f config.status config.log config.cache
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch
deleted file mode 100644
index 6b09ce2a41c8..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/libs/tgfclient/img.cpp
-+++ b/src/libs/tgfclient/img.cpp
-@@ -98,7 +98,7 @@
-		return (unsigned char *)NULL;
-	}
-	
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
-	{
-		/* Free all of the memory associated with the png_ptr and info_ptr */
-		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -229,7 +229,7 @@
-		return -1;
-	}
-	
--	if (setjmp(png_ptr->jmpbuf)) {    
-+	if (setjmp(png_jmpbuf(png_ptr))) {
-		png_destroy_write_struct(&png_ptr, &info_ptr);
-		fclose(fp);
-		return -1;
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch
deleted file mode 100644
index 32b4f85a2000..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://sourceforge.net/p/speed-dreams/tickets/952/
-https://bugs.gentoo.org/580054
-
---- a/src/modules/simu/simuv2/simu.cpp
-+++ b/src/modules/simu/simuv2/simu.cpp
-@@ -61,7 +61,7 @@
-     if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-     if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-     if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
-+    if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0;
- #else
-     if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-     if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
---- a/src/modules/simu/simuv3/simu.cpp
-+++ b/src/modules/simu/simuv3/simu.cpp
-@@ -61,7 +61,7 @@
-     if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-     if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-     if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
-+    if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0;
- #else
-     if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-     if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml
index 98a79c4a7da3..11c234f855bf 100644
--- a/games-sports/speed-dreams/metadata.xml
+++ b/games-sports/speed-dreams/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="osggraph">Enable the new work-in-progress 3D engine using <pkg>dev-games/openscenegraph</pkg></flag>
 		<flag name="webstats">Enable support for sending racing statistics to a web server (experimental)</flag>
-		<flag name="xrandr">Enable support for the X xrandr extension</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">speed-dreams</remote-id>
diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild
deleted file mode 100644
index d57867be7fb4..000000000000
--- a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop versionator
-
-DESCRIPTION="A fork of the famous open racing car simulator TORCS"
-HOMEPAGE="http://speed-dreams.sourceforge.net/"
-SRC_URI="mirror://sourceforge/speed-dreams/${P}-r2307-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="xrandr"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/freealut
-	media-libs/freeglut
-	>=media-libs/libpng-1.2.40:0
-	media-libs/openal
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	>=media-libs/plib-1.8.3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-asneeded.patch
-	"${FILESDIR}"/${P}-automake.patch
-	"${FILESDIR}"/${P}-libpng15.patch
-	"${FILESDIR}"/${P}-math-hack.patch
-)
-
-src_prepare() {
-	default
-
-	# https://sourceforge.net/apps/trac/speed-dreams/ticket/111
-	MAKEOPTS="${MAKEOPTS} -j1"
-
-	sed -i \
-		-e '/ADDCFLAGS/s: -O2::' \
-		configure.in || die
-	sed -i \
-		-e '/COPYING/s:=.*:= \\:' \
-		Makefile || die
-	sed -i \
-		-e '/LDFLAGS/s:-L/usr/lib::' \
-		-e "/^datadir/s:=.*:= /usr/share/games/${PN}:" \
-		Make-config.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g')
-	[[ -e /dev/dsp ]] && addpredict /dev/dsp
-	econf \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install datainstall
-
-	find "${ED}" -name Makefile -exec rm -f {} + || die
-
-	dodoc CHANGES README TODO
-
-	newicon icon.svg ${PN}.svg
-	make_desktop_entry ${PN} "Speed Dreams"
-}