public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2018-05-15 10:25 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2018-05-15 10:25 UTC (permalink / raw
  To: gentoo-commits

commit:     03158c436958b062a04343bf333c4fe68a06837a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 15 10:25:35 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 15 10:25:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03158c43

sci-astronomy/celestia: Removed gnome support in live ebuild.

Bug: https://bugs.gentoo.org/644334
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 sci-astronomy/celestia/celestia-9999.ebuild | 45 ++++++++---------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index b8b02e1fa2f..23ad6bc99f7 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -3,15 +3,13 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic gnome2 xdg-utils
+inherit autotools flag-o-matic xdg-utils
 
 DESCRIPTION="OpenGL 3D space simulator"
 HOMEPAGE="https://celestia.space"
 if [[ "${PV}" = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
-	# Necessary because of gnome2 eclass
-	SRC_URI=""
 else
 	# Old URI! Please update once we have a release > v1.6.1
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -20,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cairo gnome gtk nls pch theora threads"
+IUSE="cairo gtk nls pch theora threads"
 
 RDEPEND="
 	virtual/opengl
@@ -31,18 +29,13 @@ RDEPEND="
 		x11-libs/gtk+:2
 		>=x11-libs/gtkglext-1.0
 	)
-	gnome? (
-		>=gnome-base/libgnomeui-2.0
-	)
-	!gtk? ( !gnome? ( media-libs/freeglut ) )
+	!gtk? ( media-libs/freeglut )
 	cairo? ( x11-libs/cairo )
 	theora? ( media-libs/libtheora )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-REQUIRED_USE="gnome? ( gtk )"
-
 PATCHES=(
 	# make better desktop files
 	"${FILESDIR}"/${PN}-1.5.0-desktop.patch
@@ -56,15 +49,11 @@ PATCHES=(
 
 pkg_setup() {
 	# Check for one for the following use flags to be set.
-	if use gnome; then
-		einfo "USE=\"gnome\" detected."
-		USE_DESTDIR="1"
-		CELESTIA_GUI="gnome"
-	elif use gtk; then
+	if use gtk; then
 		einfo "USE=\"gtk\" detected."
 		CELESTIA_GUI="gtk"
 	else
-		ewarn "If you want to use the full gui, set USE=\"{gnome|gtk}\""
+		ewarn "If you want to use the full gui, set USE=\"gtk\""
 		ewarn "Defaulting to glut support (no GUI)."
 		CELESTIA_GUI="glut"
 	fi
@@ -74,7 +63,7 @@ src_prepare() {
 	default
 
 	# remove flags to let the user decide
-	local
+	local cf
 	for cf in -O2 -ffast-math \
 		-fexpensive-optimizations \
 		-fomit-frame-pointer; do
@@ -82,13 +71,6 @@ src_prepare() {
 			-e "s/${cf}//g" \
 			configure.ac admin/* || die "sed failed"
 	done
-	# remove an unused gconf macro killing autoconf when no gnome
-	# (not needed without eautoreconf)
-	if ! use gnome; then
-		sed -i \
-			-e '/AM_GCONF_SOURCE_2/d' \
-			configure.ac || die "sed failed"
-	fi
 	eautoreconf
 	filter-flags "-funroll-loops -frerun-loop-opt"
 
@@ -114,15 +96,12 @@ src_configure() {
 }
 
 src_install() {
-	if [[ ${CELESTIA_GUI} == gnome ]]; then
-		gnome2_src_install
-	else
-		emake DESTDIR="${D}" MKDIR_P="mkdir -p" install
-		local size
-		for size in 16 22 32 48 ; do
-			newicon "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
-		done
-	fi
+	emake DESTDIR="${D}" install
+	local size
+	for size in 16 22 32 48 ; do
+		newicon "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
+	done
+
 	[[ ${CELESTIA_GUI} == glut ]] && domenu celestia.desktop
 	dodoc AUTHORS README TRANSLATORS *.txt
 }


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2019-01-02 15:08 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2019-01-02 15:08 UTC (permalink / raw
  To: gentoo-commits

commit:     a05acb05582af6fb2720a3a5fa0e59b4bb780439
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  2 15:07:38 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan  2 15:08:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05acb05

sci-astronomy/celestia: Switched from autotools to cmake

- Adjusted dependencies
- Added qt5 USE flag
- Added glew USE flag
- Install different icon sizes
- Install correct .desktop files

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 96 ++++++++++++++++-------------
 1 file changed, 52 insertions(+), 44 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 4e61192de39..b3f1f95bcbf 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools flag-o-matic xdg-utils
+inherit cmake-utils desktop flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="OpenGL 3D space simulator"
 HOMEPAGE="https://celestia.space"
@@ -18,23 +18,40 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cairo gtk nls pch theora threads"
+IUSE="glut gtk nls +qt5 theora"
+
+REQUIRED_USE="|| ( glut gtk qt5 )"
 
 RDEPEND="
+	>=dev-lang/lua-5.1:*
+	dev-libs/libfmt
+	media-libs/glew:0
+	virtual/glu
 	virtual/opengl
 	virtual/jpeg:0
 	media-libs/libpng:0=
-	>=dev-lang/lua-5.1:*
+	glut? ( media-libs/freeglut )
 	gtk? (
 		x11-libs/gtk+:2
 		>=x11-libs/gtkglext-1.0
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
 	)
-	!gtk? ( media-libs/freeglut )
-	cairo? ( x11-libs/cairo )
-	theora? ( media-libs/libtheora )"
+"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-cpp/eigen
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	# make better desktop files
@@ -43,31 +60,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
 )
 
-pkg_setup() {
-	# Check for one for the following use flags to be set.
-	if use gtk; then
-		einfo "USE=\"gtk\" detected."
-		CELESTIA_GUI="gtk"
-	else
-		ewarn "If you want to use the full gui, set USE=\"gtk\""
-		ewarn "Defaulting to glut support (no GUI)."
-		CELESTIA_GUI="glut"
-	fi
-}
-
 src_prepare() {
 	default
 
-	# remove flags to let the user decide
-	local cf
-	for cf in -O2 -ffast-math \
-		-fexpensive-optimizations \
-		-fomit-frame-pointer; do
-		sed -i \
-			-e "s/${cf}//g" \
-			configure.ac admin/* || die "sed failed"
-	done
-	eautoreconf
 	filter-flags "-funroll-loops -frerun-loop-opt"
 
 	### This version of Celestia has a bug in the font rendering and
@@ -77,35 +72,48 @@ src_prepare() {
 }
 
 src_configure() {
-	# force lua in 1.6.1. seems to be inevitable
-	local myeconfargs=(
-		--disable-rpath
-		--with-${CELESTIA_GUI}
-		--with-lua
-		$(use_enable cairo)
-		$(use_enable threads threading)
-		$(use_enable nls)
-		$(use_enable pch)
-		$(use_enable theora)
+	# force lua. Seems still to be inevitable
+	local mycmakeargs=(
+		#-DENABLE_CELX="$(usex lua)"
+		-DENABLE_CELX=ON
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_GLUT="$(usex glut)"
+		-DENABLE_GTK="$(usex gtk)"
+		-DENABLE_QT="$(usex qt5)"
+		-DENABLE_WIN=OFF
+		-DENABLE_THEORA="$(usex theora)"
 	)
-	econf "${myeconfargs[@]}"
+	cmake-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	cmake-utils_src_install
+
 	local size
 	for size in 16 22 32 48 ; do
-		newicon "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
+		newicon -s ${size} "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
 	done
 
-	[[ ${CELESTIA_GUI} == glut ]] && domenu celestia.desktop
+	use glut && domenu ${PN}.desktop
+	local ui
+	for ui in gtk qt5 ; do
+		if use ${ui} ; then
+			sed \
+				-e "/^Name/s@\$@ (${ui} interface)@" \
+				-e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \
+				${PN}.desktop > "${T}"/${PN}-${ui}.desktop || die
+			domenu "${T}"/${PN}-${ui}.desktop
+		fi
+	done
 	dodoc AUTHORS README TRANSLATORS *.txt
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2019-02-17 12:39 Andreas Sturmlechner
  0 siblings, 0 replies; 25+ messages in thread
From: Andreas Sturmlechner @ 2019-02-17 12:39 UTC (permalink / raw
  To: gentoo-commits

commit:     176365bd5d96e177b730afbe2bd01e19c5a8e34b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 11:55:29 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 12:38:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176365bd

sci-astronomy/celestia: Switch gnome2-utils -> xdg, EAPI-7 bump

Add missing cmake-utils_src_prepare

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 33 +++++++++++------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index b3f1f95bcbf..182456385fd 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils desktop flag-o-matic gnome2-utils xdg-utils
+inherit desktop flag-o-matic xdg cmake-utils
 
 DESCRIPTION="OpenGL 3D space simulator"
 HOMEPAGE="https://celestia.space"
@@ -22,14 +22,19 @@ IUSE="glut gtk nls +qt5 theora"
 
 REQUIRED_USE="|| ( glut gtk qt5 )"
 
-RDEPEND="
+BDEPEND="
+	dev-cpp/eigen
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
 	>=dev-lang/lua-5.1:*
 	dev-libs/libfmt
 	media-libs/glew:0
+	media-libs/libpng:0=
 	virtual/glu
-	virtual/opengl
 	virtual/jpeg:0
-	media-libs/libpng:0=
+	virtual/opengl
 	glut? ( media-libs/freeglut )
 	gtk? (
 		x11-libs/gtk+:2
@@ -47,11 +52,7 @@ RDEPEND="
 		media-libs/libtheora
 	)
 "
-
-DEPEND="${RDEPEND}
-	dev-cpp/eigen
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	# make better desktop files
@@ -61,7 +62,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	filter-flags "-funroll-loops -frerun-loop-opt"
 
@@ -107,13 +108,3 @@ src_install() {
 	done
 	dodoc AUTHORS README TRANSLATORS *.txt
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2019-08-26 22:25 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2019-08-26 22:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9ac48eb4ce5906b91595c6b81482bc2f12290aa1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 22:24:39 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 22:24:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac48eb4

sci-astronomy/celestia: Added sub-slot dep to dev-libs/libfmt

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 182456385fd..cf7966b4a41 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
 "
 DEPEND="
 	>=dev-lang/lua-5.1:*
-	dev-libs/libfmt
+	dev-libs/libfmt:=
 	media-libs/glew:0
 	media-libs/libpng:0=
 	virtual/glu


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2020-01-11  0:47 Andreas Sturmlechner
  0 siblings, 0 replies; 25+ messages in thread
From: Andreas Sturmlechner @ 2020-01-11  0:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ff4801a202d133d2bf2650aa7cfc0dd4f6bf552c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 00:25:30 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 00:46:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff4801a2

sci-astronomy/celestia: Drop USE gtk, switch to cmake.eclass

gtk still depended on ancient x11-libs/gtkglext.

Bug: https://bugs.gentoo.org/644334
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 48 ++++++++++++-----------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index cf7966b4a41..60ddc68e30f 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop flag-o-matic xdg cmake-utils
-
-DESCRIPTION="OpenGL 3D space simulator"
-HOMEPAGE="https://celestia.space"
 if [[ "${PV}" = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
 else
-	# Old URI! Please update once we have a release > v1.6.1
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	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
+inherit desktop flag-o-matic xdg cmake
+
+DESCRIPTION="OpenGL 3D space simulator"
+HOMEPAGE="https://celestia.space"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="glut gtk nls +qt5 theora"
+IUSE="glut nls +qt5 theora"
 
-REQUIRED_USE="|| ( glut gtk qt5 )"
+REQUIRED_USE="|| ( glut qt5 )"
 
 BDEPEND="
 	dev-cpp/eigen
@@ -36,12 +35,6 @@ DEPEND="
 	virtual/jpeg:0
 	virtual/opengl
 	glut? ( media-libs/freeglut )
-	gtk? (
-		x11-libs/gtk+:2
-		>=x11-libs/gtkglext-1.0
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango
-	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -62,7 +55,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	filter-flags "-funroll-loops -frerun-loop-opt"
 
@@ -79,16 +72,16 @@ src_configure() {
 		-DENABLE_CELX=ON
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_GLUT="$(usex glut)"
-		-DENABLE_GTK="$(usex gtk)"
+		-DENABLE_GTK=OFF
 		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_WIN=OFF
 		-DENABLE_THEORA="$(usex theora)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	local size
 	for size in 16 22 32 48 ; do
@@ -96,15 +89,12 @@ src_install() {
 	done
 
 	use glut && domenu ${PN}.desktop
-	local ui
-	for ui in gtk qt5 ; do
-		if use ${ui} ; then
-			sed \
-				-e "/^Name/s@\$@ (${ui} interface)@" \
-				-e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \
-				${PN}.desktop > "${T}"/${PN}-${ui}.desktop || die
-			domenu "${T}"/${PN}-${ui}.desktop
-		fi
-	done
+	if use qt5 ; then
+		sed \
+			-e "/^Name/s@\$@ (qt5 interface)@" \
+			-e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \
+			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
+		domenu "${T}"/${PN}-qt5.desktop
+	fi
 	dodoc AUTHORS README TRANSLATORS *.txt
 }


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2020-01-22  8:41 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2020-01-22  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     cb2a7a2f7205561590e82005d37f5bd75645cf5d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 08:41:12 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 08:41:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2a7a2f

sci-astronomy/celestia: Moved inherit line to where it belongs

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 60ddc68e30f..781e1cb43a9 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit desktop flag-o-matic xdg cmake
+
 if [[ "${PV}" = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
@@ -10,7 +12,6 @@ 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
-inherit desktop flag-o-matic xdg cmake
 
 DESCRIPTION="OpenGL 3D space simulator"
 HOMEPAGE="https://celestia.space"


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2020-01-22 22:11 Pacho Ramos
  0 siblings, 0 replies; 25+ messages in thread
From: Pacho Ramos @ 2020-01-22 22:11 UTC (permalink / raw
  To: gentoo-commits

commit:     65dd7962592039947d13d0549fc5906150681f83
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 22:11:43 2020 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 22:11:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65dd7962

sci-astronomy/celestia: Fix Exec in .desktop, provide bigger icons too

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 781e1cb43a9..fda29bea854 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -88,12 +88,14 @@ src_install() {
 	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}-${ui/qt5/qt}@" \
+			-e "/^Exec/s@${PN}@${PN}-qt@" \
 			${PN}.desktop > "${T}"/${PN}-qt5.desktop || die
 		domenu "${T}"/${PN}-qt5.desktop
 	fi


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2020-03-22  1:02 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2020-03-22  1:02 UTC (permalink / raw
  To: gentoo-commits

commit:     79216766b3cc7b2315257a07cf290c8364faf510
Author:     Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Sun Mar 22 00:59:03 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 01:01:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79216766

sci-astronomy/celestia: Bump to version 1.7.0_pre20200316

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-astronomy/celestia/Manifest                    |   1 +
 .../celestia/celestia-1.7.0_pre20200316.ebuild     | 106 +++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
new file mode 100644
index 00000000000..1bc9d5465e6
--- /dev/null
+++ b/sci-astronomy/celestia/Manifest
@@ -0,0 +1 @@
+DIST celestia-1.7.0_pre20200316.tar.gz 69459012 BLAKE2B 8e718e8a4aa064b9be0bd5f0f1c034f3ffec42671c6eae503216f5ea2787e8c5da3315e3cb39e94e2a0eab5f067e189fe70dc9d04bff4127e9e39fba3a7117ae SHA512 db4213e1d76699ff01390f12e3763596dfd2641389743c27221b4e7934be9daca7a884dd389135894d225e8613830468ebede5664543e27e44e21e19d22d1e7f

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
new file mode 100644
index 00000000000..4ea492d2df5
--- /dev/null
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic 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 )"
+
+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? ( dev-lang/lua:* )
+	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
+)
+
+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)"
+	)
+	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
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2020-03-22  1:02 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2020-03-22  1:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e2b256a450fcc8f1d5af354896300dda548eb236
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 01:02:27 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 01:02:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b256a4

sci-astronomy/celestia: Synced live ebuild

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index fda29bea854..4ea492d2df5 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -5,21 +5,27 @@ EAPI=7
 
 inherit desktop flag-o-matic xdg cmake
 
-if [[ "${PV}" = 9999 ]] ; then
-	inherit git-r3
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
+	inherit git-r3
 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"
+	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"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="glut nls +qt5 theora"
-
+IUSE="glut lua nls +qt5 theora"
 REQUIRED_USE="|| ( glut qt5 )"
 
 BDEPEND="
@@ -28,14 +34,15 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 DEPEND="
-	>=dev-lang/lua-5.1:*
 	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? ( dev-lang/lua:* )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -58,8 +65,6 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 
-	filter-flags "-funroll-loops -frerun-loop-opt"
-
 	### 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.
@@ -67,10 +72,8 @@ src_prepare() {
 }
 
 src_configure() {
-	# force lua. Seems still to be inevitable
 	local mycmakeargs=(
-		#-DENABLE_CELX="$(usex lua)"
-		-DENABLE_CELX=ON
+		-DENABLE_CELX="$(usex lua)"
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_GLUT="$(usex glut)"
 		-DENABLE_GTK=OFF


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2020-05-08 17:10 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2020-05-08 17:10 UTC (permalink / raw
  To: gentoo-commits

commit:     df32ebc7aa6c65690ee44279886cc2a52bffd1c4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May  8 17:10:34 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May  8 17:10:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df32ebc7

sci-astronomy/celestia: Added slot-dep operator to media-libs/glew dep

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild | 2 +-
 sci-astronomy/celestia/celestia-9999.ebuild              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
index 4ea492d2df5..c38a6c82ab3 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 "
 DEPEND="
 	dev-libs/libfmt:=
-	media-libs/glew:0
+	media-libs/glew:0=
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	virtual/glu

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 4ea492d2df5..c38a6c82ab3 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 "
 DEPEND="
 	dev-libs/libfmt:=
-	media-libs/glew:0
+	media-libs/glew:0=
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	virtual/glu


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2020-12-03 13:50 Marek Szuba
  0 siblings, 0 replies; 25+ messages in thread
From: Marek Szuba @ 2020-12-03 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     85404e8018eb471e313389b90ca4f3d26c6e1a88
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 13:37:31 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 13:50:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85404e80

sci-astronomy/celestia: limit unmigrated ebuilds to dev-lang/lua:0

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316.ebuild
index c38a6c82ab3..a5fe892dd0d 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


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2021-01-14  1:16 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2021-01-14  1:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f4c9b76959cdfe54cc1c33236c06b86e21d37b4a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 01:16:00 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 01:16:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c9b769

sci-astronomy/celestia: Adjust live ebuild to upstream changes

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index dd539877e82..44ee4d4b3d1 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,8 +59,6 @@ DEPEND="
 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
@@ -88,7 +86,7 @@ src_configure() {
 	)
 	# 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
+	if use lua && ! use lua_single_target_luajit ; then
 		mycmakeargs+=(
 			-DCMAKE_DISABLE_FIND_PACKAGE_LuaJIT=ON
 			-DLUA_VERSION=$(lua_get_version)
@@ -100,20 +98,13 @@ 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
+	local backend
+	for backend in glut qt5 ; do
+		use ${backend} && domenu debian/celestia-${backend/qt5/qt}.desktop
+	done
+
 	dodoc AUTHORS README TRANSLATORS *.txt
 }


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2021-09-21  8:10 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2021-09-21  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     0054daba6dce704e1ea05477445299525133fec7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 21 08:07:49 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 08:09:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0054daba

sci-astronomy/celestia: Remove duplicate KEYWORDS

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild | 3 +--
 sci-astronomy/celestia/celestia-9999.ebuild                   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
index dd539877e82..1d70a891eb6 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,6 @@ else
 		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
 

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 44ee4d4b3d1..000dfa8ba2e 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -18,7 +18,6 @@ else
 		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
 


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-01-08 17:13 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2022-01-08 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2e238f03ed10b68a7240e4913d44394ea6843337
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 17:11:50 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 17:13:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e238f03

sci-astronomy/celestia: Adjusting live ebuild

* Fixed dependencies
* -DENABLE_THEORA -> -DENABLE_FFMPEG

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 000dfa8ba2e2..b6b90597e450 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,34 +26,38 @@ HOMEPAGE="https://celestia.space"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="glut lua nls +qt5 theora"
+IUSE="ffmpeg glut lua nls +qt5"
 REQUIRED_USE="|| ( glut qt5 )
 	lua? ( ${LUA_REQUIRED_USE} )"
 
 BDEPEND="
 	dev-cpp/eigen
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
 "
 DEPEND="
 	dev-libs/libfmt:=
+	media-libs/freetype
 	media-libs/glew:0=
+	media-libs/libepoxy
+	media-libs/libglvnd
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
+	ffmpeg? ( media-video/ffmpeg )
 	glut? ( media-libs/freeglut )
 	lua? ( ${LUA_DEPS} )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
 		dev-qt/qtwidgets:5
 	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
 "
 RDEPEND="${DEPEND}"
 
@@ -81,7 +85,7 @@ src_configure() {
 		-DENABLE_GTK=OFF
 		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_WIN=OFF
-		-DENABLE_THEORA="$(usex theora)"
+		-DENABLE_FFMPEG="$(usex ffmpeg)"
 	)
 	# Upstream always looks for LuaJIT first unless stopped, and we only need
 	# the version specification when linking against PUC Lua


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-01-22 11:52 Pacho Ramos
  0 siblings, 0 replies; 25+ messages in thread
From: Pacho Ramos @ 2022-01-22 11:52 UTC (permalink / raw
  To: gentoo-commits

commit:     957ed5a914abc1c5323db49a2259a8b555519863
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 11:51:40 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 11:51:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957ed5a9

sci-astronomy/celestia: New snapshot

Closes: https://bugs.gentoo.org/716532
Closes: https://bugs.gentoo.org/741070
Closes: https://bugs.gentoo.org/797577
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-astronomy/celestia/Manifest                    |   2 +
 .../celestia/celestia-1.7.0_pre20220120.ebuild     | 123 +++++++++++++++++++++
 2 files changed, 125 insertions(+)

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 1bc9d5465e61..4fb39b213d3e 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1 +1,3 @@
 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

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
new file mode 100644
index 000000000000..49a7ab37c8da
--- /dev/null
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+CMAKE_IN_SOURCE_BUILD="yes"
+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="f969b37c3ee783ed51bf4d1cbeefca4132031316"
+		COMMIT_ID_DATA="cc0bc0bb4b77e47115a31fbeb42babb30da3b790"
+		SRC_URI="
+			https://github.com/${PN^}Project/${PN^}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz
+			https://github.com/${PN^}Project/${PN^}Content/archive/${COMMIT_ID_DATA}.tar.gz -> ${P}-data.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="ffmpeg glut lua nls +qt5"
+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
+	ffmpeg? ( media-video/ffmpeg:0 )
+	glut? ( media-libs/freeglut )
+	lua? ( ${LUA_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# 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() {
+	mv "${WORKDIR}"/CelestiaContent-${COMMIT_ID_DATA} content || die
+
+	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.
+	# FIXME: Point to upstream bug report if still valid
+	#append-flags "-fsigned-char"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" \
+		cmake_src_configure
+
+	local mycmakeargs=(
+		-DENABLE_CELX="$(usex lua)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_FFMPEG="$(usex ffmpeg)"
+		-DENABLE_GLUT="$(usex glut)"
+		-DENABLE_GTK=OFF
+		-DENABLE_QT="$(usex qt5)"
+		-DENABLE_WIN=OFF
+		-DENABLE_SDL=OFF
+	)
+	# 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_compile() {
+	cmake_src_compile
+	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	doicon -s 48 "${S}"/src/celestia/gtk/data/${PN}.png
+	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 "${S}"/debian/${PN}-glut.desktop
+	use qt5 && domenu "${S}"/debian//${PN}-qt.desktop
+
+	dodoc AUTHORS README TRANSLATORS *.txt
+
+	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" cmake_src_install
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-01-23  9:07 Pacho Ramos
  0 siblings, 0 replies; 25+ messages in thread
From: Pacho Ramos @ 2022-01-23  9:07 UTC (permalink / raw
  To: gentoo-commits

commit:     ca6ad9f87cd5e751007525db0f12101afa0aff03
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 09:06:07 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 09:06:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6ad9f8

sci-astronomy/celestia: Fix missing dependency

Closes: https://bugs.gentoo.org/831861
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
index 49a7ab37c8da..63864b39236b 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
@@ -42,6 +42,7 @@ BDEPEND="
 DEPEND="
 	dev-libs/libfmt:=
 	media-libs/glew:0=
+	media-libs/libepoxy
 	media-libs/libpng:0=
 	sys-libs/zlib:=
 	virtual/glu


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-07-06 19:27 Sam James
  0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2022-07-06 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     a37b9fc99b2f8cfd03e60270b3699232c471084d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 19:26:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 19:26:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37b9fc9

sci-astronomy/celestia: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-astronomy/celestia/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-astronomy/celestia/metadata.xml b/sci-astronomy/celestia/metadata.xml
index 353cdfb7023d..2b77eb4a3e47 100644
--- a/sci-astronomy/celestia/metadata.xml
+++ b/sci-astronomy/celestia/metadata.xml
@@ -16,6 +16,7 @@
   want to visit.
 </longdescription>
   <upstream>
+    <remote-id type="github">CelestiaProject/Celestia</remote-id>
     <remote-id type="sourceforge">celestia</remote-id>
   </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-07-06 19:33 Sam James
  0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2022-07-06 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     1d6da4fa8b03d52ce7892f9cf8883221fd222229
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 19:32:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 19:32:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6da4fa

sci-astronomy/celestia: add libfmt version cap

Closes: https://bugs.gentoo.org/856721
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild | 4 ++--
 sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild      | 2 +-
 sci-astronomy/celestia/celestia-9999.ebuild                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
index 1d70a891eb6a..e408eb4d09d4 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20200316-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 DEPEND="
-	dev-libs/libfmt:=
+	<dev-libs/libfmt-9.0.0:=
 	media-libs/glew:0=
 	media-libs/libpng:0=
 	sys-libs/zlib:=

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
index 63864b39236b..6cfe729cc6f0 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 DEPEND="
-	dev-libs/libfmt:=
+	<dev-libs/libfmt-9.0.0:=
 	media-libs/glew:0=
 	media-libs/libepoxy
 	media-libs/libpng:0=

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index b6b90597e450..ef64f392d7d6 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	)
 "
 DEPEND="
-	dev-libs/libfmt:=
+	<dev-libs/libfmt-9.0.0:=
 	media-libs/freetype
 	media-libs/glew:0=
 	media-libs/libepoxy


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-10-25 12:56 Pacho Ramos
  0 siblings, 0 replies; 25+ messages in thread
From: Pacho Ramos @ 2022-10-25 12:56 UTC (permalink / raw
  To: gentoo-commits

commit:     8439e6ffaf9beeb2bdfa6d25b069c982356f4cf5
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 12:51:42 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 12:55:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8439e6ff

sci-astronomy/celestia: drop 1.7.0_pre20200316-r100

Closes: https://bugs.gentoo.org/847871
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-astronomy/celestia/Manifest                    |   1 -
 .../celestia-1.7.0_pre20200316-r100.ebuild         | 118 ---------------------
 2 files changed, 119 deletions(-)

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 4fb39b213d3e..1ed42d506126 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,3 +1,2 @@
-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

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
-}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-10-25 12:56 Pacho Ramos
  0 siblings, 0 replies; 25+ messages in thread
From: Pacho Ramos @ 2022-10-25 12:56 UTC (permalink / raw
  To: gentoo-commits

commit:     0eaf235b482475531372f84ea51a0b5418f91193
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 12:55:23 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 12:55:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eaf235b

sci-astronomy/celestia: Drop obsolete inherit

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
index f7d399270230..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"


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-10-25 12:56 Pacho Ramos
  0 siblings, 0 replies; 25+ messages in thread
From: Pacho Ramos @ 2022-10-25 12:56 UTC (permalink / raw
  To: gentoo-commits

commit:     09a3a33f92b15691f97f718be4e1ed480945a6f5
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 12:54:16 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 12:55:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a3a33f

sci-astronomy/celestia: Update jpeg dep

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild | 2 +-
 sci-astronomy/celestia/celestia-9999.ebuild              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
index 6cfe729cc6f0..f7d399270230 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
@@ -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 )


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-12-18 12:41 Andreas Sturmlechner
  0 siblings, 0 replies; 25+ messages in thread
From: Andreas Sturmlechner @ 2022-12-18 12:41 UTC (permalink / raw
  To: gentoo-commits

commit:     f219ead56b1fab0f583d45727666d9dcce238cfa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 10:27:02 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 12:41:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f219ead5

sci-astronomy/celestia: drop 9999, out of sync with release ebuild

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/celestia/celestia-9999.ebuild | 113 ----------------------------
 1 file changed, 113 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
deleted file mode 100644
index 00f32e5f7b4b..000000000000
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ /dev/null
@@ -1,113 +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="ffmpeg glut lua nls +qt5"
-REQUIRED_USE="|| ( glut qt5 )
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-	dev-cpp/eigen
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)
-"
-DEPEND="
-	<dev-libs/libfmt-9.0.0:=
-	media-libs/freetype
-	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/opengl
-	ffmpeg? ( media-video/ffmpeg )
-	glut? ( media-libs/freeglut )
-	lua? ( ${LUA_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# 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_FFMPEG="$(usex ffmpeg)"
-	)
-	# 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
-
-	newicon -s 128 "${S}"/src/celestia/gtk/data/${PN}-logo.png ${PN}.png
-	doicon -s scalable "${S}"/src/celestia/gtk/data/${PN}.svg
-
-	local backend
-	for backend in glut qt5 ; do
-		use ${backend} && domenu debian/celestia-${backend/qt5/qt}.desktop
-	done
-
-	dodoc AUTHORS README TRANSLATORS *.txt
-}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2022-12-20  8:43 Pacho Ramos
  0 siblings, 0 replies; 25+ messages in thread
From: Pacho Ramos @ 2022-12-20  8:43 UTC (permalink / raw
  To: gentoo-commits

commit:     7525ad875eb51a66d6298a2691f16530cec6f1e9
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 08:38:52 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 08:43:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7525ad87

sci-astronomy/celestia: add 1.7.0_pre20221215

Closes: https://bugs.gentoo.org/887029
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-astronomy/celestia/Manifest                    |   2 +
 .../celestia/celestia-1.7.0_pre20221215.ebuild     | 118 +++++++++++++++++++++
 2 files changed, 120 insertions(+)

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 1ed42d506126..66946d148246 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,2 +1,4 @@
 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
+DIST celestia-1.7.0_pre20221215-data.tar.gz 306465675 BLAKE2B 74f7bb1fd827571e761d3e1f0342733134b20f8333bb06daab9d5d673ec236d830758526d99fe551ac0011eccf8dc7e7f9f108c939ec96c5accb022fa28aafa8 SHA512 a2531c03b534f14886b3ecfc96549ad0cec530e194a9c592bb62d5c05db3c85372b4dbb6c5137ccbe0d305c4689c8616d7120285b570fd8d777394e23b676159
+DIST celestia-1.7.0_pre20221215.tar.gz 5215167 BLAKE2B 755bea8c9a6e4f9f5ea961e7dcae2fdbede2ed5eb23b0b5085d11c0f6a56f7f5b31c9daa8d42fe6b1c42590b417248cd5a215d4079963b00a0f843354a137daf SHA512 8c86aa55febf8463f3eef64c54458e2bebb21ce4a344e77c733e77e5d499446cc30c5bb75699f38328e6ebc1d8221f89f65ab962ad38758ae10cc6ee45b9c6b1

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20221215.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20221215.ebuild
new file mode 100644
index 000000000000..d5a18e53aa56
--- /dev/null
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20221215.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+CMAKE_IN_SOURCE_BUILD="yes"
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit desktop 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="9b00246b17a60f0a6dce724be8f7a3bda04809c3"
+		COMMIT_ID_DATA="bc8208e4474aee9a1096c6479a1e7f298aa98d02"
+		SRC_URI="
+			https://github.com/${PN^}Project/${PN^}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz
+			https://github.com/${PN^}Project/${PN^}Content/archive/${COMMIT_ID_DATA}.tar.gz -> ${P}-data.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 https://github.com/CelestiaProject/Celestia"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ffmpeg glut lua nls +qt5"
+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/libepoxy
+	media-libs/libjpeg-turbo:0=
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	ffmpeg? ( media-video/ffmpeg:0 )
+	glut? ( media-libs/freeglut )
+	lua? ( ${LUA_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# 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() {
+	mv "${WORKDIR}"/CelestiaContent-${COMMIT_ID_DATA} content || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" \
+		cmake_src_configure
+
+	local mycmakeargs=(
+		-DENABLE_CELX="$(usex lua)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_FFMPEG="$(usex ffmpeg)"
+		-DENABLE_GLUT="$(usex glut)"
+		-DENABLE_GTK=OFF
+		-DENABLE_QT="$(usex qt5)"
+		-DENABLE_WIN=OFF
+		-DENABLE_SDL=OFF
+	)
+	# 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_compile() {
+	cmake_src_compile
+	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	# Icons with more resolutions
+	doicon -s 48 "${S}"/src/celestia/gtk/data/${PN}.png
+	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 "${S}"/debian/${PN}-glut.desktop
+
+	dodoc AUTHORS README TRANSLATORS *.txt
+
+	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" cmake_src_install
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2023-02-18 13:55 Andreas Sturmlechner
  0 siblings, 0 replies; 25+ messages in thread
From: Andreas Sturmlechner @ 2023-02-18 13:55 UTC (permalink / raw
  To: gentoo-commits

commit:     54e88b2ea17883fc7b9959f5d790b77bd6bf9f20
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 12:47:02 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 13:55:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e88b2e

sci-astronomy/celestia: drop 1.7.0_pre20220120

Bug: https://bugs.gentoo.org/887029
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/celestia/Manifest                    |   2 -
 .../celestia/celestia-1.7.0_pre20220120.ebuild     | 124 ---------------------
 2 files changed, 126 deletions(-)

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 66946d148246..1261a956a674 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,4 +1,2 @@
-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
 DIST celestia-1.7.0_pre20221215-data.tar.gz 306465675 BLAKE2B 74f7bb1fd827571e761d3e1f0342733134b20f8333bb06daab9d5d673ec236d830758526d99fe551ac0011eccf8dc7e7f9f108c939ec96c5accb022fa28aafa8 SHA512 a2531c03b534f14886b3ecfc96549ad0cec530e194a9c592bb62d5c05db3c85372b4dbb6c5137ccbe0d305c4689c8616d7120285b570fd8d777394e23b676159
 DIST celestia-1.7.0_pre20221215.tar.gz 5215167 BLAKE2B 755bea8c9a6e4f9f5ea961e7dcae2fdbede2ed5eb23b0b5085d11c0f6a56f7f5b31c9daa8d42fe6b1c42590b417248cd5a215d4079963b00a0f843354a137daf SHA512 8c86aa55febf8463f3eef64c54458e2bebb21ce4a344e77c733e77e5d499446cc30c5bb75699f38328e6ebc1d8221f89f65ab962ad38758ae10cc6ee45b9c6b1

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
deleted file mode 100644
index 6d1d3bd2676b..000000000000
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20220120.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-CMAKE_IN_SOURCE_BUILD="yes"
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit desktop 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="f969b37c3ee783ed51bf4d1cbeefca4132031316"
-		COMMIT_ID_DATA="cc0bc0bb4b77e47115a31fbeb42babb30da3b790"
-		SRC_URI="
-			https://github.com/${PN^}Project/${PN^}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz
-			https://github.com/${PN^}Project/${PN^}Content/archive/${COMMIT_ID_DATA}.tar.gz -> ${P}-data.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="ffmpeg glut lua nls +qt5"
-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/libepoxy
-	media-libs/libjpeg-turbo:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	ffmpeg? ( media-video/ffmpeg:0 )
-	glut? ( media-libs/freeglut )
-	lua? ( ${LUA_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# 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() {
-	mv "${WORKDIR}"/CelestiaContent-${COMMIT_ID_DATA} content || die
-
-	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.
-	# FIXME: Point to upstream bug report if still valid
-	#append-flags "-fsigned-char"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" \
-		cmake_src_configure
-
-	local mycmakeargs=(
-		-DENABLE_CELX="$(usex lua)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_FFMPEG="$(usex ffmpeg)"
-		-DENABLE_GLUT="$(usex glut)"
-		-DENABLE_GTK=OFF
-		-DENABLE_QT="$(usex qt5)"
-		-DENABLE_WIN=OFF
-		-DENABLE_SDL=OFF
-	)
-	# 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_compile() {
-	cmake_src_compile
-	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-
-	doicon -s 48 "${S}"/src/celestia/gtk/data/${PN}.png
-	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 "${S}"/debian/${PN}-glut.desktop
-	use qt5 && domenu "${S}"/debian//${PN}-qt.desktop
-
-	dodoc AUTHORS README TRANSLATORS *.txt
-
-	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" cmake_src_install
-}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
@ 2023-07-08 10:46 Pacho Ramos
  0 siblings, 0 replies; 25+ messages in thread
From: Pacho Ramos @ 2023-07-08 10:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4a1abfc8710109ce1a4af3c6a8f81c824df26998
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 10:46:08 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 10:46:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1abfc8

sci-astronomy/celestia: update HOMEPAGE

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-astronomy/celestia/celestia-1.7.0_pre20221215.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20221215.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20221215.ebuild
index d5a18e53aa56..81c286e19d18 100644
--- a/sci-astronomy/celestia/celestia-1.7.0_pre20221215.ebuild
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20221215.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ else
 fi
 
 DESCRIPTION="OpenGL 3D space simulator"
-HOMEPAGE="https://celestia.space https://github.com/CelestiaProject/Celestia"
+HOMEPAGE="https://celestiaproject.space/ https://github.com/CelestiaProject/Celestia"
 
 LICENSE="GPL-2+"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2023-07-08 10:46 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-08 10:46 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2023-02-18 13:55 Andreas Sturmlechner
2022-12-20  8:43 Pacho Ramos
2022-12-18 12:41 Andreas Sturmlechner
2022-10-25 12:56 Pacho Ramos
2022-10-25 12:56 Pacho Ramos
2022-10-25 12:56 Pacho Ramos
2022-07-06 19:33 Sam James
2022-07-06 19:27 Sam James
2022-01-23  9:07 Pacho Ramos
2022-01-22 11:52 Pacho Ramos
2022-01-08 17:13 Lars Wendler
2021-09-21  8:10 Michał Górny
2021-01-14  1:16 Lars Wendler
2020-12-03 13:50 Marek Szuba
2020-05-08 17:10 Lars Wendler
2020-03-22  1:02 Lars Wendler
2020-03-22  1:02 Lars Wendler
2020-01-22 22:11 Pacho Ramos
2020-01-22  8:41 Lars Wendler
2020-01-11  0:47 Andreas Sturmlechner
2019-08-26 22:25 Lars Wendler
2019-02-17 12:39 Andreas Sturmlechner
2019-01-02 15:08 Lars Wendler
2018-05-15 10:25 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox