oolite 1.90

games-action/oolite/Manifest

@@ -1,6 +1,3 @@
-DIST firefox-4.0.source.js-only.tbz 6198554 SHA256 173b8798043612e50fa7618858c3a92d06f1f439d6d336a5700548cc5d75580a SHA512 37c7fc171113a9b8a1c185cf535eff8b38f8bfeb5af282b20642b5c7efa5a85a635db1f5250f041ca2e5b0bbdbb1139af6a8bf16dbbb6ff5609543482cfc6c66 WHIRLPOOL 6fcaecff23c09f917fe7a8c39548a4612b4d9cfd21ca418530d5398bbc2121319b57334bba843cba4d4a6000562a77fdafb21cb7b7b711ee9d568d928ddf82e9
-DIST oolite-1.84.tar.gz 13368123 SHA256 0536eda1634142fba77a0251407209923099f5b80bafc443474d7f5e9dfc1d9d SHA512 9a36bb39ed623fd4d549fd460d2c2020b19024bf9387c057e69c8d524c6dd952a1f25aadd483a3c668e41abe92fde3edd0030e61da458ae0a0b2b0332f6e1b98 WHIRLPOOL dc2ab2bc3b119b12fe6e3a41d1de100350e7e3621cbebde4f2cd9003eb816195442590ba4abc1d8be5e2a10994a0e2eb64b2e80e48b134b3f969c872ec0222d4
-DIST oolite-1.86.tar.gz 13437313 SHA256 cc841dd1a1ae6443b853c1dba10e9ac7308c1916f72d26228b932bba70971074 SHA512 6b42771b656308d8f11709d3389470512fdae7a97c1f24dd085355b3da245d5d4a5c33140282ceace206ea0d97309967563df793210773dba779dd722fbea264 WHIRLPOOL cd3c3e3a33c6cb2984b2d21a1371d70c2b6a2f585f8baf43e1ce54b74b0445824cf7efeecd5e5957a3e426448a468e500e973628fedd4fe416014fc468a4ea3a
-DIST oolite-binary-resources-1.84.zip 96756030 SHA256 4230630b390e633d95ff094e756707e97969c3d22b688faffbe4f7282bdf78d5 SHA512 1bacb1e94d9c04491e0d161db35c32f45d7a104241e3257d26d2a510edd7847eae5ea6e0914e37a09084130415cc8c4369795cdfa7ff855c1426f1cb4bafa281 WHIRLPOOL b9721ab607cf6548af99aeed72173ac534f12b2925f9981eefd999ea487e563b5f6f06c6d7e5f1a50d1587356d969f6061040827517945b307cdf059a8f50d8a
-DIST oolite-binary-resources-1.86.tar.gz 96658796 SHA256 50e775cc28766b5657caff3f53ac4f49c8a64778e442706221acfb5c2f2ffd4d SHA512 3dfc5a45f10ab86a1d236029e8fe7f0a580a037daade69e1c8efc4bf8c2cd7887b5808f8353e28bdb768709d1a658d00c39ee26f7168a204784baadd9eaa228d WHIRLPOOL 816907d025facb18b9adbc7cf0d47ac8d3140ac8bd8d66b25ab0777679b42a28e7ee4e866ba535dd35071c608088b5181c616d3ad1284ceec5662eab0c7d0aa7
-DIST oolite-sdl-dependencies-1.86.tar.gz 566021 SHA256 4c44fce658c7be90ef24dad443d916c5813b20d87ec0b65f0d42f5ac00248800 SHA512 6167f2ae855f4c24623371ccc40b12b1fbbebc51d2b166746c9b5d9222ab62e9242ef787febec5704141104287124c8b728ff68ce533e53869f8d69cde211459 WHIRLPOOL 50b4f4e8a4c5bb5a76bcae3fba64d9b9cf34ff65870f097d64b898bebde3e22f9d9436313545d31634bb1000a8982db1eddbaa6ddde75a8cda682a04a2002807
+DIST oolite-1.90.tar.gz 13909244 SHA256 63b128ab6c5db33e85aef7dbe9d86b4937d314dbd736f1daefe3bb131957663b SHA512 05dce547528314fd2d1868f9a8b2eff9ad22f154f2690211432f1d82f843d57ae8e25cec7c24a2ab3b91fd7c19222748b5d6deb66946f1357a087cc7f9cc9ac1 WHIRLPOOL 226ae38930884628fdfbab29dfd01c5c7d9393e4782721c820ecda3989836569578b4e6f485b0c3d4e7dc500fa50bafa74e88be5a346045653deca79c1142617
+DIST oolite-binary-resources-1.90.tar.gz 99088607 SHA256 538c654a7bea611ae6374abbf4941b76c71072da1e534b69c43c93bdeed19c56 SHA512 4a647c9f5990faeff8d3259ab248a68e7ea02bd8fec4df40088dfd36863bfde6463e3fda835dc63a63359df23dc8e62b53919b0ee0c3de738d8a6e5f15e455b9 WHIRLPOOL c06bcbb6d7888b3482109b48ba1362ace272bd23b43d51efa3430e298e9f250ce7b09f5777a3b0432245726cc00649025678a42e581e7e91952bcd273f6817ad
+DIST oolite-sdl-dependencies-1.90.tar.gz 566021 SHA256 4c44fce658c7be90ef24dad443d916c5813b20d87ec0b65f0d42f5ac00248800 SHA512 6167f2ae855f4c24623371ccc40b12b1fbbebc51d2b166746c9b5d9222ab62e9242ef787febec5704141104287124c8b728ff68ce533e53869f8d69cde211459 WHIRLPOOL 50b4f4e8a4c5bb5a76bcae3fba64d9b9cf34ff65870f097d64b898bebde3e22f9d9436313545d31634bb1000a8982db1eddbaa6ddde75a8cda682a04a2002807

