| 1 |
commit: ff4801a202d133d2bf2650aa7cfc0dd4f6bf552c |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 11 00:25:30 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 11 00:46:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff4801a2 |
| 7 |
|
| 8 |
sci-astronomy/celestia: Drop USE gtk, switch to cmake.eclass |
| 9 |
|
| 10 |
gtk still depended on ancient x11-libs/gtkglext. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/644334 |
| 13 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
sci-astronomy/celestia/celestia-9999.ebuild | 48 ++++++++++++----------------- |
| 17 |
1 file changed, 19 insertions(+), 29 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild |
| 20 |
index cf7966b4a41..60ddc68e30f 100644 |
| 21 |
--- a/sci-astronomy/celestia/celestia-9999.ebuild |
| 22 |
+++ b/sci-astronomy/celestia/celestia-9999.ebuild |
| 23 |
@@ -1,26 +1,25 @@ |
| 24 |
-# Copyright 1999-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
|
| 30 |
-inherit desktop flag-o-matic xdg cmake-utils |
| 31 |
- |
| 32 |
-DESCRIPTION="OpenGL 3D space simulator" |
| 33 |
-HOMEPAGE="https://celestia.space" |
| 34 |
if [[ "${PV}" = 9999 ]] ; then |
| 35 |
inherit git-r3 |
| 36 |
EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git" |
| 37 |
else |
| 38 |
- # Old URI! Please update once we have a release > v1.6.1 |
| 39 |
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 40 |
+ SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" |
| 41 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
| 42 |
fi |
| 43 |
+inherit desktop flag-o-matic xdg cmake |
| 44 |
+ |
| 45 |
+DESCRIPTION="OpenGL 3D space simulator" |
| 46 |
+HOMEPAGE="https://celestia.space" |
| 47 |
|
| 48 |
LICENSE="GPL-2" |
| 49 |
SLOT="0" |
| 50 |
-IUSE="glut gtk nls +qt5 theora" |
| 51 |
+IUSE="glut nls +qt5 theora" |
| 52 |
|
| 53 |
-REQUIRED_USE="|| ( glut gtk qt5 )" |
| 54 |
+REQUIRED_USE="|| ( glut qt5 )" |
| 55 |
|
| 56 |
BDEPEND=" |
| 57 |
dev-cpp/eigen |
| 58 |
@@ -36,12 +35,6 @@ DEPEND=" |
| 59 |
virtual/jpeg:0 |
| 60 |
virtual/opengl |
| 61 |
glut? ( media-libs/freeglut ) |
| 62 |
- gtk? ( |
| 63 |
- x11-libs/gtk+:2 |
| 64 |
- >=x11-libs/gtkglext-1.0 |
| 65 |
- x11-libs/gdk-pixbuf:2 |
| 66 |
- x11-libs/pango |
| 67 |
- ) |
| 68 |
qt5? ( |
| 69 |
dev-qt/qtcore:5 |
| 70 |
dev-qt/qtgui:5 |
| 71 |
@@ -62,7 +55,7 @@ PATCHES=( |
| 72 |
) |
| 73 |
|
| 74 |
src_prepare() { |
| 75 |
- cmake-utils_src_prepare |
| 76 |
+ cmake_src_prepare |
| 77 |
|
| 78 |
filter-flags "-funroll-loops -frerun-loop-opt" |
| 79 |
|
| 80 |
@@ -79,16 +72,16 @@ src_configure() { |
| 81 |
-DENABLE_CELX=ON |
| 82 |
-DENABLE_NLS="$(usex nls)" |
| 83 |
-DENABLE_GLUT="$(usex glut)" |
| 84 |
- -DENABLE_GTK="$(usex gtk)" |
| 85 |
+ -DENABLE_GTK=OFF |
| 86 |
-DENABLE_QT="$(usex qt5)" |
| 87 |
-DENABLE_WIN=OFF |
| 88 |
-DENABLE_THEORA="$(usex theora)" |
| 89 |
) |
| 90 |
- cmake-utils_src_configure |
| 91 |
+ cmake_src_configure |
| 92 |
} |
| 93 |
|
| 94 |
src_install() { |
| 95 |
- cmake-utils_src_install |
| 96 |
+ cmake_src_install |
| 97 |
|
| 98 |
local size |
| 99 |
for size in 16 22 32 48 ; do |
| 100 |
@@ -96,15 +89,12 @@ src_install() { |
| 101 |
done |
| 102 |
|
| 103 |
use glut && domenu ${PN}.desktop |
| 104 |
- local ui |
| 105 |
- for ui in gtk qt5 ; do |
| 106 |
- if use ${ui} ; then |
| 107 |
- sed \ |
| 108 |
- -e "/^Name/s@\$@ (${ui} interface)@" \ |
| 109 |
- -e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \ |
| 110 |
- ${PN}.desktop > "${T}"/${PN}-${ui}.desktop || die |
| 111 |
- domenu "${T}"/${PN}-${ui}.desktop |
| 112 |
- fi |
| 113 |
- done |
| 114 |
+ if use qt5 ; then |
| 115 |
+ sed \ |
| 116 |
+ -e "/^Name/s@\$@ (qt5 interface)@" \ |
| 117 |
+ -e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \ |
| 118 |
+ ${PN}.desktop > "${T}"/${PN}-qt5.desktop || die |
| 119 |
+ domenu "${T}"/${PN}-qt5.desktop |
| 120 |
+ fi |
| 121 |
dodoc AUTHORS README TRANSLATORS *.txt |
| 122 |
} |
Archives