gentoo resync : 07.08.2021

5 files changed, 113 insertions, 11 deletions

diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index 0a7e87918024..26e20a2429e2 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 ba41de788cb6..fd62335ef610 100644
--- a/games-sports/speed-dreams/Manifest
+++ b/games-sports/speed-dreams/Manifest
@@ -2,6 +2,12 @@ AUX speed-dreams-1.4.0-asneeded.patch 4214 BLAKE2B e0cf81e4bc04dd0a41ca813e2fbd6
 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-rc1-r7601.tar.xz 212142540 BLAKE2B 894c29281d4ee75b7917fac2f98e2509beb8b6c92b2743f24636407fb3ea54a362ec6bf8cd13e79e96696d83caa5db9c6d05a5baf74228d07c7d8d75542f8c12 SHA512 42dd12283e55289e00e25edb769e5786f0d45b6be4c3056f72e6af7cdb2493fc7266f0485a91118c9c9b1a609fe78ce97c10db006ee0dd51e07b5fdb969026b3
+DIST speed-dreams-src-hq-cars-and-tracks-2.2.3-rc1-r7601.tar.xz 578684928 BLAKE2B eeb567bc7bd713c349037e3c630791ead8dd53c4e7c8d8f75b534d72e85352e546a031211aae4a42338f64b3d21496318b72b08e9ffbb3615439d82fd983e424 SHA512 a9ca5926bdf70173df18abd6be7be54705c916207371595bda1bdd5e70d5ee9105f0fd16a72f5a713ea359b2b001b6f8a39251aac46e117ea4bc9e5dad7b69b9
+DIST speed-dreams-src-more-hq-cars-and-tracks-2.2.3-rc1-r7601.tar.xz 668750172 BLAKE2B 851f31e52acd604b5bcb0ec7b393d33f513a6f2f84239160709fde6db3a23ec94dc39d554c9fb3bcaddcb90c308ac5d11a74a9e9fd410b4885fc9bedee60fb50 SHA512 1aa25700bb60c7a4d47817f821f54603dca9aaf662a23607a3fad367352f69c5182825a8ff4051736095b1277d4de017f5106200f77d74cb7a59780c97d3536c
+DIST speed-dreams-src-wip-cars-and-tracks-2.2.3-rc1-r7601.tar.xz 429292132 BLAKE2B ffb20028ec792a423cd745db1a47274a5db9115510c33bf28c7323bf23a024aa3441dab045b6e81fdc3d17ac22f8919ffa044d07932d242f8cefaa7e274cbc51 SHA512 a31a592c6d86bc12b8d8df6013fc783677e611f4953b6a8650465dbd6ebfb0adcf51193e5003ff38b30619f145c752fe18121d2630bd64687bac113cd8d8c283
 EBUILD speed-dreams-1.4.0-r1.ebuild 1786 BLAKE2B 2ab52173cc2029a066a241d7b48bebb578f5d8ad637fc11fbc9c9b86316e3ffaa9c8336e51c087d4556c640d3a00fef2caf97bd10adc7b28c3aeb9fba8171ae9 SHA512 6d6cf5bcb934167eb38aad7de10d2d32b71507293281e08f9413ff180428caa5387096572d962e0427c1055bc8a1ba9a0af0075153790186d372f349bec90438
