gentoo auto-resync : 25:10:2022 - 15:53:58

4 files changed, 5 insertions, 125 deletions

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 32f8a477edac..4b268cd6c4ae 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,10 +1,8 @@
 AUX celestia-1.5.0-desktop.patch 1371 BLAKE2B f4964ea5794b6fa7eff49cb4d9879226e83739dfe877f055f1cbff25562f324e30af3ef4ee68897324504b06a6a6c84c2cee4caf78914792a4c89e54ed580b14 SHA512 937d3a733ec679ed4fb7644b2ae0bf780972dce7ac7d6e30dfbd7cad3e90354460a3e1c3df268514048e53979d22b1bdee70dd340f8c9977e7a0749c65a24bf7
 AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475955af733e013fcafb2b37975fb1f2215afe61a715b5ec7716dbd75b5915dd4a5031255adb8fde5f6e64d9b71a5 SHA512 50cce63a701da85b52bee5db5b34eed77118c7c847612b4bc7ae82c80b198c718b4adbf0f21cc82e4afbafe20f53dda191285095d6ee5e796ce7f6c94388b832
 AUX celestia-1.7.0-cmake_lua_version.patch 287 BLAKE2B 29a555fd2443ba4c20508566a909cdcfe47b3e2ca8fea68d9fdc5427cfcdbd332c3179f3ea090c076d20cd36ec694b7cbef3008f87407ba4af7c6ea311853e24 SHA512 f1ae5eb360399d817c90b2ab058452f55f8fdc293568bd9b919cc2d71586da9146db2131abfd54c2c7dc9cb6230728e8435f7663b7125d8caaebe241aa8a7e72
-DIST celestia-1.7.0_pre20200316.tar.gz 69459012 BLAKE2B 8e718e8a4aa064b9be0bd5f0f1c034f3ffec42671c6eae503216f5ea2787e8c5da3315e3cb39e94e2a0eab5f067e189fe70dc9d04bff4127e9e39fba3a7117ae SHA512 db4213e1d76699ff01390f12e3763596dfd2641389743c27221b4e7934be9daca7a884dd389135894d225e8613830468ebede5664543e27e44e21e19d22d1e7f
 DIST celestia-1.7.0_pre20220120-data.tar.gz 310327016 BLAKE2B 507a8d5fd1307fc711b9604e00a1596bc971dbb2c936554ffd1f0e842bec6dc6d2233c04911dcd5a6e1405d9e5806c87ec22ba4f26f0e3d770bd1b6735777b0b SHA512 6443127b42586e4ad16b25fa39193a165065682cd8163b241bdcbbe755c2104e4c29b291898076437c4387cd72cdb3bd347a010738505f39ccb658300aff836d
 DIST celestia-1.7.0_pre20220120.tar.gz 5157089 BLAKE2B 5ce0413a58b2f4ca9ac9c585bfe1da9aaf0a0405d7e910b3f639d3b3a0532110dd5d28a0aec1c245a4bcebd549847023c2d84e8c29892e228dd87392bebd9ae3 SHA512 175e2280b334c4a2b6be9fa05a06abf8daa9e890cd03c11d359d26b7f0175b1662e3bf0d8abea04ad2f541780ac8b3898e47bc2bdc9e90e408e4607e2ae3fb29
-EBUILD celestia-1.7.0_pre20200316-r100.ebuild 2940 BLAKE2B ac74dcd32d79aff696dab44424d5318ae089965705375da24b7476e31df4ca22479c62f40671ae0251b6c9de5cedbddae5c671716a7692f0a08c82d2bcd5b89d SHA512 bc18d39ad3a03b5492ae8cd05b64a9212d7689ab8ee4f5d06a801e408183631b800e62b5797b20b63adf7e760128542fd32d26aaa285fa7f7b540d8a233a6356
-EBUILD celestia-1.7.0_pre20220120.ebuild 3351 BLAKE2B bb2a1c9e6f57653a55acc4630a7e5481a65868f11610642a91cbb74728a2ab5190cc3d6ba2f2f0c2bad582df11dbeab46cdeb5bd9546591349acce6b5c2995b7 SHA512 8c9c957c3af4bbd5b74baf3f4b2ac50a478616512bc5ee8b84ce0a84f763b23e94e136af918096057c79766a0c0baf043d00bb63b524021e1a9c3ad78a5acfa0
-EBUILD celestia-9999.ebuild 2714 BLAKE2B 495fd02b3fc52f71f9ef7962be17d11a815ed931800a0f80eac20a8200229d337da56a1fc326d759409eac09c0f886df467688ab7d79be363c598586151c8135 SHA512 463b18f6717fd4061b1a7b61d7839114f991567f68abd6a1bdca92845a16db76c520e77d2e501b38e2e746afc22ab7c6e35104da85b17fb34aa017305d0ddd62
+EBUILD celestia-1.7.0_pre20220120.ebuild 3351 BLAKE2B ebfd3b46999cc64972fae4c72ca80f4a92c82930a315dd36dfcef2eeea3113c8a7f6b0db423c45e9ea63f99343aba814795045a5b129799744f58e2d04a536f6 SHA512 89422b749430bf3d1549d7c48338992b468e09026a521e06bb99c051fad632f49236eebf4da3c479d85e9c00e9f5ef6e6301261095b9dad66f05a263ef9bddc5
+EBUILD celestia-9999.ebuild 2727 BLAKE2B a1debba61a2944f190954c4f1c2674d6843b7536d9d4839374f33e8b19478840303daa53cc428efd0bddcc6aa904049b3f04c80168cc3c7ac1483066f0882b98 SHA512 ad0c713ab2bb2b60449be19daac43429b48eeeffa4a0dbc4b4f23086919abebd04aa3c2a10f7551b0c654495f52a397c57e61ae4ede611d139ce575717f5ad17
 MISC metadata.xml 961 BLAKE2B 9882411b0f8e648bbdbb4b6c3c2ea16827e74c0659d753e745e9fb3539d70964e5eca8e979aeacddeaf429b5e8139e45752c5ab223d5ea2873db954bfc8267fe SHA512 b8ba090ef14e6ec7e5db2e01a690be91611b72366169ae4a815977bcf7db89e09b153faf2adaa71441be0025cff298a0d935c3f56a934aeb21cd44f39dbbcf9b
diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
deleted file mode 100644
index e408eb4d09d4..000000000000
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit desktop flag-o-matic lua-single xdg cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		COMMIT_ID="df508a0c597a3d96c1c039fa4a973e294021cfba"
-		SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN^}-${COMMIT_ID}"
-		KEYWORDS="~amd64 ~x86"
-	else
-		SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	fi
-fi
-
-DESCRIPTION="OpenGL 3D space simulator"
-HOMEPAGE="https://celestia.space"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="glut lua nls +qt5 theora"
-REQUIRED_USE="|| ( glut qt5 )
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-	dev-cpp/eigen
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	<dev-libs/libfmt-9.0.0:=
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	glut? ( media-libs/freeglut )
-	lua? ( ${LUA_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# make better desktop files
-	"${FILESDIR}"/${PN}-1.5.0-desktop.patch
-	# add a ~/.celestia for extra directories
-	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
-	# allow forcing CMake to look for a specific Lua version instead of the newest branch installed
-	"${FILESDIR}"/${PN}-1.7.0-cmake_lua_version.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	### This version of Celestia has a bug in the font rendering and
-	### requires -fsigned-char. We should be able to force this flag
-	### on all architectures. See bug #316573.
-	append-flags "-fsigned-char"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CELX="$(usex lua)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_GLUT="$(usex glut)"
-		-DENABLE_GTK=OFF
-		-DENABLE_QT="$(usex qt5)"
-		-DENABLE_WIN=OFF
-		-DENABLE_THEORA="$(usex theora)"
-	)
-	# Upstream always looks for LuaJIT first unless stopped, and we only need
-	# the version specification when linking against PUC Lua
-	if use lua && ! use lua_single_target_luajit; then
-		mycmakeargs+=(
-			-DCMAKE_DISABLE_FIND_PACKAGE_LuaJIT=ON
-			-DLUA_VERSION=$(lua_get_version)
-		)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	local size
-	for size in 16 22 32 48 ; do
-		newicon -s ${size} "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
-	done
-	newicon -s 128 "${S}"/src/celestia/gtk/data/${PN}-logo.png ${PN}.png
-	doicon -s scalable "${S}"/src/celestia/gtk/data/${PN}.svg
-
-	use glut && domenu ${PN}.desktop
-	if use qt5 ; then
-		sed \
-			-e "/^Name/s@\$@ (qt5 interface)@" \
-			-e "/^Exec/s@${PN}@${PN}-qt@" \
-			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
-		domenu "${T}"/${PN}-qt5.desktop
-	fi
-	dodoc AUTHORS README TRANSLATORS *.txt
-}
diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
index 6cfe729cc6f0..6d1d3bd2676b 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 CMAKE_IN_SOURCE_BUILD="yes"
 LUA_COMPAT=( lua5-{1..3} luajit )
 
-inherit desktop flag-o-matic lua-single xdg cmake
+inherit desktop lua-single xdg cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
@@ -43,10 +43,10 @@ DEPEND="
 	<dev-libs/libfmt-9.0.0:=
 	media-libs/glew:0=
 	media-libs/libepoxy
+	media-libs/libjpeg-turbo:0=
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	virtual/glu
-	virtual/jpeg:0
 	virtual/opengl
 	ffmpeg? ( media-video/ffmpeg:0 )
 	glut? ( media-libs/freeglut )
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index ef64f392d7d6..00f32e5f7b4b 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -44,10 +44,10 @@ DEPEND="
 	media-libs/glew:0=
 	media-libs/libepoxy
 	media-libs/libglvnd
+	media-libs/libjpeg-turbo:0=
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	virtual/glu
-	virtual/jpeg:0
 	virtual/opengl
 	ffmpeg? ( media-video/ffmpeg )
 	glut? ( media-libs/freeglut )