games-action/oolite/files/oolite-1.90-gentoo.patch

@@ -0,0 +1,43 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index 95b4b28..4a700ea 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -153,9 +153,7 @@ oolite_C_FILES = \
+     legacy_random.c \
+     strlcpy.c \
+     OOTCPStreamDecoder.c \
+-    OOPlanetData.c \
+-	ioapi.c \
+-	unzip.c
++    OOPlanetData.c
+ 	
+ ifeq ($(GNUSTEP_HOST_OS),mingw32)
+ oolite_WINDRES_FILES = \
+diff --git a/GNUmakefile.postamble b/GNUmakefile.postamble
+index 5d97459..f09ca5b 100644
+--- a/GNUmakefile.postamble
++++ b/GNUmakefile.postamble
+@@ -4,10 +4,6 @@
+ # to live (Contents/Resources)
+ #
+ CP_FLAGS                         = -rf
+-
+-ifeq ($(debug),yes)
+-    EXT                          =.dbg
+-endif
+                                  
+ ifeq ($(findstring -gnu,$(GNUSTEP_HOST_OS)),-gnu)
+     CP_FLAGS                     += -u
+diff --git a/Makefile b/Makefile
+index 5d93c57..8af1d91 100644
+--- a/Makefile
++++ b/Makefile
+@@ -65,7 +65,7 @@ debug: $(DEPS_DBG)
+ 
+ .PHONY: release
+ release: $(DEPS)
+-	$(MAKE) -f GNUmakefile debug=no strip=yes
++	$(MAKE) -f GNUmakefile debug=no strip=no
+ 	mkdir -p AddOns && rm -rf AddOns/Basic-debug.oxp && cp -rf DebugOXP/Debug.oxp AddOns/Basic-debug.oxp
+ 
+ .PHONY: release-deployment

games-action/oolite/oolite-1.84.ebuild

