From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1137104-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6DF13138350
for <garchives@archives.gentoo.org>; Sat, 11 Jan 2020 00:47:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 881D4E0835;
Sat, 11 Jan 2020 00:47:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 53E81E0835
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Jan 2020 00:47:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6C38A34DF17
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Jan 2020 00:47:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 066F438
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Jan 2020 00:47:11 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1578703616.ff4801a202d133d2bf2650aa7cfc0dd4f6bf552c.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-astronomy/celestia/celestia-9999.ebuild
X-VCS-Directories: sci-astronomy/celestia/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: ff4801a202d133d2bf2650aa7cfc0dd4f6bf552c
X-VCS-Branch: master
Date: Sat, 11 Jan 2020 00:47:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d360a589-febd-4385-a227-a1a4549f7d66
X-Archives-Hash: 0f33e7fdb98b33e59e71e972a110fe9c
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
}