gentoo auto-resync : 13:07:2024 - 12:26:41

4 files changed, 18 insertions, 95 deletions

diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index bcbf925f3b6b..a1276130cc94 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 38d9b28e6396..2c4b61969389 100644
--- a/games-sports/speed-dreams/Manifest
+++ b/games-sports/speed-dreams/Manifest
@@ -1,12 +1,7 @@
 AUX speed-dreams-2.2.3_rc1-xmlversion-rpath.patch 365 BLAKE2B e8e515f75c0300638a2354b7f07c7cf5b7c8a9cac31e1aa4f4d497fb058ec22776b032f6593558add6a301112a128e55d6f10cbd161354f6a5301cc78e567d25 SHA512 a54cb7315aaef8cf14432f7694aae9368d5e687677cdc9baf4b0270580cef15e9e15155c295e8c8d1fb840a0f66f87b1fc502d137cf7d609089caa2791b4258b
-DIST speed-dreams-src-base-2.2.3-r7616.tar.xz 238067340 BLAKE2B 5250a295fd077ab5c773bfb066416a2b0abfbd667e99c5c7a360898121af9dc757cf6afd003e220b9e76e687040d80687f8f78d445d6b98064efa396f5b1b4b7 SHA512 a98913625a78a67f7428649c6f3c426d32537b5f1b9331540bb32926568d281e1ec0e80bf45e5d847f43ee00b2d0c5945be96d86ac36d840b79dd3da82920960
 DIST speed-dreams-src-base-2.3.0-r8786.tar.xz 250870100 BLAKE2B a64f52a2a7f01124e524e4f375941d6538b3756fad1bc802d7d791d6904cd121bae96ca4856440333009d7f53f5ff47183b718932d36c8da3b817cfe467469f7 SHA512 b678a722a1f9fd62779ab776d5f5777d6fc68ecbb29991bd315319218c1d7e6554ad489c44076b1f0699e9ff72c298373315f1d7c63c87c566a009cae85fad39
-DIST speed-dreams-src-hq-cars-and-tracks-2.2.3-r7616.tar.xz 578705056 BLAKE2B 8b354211686ca6183ada892c844fa0345f2b751b786194d2d52e37a25c8dcf048e91862f2964c337e02765fba4e7bafa81539355a2b00af68476704ddc85c817 SHA512 4a488daeb1161dbc61ca95c5152d38864f759bbc2d0d8cc4d4c4a258aa143dedab55f16ba3343657b2fe8544e1f33ee0bc82e2cdeda7a7087a283e2513a8b6c6
 DIST speed-dreams-src-hq-cars-and-tracks-2.3.0-r8786.tar.xz 698564396 BLAKE2B 30ab454a109ebe2a0922b0e9bcc2d3a02e84f7c4a5591c235a144e79d96153c67846781ee8e23028457c6e59d49a8bc62f54c5c022f1180e5e10b7303342f4b8 SHA512 4f67539bb7e9b126500426d2323035053d6a9f1bf7b6947fc9fc39fee53551ba652d93c95337d2cd74280455f25d55e2a922bc64380bba5b8ea40163ad9ab7cf
-DIST speed-dreams-src-more-hq-cars-and-tracks-2.2.3-r7616.tar.xz 668751780 BLAKE2B f4c528eebdecc337394a08100e45eb66a8ad5e85164813a27a406d6b54089cd640874d37680588bfffcf3f1fdc274fd2329defb9d052ef2833c86dec8be21c9d SHA512 e8256c28697dd78794c41f2dc659d7aa455f0e5967b3178fbe17eb4adf6ef93ed719621f38afd78c8d0a548bcb7b61bb0859755b4867fee21096fe0925acfd89
 DIST speed-dreams-src-more-hq-cars-and-tracks-2.3.0-r8786.tar.xz 795460296 BLAKE2B 70ea28aa6f6f5ec57f673ade55e526cd20dfb47964aaed044086557dcefc2b7b246c90ae55350ef6d911c11af5592d6ae5d7b3847ab4819b1b073104fef7ce86 SHA512 8eb252fe38d74dbd8b5a39d027b739484520ac21be928c1c4fb00a3b845ca51b63d2d59d11119c26c998fb859dba0ab711e8da1ea83430f771e1903411eb44c4
-DIST speed-dreams-src-wip-cars-and-tracks-2.2.3-r7616.tar.xz 409517248 BLAKE2B 5dc7af87df13f87e3561dbc139366a1b7041130812d02316c103707102b352de9c3dd111411576f168b813d4c735656a098e681e70e274593762e552aabb517c SHA512 693ebd5f1f81629fe62c7c086de8a924833b3ee1b4a25f803b7214b58f8520b16f4d45cdd96e941f1f884afa3f53afd66ef9a500fda42b928c7124ae9205060a
 DIST speed-dreams-src-wip-cars-and-tracks-2.3.0-r8786.tar.xz 414204048 BLAKE2B 4588cae0e8db0a7c2764168b6745e83d36bb1ed7a9a70008a07661249eeb163cedbf9fd85c1961bd929043f68098ce5ee218c2374c81fdbde048b24cd07b1acd SHA512 64651237115149ec063fcb11faf64b62005ee590526c5101a5a6a632aeb130b691b2651299eaf4190ddf1fd00ae33007d6f1d62441c672b4808ef33201ef1dbf