-MISC metadata.xml 435 BLAKE2B d5cf15023cbbcfdb115d16b462337e9545185bd6e827e226965f8fe470c8a9825872fccfbdbdf8c208e2902f4adc4afdb1ff0f880fb0954aa8897115b9d47669 SHA512 d7b7bcb0acec23ac1f3b45f794a99597318194ab58d9b488c21766a8a6c32572b3d62540090a0c06e06a7f90d4330d3f7eb730e4c4a56a0a7a7c2bc94d77ed2f
+EBUILD speed-dreams-2.2.3_rc1.ebuild 2408 BLAKE2B eadd258c2ed982d977891434fe41454349ce558c78e95cbbb2c1d8222dcfb46fc1008003dbf0ed81710501905832b54e0168d09c5748a297a9dcab2c001bb217 SHA512 656b09707a1c1331cdc937818e318dfde4bf481bfc681a56d2d5c799625155305b37096ca4c1200f1f59dd41e1db366ca21070cbe4071347d80a40abaaa2b9f3
+MISC metadata.xml 643 BLAKE2B a9a526d2b3abfb2ba3935d7e62c24fa39f9e43c6f68d9e9128a709bc95aa02681327594eaeb59ab63e2759066fb563360d51eabeb8c0e86ec8bbfb47cfafb5d9 SHA512 274c8d4ee746f6af0faf237710fb3406a440a5a6a660ba53312858195652875fd2a047ef6e43fd692bb0a178c617a0e004bffa03ce41b22f361655b46e8787f0
diff --git a/games-sports/speed-dreams/files/speed-dreams-2.2.3_rc1-xmlversion-rpath.patch b/games-sports/speed-dreams/files/speed-dreams-2.2.3_rc1-xmlversion-rpath.patch
new file mode 100644
index 000000000000..784a35f9826a
--- /dev/null
+++ b/games-sports/speed-dreams/files/speed-dreams-2.2.3_rc1-xmlversion-rpath.patch
@@ -0,0 +1,11 @@
+Building with install rpath makes things simpler, but this is an issue
+for used-only-at-build-time xmlversion. Suboptimal fix given all these
+are built for CHOST.
+--- a/src/tools/xmlversion/CMakeLists.txt
++++ b/src/tools/xmlversion/CMakeLists.txt
+@@ -2,4 +2,5 @@
+ PROJECT(xmlversion)
+ 
++SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ SET(XMLVERSION_SOURCES main.cpp)
+ 
diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml
index 7585d6ad4181..98a79c4a7da3 100644
--- a/games-sports/speed-dreams/metadata.xml
+++ b/games-sports/speed-dreams/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="xrandr">Enable support for the X xrandr extension</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">speed-dreams</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<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>
+	</upstream>
 </pkgmetadata>
diff --git a/games-sports/speed-dreams/speed-dreams-2.2.3_rc1.ebuild b/games-sports/speed-dreams/speed-dreams-2.2.3_rc1.ebuild
new file mode 100644
index 000000000000..24aa937c04a0
--- /dev/null
+++ b/games-sports/speed-dreams/speed-dreams-2.2.3_rc1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop
+
+MY_PV="$(ver_rs 3 -)-r7601"
+
+DESCRIPTION="Fork of the famous open racing car simulator TORCS"
+HOMEPAGE="http://www.speed-dreams.org/"
+SRC_URI="
+	mirror://sourceforge/speed-dreams/${PN}-src-base-${MY_PV}.tar.xz
+	mirror://sourceforge/speed-dreams/${PN}-src-hq-cars-and-tracks-${MY_PV}.tar.xz
+	mirror://sourceforge/speed-dreams/${PN}-src-more-hq-cars-and-tracks-${MY_PV}.tar.xz
+	mirror://sourceforge/speed-dreams/${PN}-src-wip-cars-and-tracks-${MY_PV}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+ BitstreamVera CC0-1.0 Free-Art-1.2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug osggraph webstats"
+
+RDEPEND="
+	dev-games/freesolid
+	dev-libs/expat
+	media-libs/libpng:=
+	media-libs/libsdl2[X,haptic,opengl,joystick,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/plib
+	net-libs/enet:1.3
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/opengl
+	osggraph? ( dev-games/openscenegraph:=[png] )
+	webstats? ( net-misc/curl )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-xmlversion-rpath.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_WITH_INSTALL_RPATH=yes # see xmlversion-rpath patch
+		-DOPTION_3RDPARTY_SOLID=yes
+		-DOPTION_HUDDEBUG=$(usex debug)
+		-DOPTION_OFFICIAL_ONLY=yes
+		-DOPTION_OSGGRAPH=$(usex osggraph)
+		-DOPTION_TRACE_LEVEL=$(usex debug 5 3)
+		-DOPTION_WEBSERVER=$(usex webstats)
+		-DOpenGL_GL_PREFERENCE=LEGACY # legacy needed for gl*ARB symbols
+		-DSD_BINDIR="${EPREFIX}"/usr/bin
+		-DSD_DATADIR="${EPREFIX}"/usr/share/${PN}-2
+		-DSD_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}-2
+
+		# These features currently lack official support and portions
+		# of the required code is missing in release tarballs.
+		# Check if these directories exist on a version bump.
+		#-DOPTION_3RDPARTY_SQLITE3=yes # src/modules/simu/simureplay/
+		#-DOPTION_CLIENT_SERVER=yes # src/modules/csnetworking/
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local HTML_DOCS=( doc/userman/. )
+	cmake_src_install
+
+	newicon data/data/icons/icon.png ${PN}-2.png
+	make_desktop_entry ${PN}-2 "Speed Dreams 2" ${PN}-2
+}
+
+pkg_postinst() {
+	# Issue reproduced in testing, warn in case it's widespread.
+	elog "If you experience freezes in menus, try to disable menu music in options."
+	elog "See: https://sourceforge.net/p/speed-dreams/tickets/973/"
+}