@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnustep-2
-
-DESCRIPTION="Elite space trading & warfare remake"
-HOMEPAGE="http://oolite.org/"
-FF_JS_URI="http://jens.ayton.se/oolite/deps/firefox-4.0.source.js-only.tbz"
-BINRES_REV=f5aed27fefc32c24775b39fce25402b970b09b84
-SRC_URI="https://github.com/OoliteProject/oolite/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/OoliteProject/oolite-binary-resources/archive/${BINRES_REV}.zip -> oolite-binary-resources-${PV}.zip
-	${FF_JS_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="${IUSE} debug"
-
-RDEPEND="virtual/opengl
-		gnustep-base/gnustep-gui
-		media-libs/sdl-mixer
-		media-libs/sdl-image
-		app-accessibility/espeak
-		media-libs/libvorbis
-		dev-libs/nspr
-		media-libs/libpng:0
-		media-libs/openal
-		sys-libs/zlib[minizip]"
-
-DEPEND="${RDEPEND}
-		gnustep-base/gnustep-make[-libobjc2]"
-
-PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" )
-
-src_prepare() {
-	gnustep-base_src_prepare
-	mv "${WORKDIR}/mozilla-2.0/js" "${S}"/deps/mozilla/ || die
-	mv "${WORKDIR}/mozilla-2.0/nsprpub" "${S}"/deps/mozilla/ || die
-	mv "${WORKDIR}/oolite-binary-resources-${BINRES_REV}"/* "${S}"/Resources/Binary/
-	echo "${FF_JS_URI}" > "${S}"/deps/mozilla/current.url
-	sed -i -e 's/^\.PHONY: all$/.PHONY: .NOTPARALLEL all/' "${S}"/libjs.make || die
-	sed -i -e 's:.*STRIP.*:	true:' \
-		-e '/ADDITIONAL_OBJCFLAGS *=/aADDITIONAL_OBJCFLAGS += -fobjc-exceptions' \
-		-e '/ADDITIONAL_OBJC_LIBS *=/aADDITIONAL_OBJC_LIBS += -lminizip' \
-		-e 's|:src/Core/MiniZip||g' \
-		-e 's|-Isrc/Core/MiniZip|-I/usr/include/minizip|' \
-		"${S}"/GNUmakefile || die
-	sed "/void png_error/d" -i src/Core/Materials/OOPNGTextureLoader.m
-}
-
-src_compile() {
-	egnustep_env
-	# explicit Makefile because there are many and Makefile is choosen by default
-	emake -f Makefile $(use debug && echo debug || echo release)
-}
-
-src_install() {
-	#gnustep-base_src_install
-	egnustep_env
-	install_root="$(gnustep-config --variable=GNUSTEP_LOCAL_APPS)"
-	insinto "${install_root}"
-	doins -r oolite.app
-
-	echo "openapp oolite" > "${T}/oolite"
-	dobin "${T}/oolite"
-	fperms a+rx "${install_root}/oolite.app/oolite"
-	doicon installers/FreeDesktop/oolite-icon.png
-	domenu installers/FreeDesktop/oolite.desktop
-}

games-action/oolite/oolite-1.86.ebuild → games-action/oolite/oolite-1.90.ebuild

@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit gnustep-2
+inherit gnustep-2 desktop
 
 DESCRIPTION="Elite space trading & warfare remake"
 HOMEPAGE="http://oolite.org/"
 FF_JS_URI="http://jens.ayton.se/oolite/deps/firefox-4.0.source.js-only.tbz"
-BINRES_REV=1d78e8aa776bc3ac8611dd26c11c709548729239
-OOLITE_REV=15eb90fd792fffb4c6edbb3bbea5c1b75da2979b
+BINRES_REV=1fe395fe185611b2de54b027cda6c29f15a9f3a0
+OOLITE_REV=1.90
 SDLDEL_REV=dd17796b2ee1257bea04aeffaec660f6c75eadf2
 SRC_URI="https://github.com/OoliteProject/oolite/archive/${OOLITE_REV}.tar.gz -> ${P}.tar.gz
 	https://github.com/OoliteProject/oolite-binary-resources/archive/${BINRES_REV}.tar.gz -> oolite-binary-resources-${PV}.tar.gz
@@ -38,7 +38,7 @@ RDEPEND="virtual/opengl
 DEPEND="${RDEPEND}
 		gnustep-base/gnustep-make[-libobjc2]"
 
-PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" "${FILESDIR}/external-mozjs.patch" )
+PATCHES=( "${FILESDIR}/${P}-gentoo.patch" "${FILESDIR}/external-mozjs.patch" )
 
 src_prepare() {
 	gnustep-base_src_prepare
@@ -49,7 +49,7 @@ src_prepare() {
 		-e '/ADDITIONAL_OBJC_LIBS *=/aADDITIONAL_OBJC_LIBS += -lminizip' \
 		-e 's|:src/Core/MiniZip||g' \
 		-e 's|-Isrc/Core/MiniZip|-I/usr/include/minizip|' \
-		-e 's|LIBJS = js_static|LIBJS = mozjs185|' \
+		-e 's|LIBJS *= js_static|LIBJS = mozjs185|' \
 		"${S}"/GNUmakefile || die
 	sed "/void png_error/d" -i src/Core/Materials/OOPNGTextureLoader.m
 	rm -rf src/Core/MiniZip/
@@ -68,7 +68,8 @@ src_install() {
 	insinto "${install_root}"
 	doins -r oolite.app
 
-	echo "openapp oolite" > "${T}/oolite"
+	echo '#!/bin/sh' > "${T}/oolite"
+	echo "exec openapp oolite" >> "${T}/oolite"
 	dobin "${T}/oolite"
 	fperms a+rx "${install_root}/oolite.app/oolite"
 	doicon installers/FreeDesktop/oolite-icon.png