-EBUILD speed-dreams-2.2.3.ebuild 2511 BLAKE2B 6ee5123362710477879bc4264d3a7a87f1cff0527af4b5a3d3c3ac75088732d731f376d1d4be47db433557ffc7726ef5666789145e445db7754291c1ffea1ac1 SHA512 d4d22624039fe6c057c4a6667a4bdc1eb2a418c0f2b7289a0611b78a516b5959988ad5f7bdecfab7063dc0a294b0794483a8c5376f0eaa71a202c46dcf0065e1
-EBUILD speed-dreams-2.3.0.ebuild 2509 BLAKE2B d116e1f2814303a5c4af7aeceb6322c313c59a0c3144838b915b367ba4850b56b503c9803140b443ca2665ee71057752fa7ae5928eb74ef7553463ec65b06353 SHA512 3a622e8c4d49bd22faba321a7b3e9db0eda1cf7a24792cdd679d4d49a3cf3f52868104cb12a0de7b00ba060d2b3c01d2c0ef57b71527ede63c0d03fa444e9eb3
+EBUILD speed-dreams-2.3.0-r1.ebuild 2694 BLAKE2B 80e466ce35a40a77101d117318f407d7a208aa621b5dc1467edb719efe86f7a78164651d7ae7617bc9c5ca13e1fd895a26711eee01058317aec50f0af46addb5 SHA512 15e060758677d9d10b9ee8d5676126dcaecdc27f3f9e5ee254e40c93fe20a5b2fd5cc81ffdfde07ac40e8fd9a1d925b656350db9451ba0bbc2caed7c1583b9d1
 MISC metadata.xml 573 BLAKE2B 839027f157f7b6b8d6f1813615ba42acdb95a4f99bb697240dc94eda842729634a3c995b3a89d780ef8630743b04613d48a16a8d598eb03981aa7ad2f61f72cb SHA512 decaf43aa6218e89bfb1069ff7c0fd3f281bb1ff2f4cebf6d9f79ca11478989401dabccd55d4cbf23df7bb9f21301acb4f9d31c16f37de01538b3c2578e5428c
diff --git a/games-sports/speed-dreams/speed-dreams-2.2.3.ebuild b/games-sports/speed-dreams/speed-dreams-2.2.3.ebuild
deleted file mode 100644
index 9523cee78445..000000000000
--- a/games-sports/speed-dreams/speed-dreams-2.2.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop flag-o-matic
-
-MY_PV="${PV}-r7616"
-
-DESCRIPTION="Fork of the famous open racing car simulator TORCS"
-HOMEPAGE="http://www.speed-dreams.org/"
-SRC_URI="
-	https://downloads.sourceforge.net/speed-dreams/${PN}-src-base-${MY_PV}.tar.xz
-	https://downloads.sourceforge.net/speed-dreams/${PN}-src-hq-cars-and-tracks-${MY_PV}.tar.xz
-	https://downloads.sourceforge.net/speed-dreams/${PN}-src-more-hq-cars-and-tracks-${MY_PV}.tar.xz
-	https://downloads.sourceforge.net/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}"/${PN}-2.2.3_rc1-xmlversion-rpath.patch
-)
-
-src_configure() {
-	append-cppflags -I. #806980
-
-	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/"
-}
diff --git a/games-sports/speed-dreams/speed-dreams-2.3.0.ebuild b/games-sports/speed-dreams/speed-dreams-2.3.0-r1.ebuild
index 089280d3a4e6..447fede1cff1 100644
--- a/games-sports/speed-dreams/speed-dreams-2.3.0.ebuild
+++ b/games-sports/speed-dreams/speed-dreams-2.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake desktop flag-o-matic
+inherit cmake java-pkg-2 desktop flag-o-matic
 
 MY_PV="${PV}-r8786"
 
@@ -20,9 +20,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug osggraph webstats"
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-games/freesolid
 	dev-libs/expat
+	media-libs/libjpeg-turbo:0=
 	media-libs/libpng:=
 	media-libs/libsdl2[X,haptic,opengl,joystick,video]
 	media-libs/sdl2-mixer
@@ -32,13 +33,17 @@ RDEPEND="
 	sys-libs/zlib:=
 	net-misc/curl
 	virtual/glu
-	virtual/jpeg
 	virtual/opengl
 	osggraph? ( dev-games/openscenegraph:=[png] )
 "
 DEPEND="
-	${RDEPEND}
+	${COMMON_DEPEND}
+	>=virtual/jdk-11:*
 	x11-base/xorg-proto"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.3_rc1-xmlversion-rpath.patch
@@ -50,6 +55,10 @@ src_unpack() {
 	default
 }
 
+src_prepare() {
+	cmake_src_prepare
+}
+
 src_configure() {
 	append-cppflags -I. #806980
 
@@ -75,6 +84,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile
+}
+
 src_install() {
 	local HTML_DOCS=( doc/userman/. )
 	cmake_src_install