gentoo resync : 14.12.2020

5 files changed, 151 insertions, 6 deletions

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 19f3e58ea7a9..23b9176d214f 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,6 +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
-EBUILD celestia-1.7.0_pre20200316.ebuild 2485 BLAKE2B c8bd94f9d71000f9741e2867e4327ba6a7241c4e30c899d10bcce6bb771e856d57eae333b2e9e695f038f1dd7711ef0d5792cbeac3384d379107dbb9801aff4f SHA512 b4464f04f004ba0cbcd5984d9f866a941abf0e5ac0935935db283e6e0d47e32939ab6512fe233463e13d6935e1dcdda782742642beec8834fe803fcf1e0002af
-EBUILD celestia-9999.ebuild 2485 BLAKE2B c8bd94f9d71000f9741e2867e4327ba6a7241c4e30c899d10bcce6bb771e856d57eae333b2e9e695f038f1dd7711ef0d5792cbeac3384d379107dbb9801aff4f SHA512 b4464f04f004ba0cbcd5984d9f866a941abf0e5ac0935935db283e6e0d47e32939ab6512fe233463e13d6935e1dcdda782742642beec8834fe803fcf1e0002af
+EBUILD celestia-1.7.0_pre20200316-r100.ebuild 2994 BLAKE2B 66941e8e98b5d483afb8bdcab2e5ea1ac0aa9cf24881be3075e9acaae4cff8c0345be21ed98d97d819a7d1cf836287f5e4e332b9aa09e34265aa8c688821a6e8 SHA512 1416f35668656810c7f32f53587050d4e692c084c3a3bca1b0c1fce37875b1385c046ea3c8615700f7460abf3c45a1a6ef6933c9778009d0fae8cbbaca4c1b1a
+EBUILD celestia-1.7.0_pre20200316.ebuild 2486 BLAKE2B e7d8ace8e1fa3811cf95207ac45478cdc89cd84a9ec341e982564d000053214b5acdddb3b6d0b6173d5ed92dafc08a2b3ca326cc07db786b91c72efe181d49e8 SHA512 3062453f7e369f4af4afb04018827b247c2c16f0759912ca27b4ddb39a90c5a097c317855ebe0e71d58ca3442ed1a2b5e950d67144967de9196bbe95487742ae
+EBUILD celestia-9999.ebuild 2994 BLAKE2B 66941e8e98b5d483afb8bdcab2e5ea1ac0aa9cf24881be3075e9acaae4cff8c0345be21ed98d97d819a7d1cf836287f5e4e332b9aa09e34265aa8c688821a6e8 SHA512 1416f35668656810c7f32f53587050d4e692c084c3a3bca1b0c1fce37875b1385c046ea3c8615700f7460abf3c45a1a6ef6933c9778009d0fae8cbbaca4c1b1a
 MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9
diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
new file mode 100644
index 000000000000..dd539877e827
--- /dev/null
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 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"
+		KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	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:=
+	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_pre20200316.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
index c38a6c82ab31..a5fe892dd0d3 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
@@ -42,7 +42,7 @@ DEPEND="
 	virtual/jpeg:0
 	virtual/opengl
 	glut? ( media-libs/freeglut )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index c38a6c82ab31..dd539877e827 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic xdg cmake
+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"
@@ -26,7 +28,8 @@ HOMEPAGE="https://celestia.space"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="glut lua nls +qt5 theora"
-REQUIRED_USE="|| ( glut qt5 )"
+REQUIRED_USE="|| ( glut qt5 )
+	lua? ( ${LUA_REQUIRED_USE} )"
 
 BDEPEND="
 	dev-cpp/eigen
@@ -42,7 +45,7 @@ DEPEND="
 	virtual/jpeg:0
 	virtual/opengl
 	glut? ( media-libs/freeglut )
-	lua? ( dev-lang/lua:* )
+	lua? ( ${LUA_DEPS} )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -60,6 +63,8 @@ PATCHES=(
 	"${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() {
@@ -81,6 +86,14 @@ src_configure() {
 		-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
 }
 
diff --git a/sci-astronomy/celestia/files/celestia-1.7.0-cmake_lua_version.patch b/sci-astronomy/celestia/files/celestia-1.7.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..80fba5d447a4
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.7.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -179,7 +179,7 @@
+ 
+   find_package(LuaJIT)
+   if(NOT LUAJIT_FOUND)
+-    find_package(Lua REQUIRED)
++    find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+   endif()
+   include_directories(${LUA_INCLUDE_DIR})
+   link_libraries(${LUA_LIBRARIES})