diff options
Diffstat (limited to 'sci-astronomy')
| -rw-r--r-- | sci-astronomy/Manifest.gz | bin | 7034 -> 7034 bytes | |||
| -rw-r--r-- | sci-astronomy/celestia/Manifest | 4 | ||||
| -rw-r--r-- | sci-astronomy/celestia/celestia-9999.ebuild | 96 | ||||
| -rw-r--r-- | sci-astronomy/celestia/files/celestia-1.6.99-cfg.patch | 14 | ||||
| -rw-r--r-- | sci-astronomy/stellarium/Manifest | 4 | ||||
| -rw-r--r-- | sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch (renamed from sci-astronomy/stellarium/files/stellarium-0.18.2.patch) | 0 | ||||
| -rw-r--r-- | sci-astronomy/stellarium/stellarium-0.18.2.ebuild | 10 |
7 files changed, 68 insertions, 60 deletions
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz Binary files differindex 6827cb469018..1eda1f070dba 100644 --- a/sci-astronomy/Manifest.gz +++ b/sci-astronomy/Manifest.gz diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest index 9d7401b89455..94241da69f9c 100644 --- a/sci-astronomy/celestia/Manifest +++ b/sci-astronomy/celestia/Manifest @@ -5,8 +5,8 @@ AUX celestia-1.6.1-gcc47.patch 846 BLAKE2B 26a88bdf055014c2d2419fdde5e8e6667e9c1 AUX celestia-1.6.1-libpng15.patch 391 BLAKE2B 6114b4b82a92dd572c3b13ecae23118fb25b1a0a3903b15a4675cae56b0233834d391ec47b4ed23473a6ddb82b07c9103f9459e00587b1aafebf256c02f44137 SHA512 d9d79a31d5ace5938fb419511f730d1a4c56d1d4cb3bac043ec52d63a2172e4c3788dcc272b36247c09571b8f851984fcf99f523184c2c61b6fb6a4178996f7f AUX celestia-1.6.1-libpng16.patch 570 BLAKE2B 52710f0e34f8ca6364c2938f3b6839581a25b5e5637382f6995b96cb88b08330a2f46a8e150303d0bb902e6fdeb4755c4cb62499eb3f2435413a0052e6dfe5f7 SHA512 e9721364ec43eb5a1a73ee02553e81e340d56fdca94c8f7ec2825082487422772070f486bf23d2fb11e5e9bc09405e95ae9c73ff136ea7ad3c5c6a7f508e29a1 AUX celestia-1.6.1-linking.patch 1526 BLAKE2B 8244fa0dcd7771887c2bd09e5ac2c8abba2f5882fbce6205b0180d42c34899b88fd19df92b1b96eed45d3ca3931c289e3f8ea96a71fb3a8de0d68266136e4587 SHA512 31ef6c716486ddada988c2ac34e553cd5f928735454e3b74f4a2b0fa15a9b6594c87e40bf1345acc52cdc20d27bb35714fc633c9952a403146cb09966babe26b -AUX celestia-1.6.99-cfg.patch 759 BLAKE2B dddef7d207eaf975d68886d9c0a4aa74c055a08468b1d00dda45b35b5777b481888c0a8c140ad5a7ebf10a96081a273513cb7c351de779a5a2a854d4a6f4fb4d SHA512 17eb15ec550179465d653b055d8af13b9575853f83226faa718ae9288a2aed42979d9d943e06ff8a71a34a6e994c7418b4bba2d608a96ad3517d26070f36bec3 +AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475955af733e013fcafb2b37975fb1f2215afe61a715b5ec7716dbd75b5915dd4a5031255adb8fde5f6e64d9b71a5 SHA512 50cce63a701da85b52bee5db5b34eed77118c7c847612b4bc7ae82c80b198c718b4adbf0f21cc82e4afbafe20f53dda191285095d6ee5e796ce7f6c94388b832 DIST celestia-1.6.1.tar.gz 52600436 BLAKE2B aa5b515a75b0344f6e5d59bf385bf1c368e3c38098a1bb9c273fd87ae34a7c8e88a4bf789935bb35ee16f2037004c8f54e21592023a0675766cb4ce005c704f4 SHA512 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f EBUILD celestia-1.6.1-r1.ebuild 3062 BLAKE2B b5c913e509ce0706219d93350b5f5657fb9b871fa93604eb493ab496926d5c19bd0afecc448ff1c2bed0fe9098bafd9080a816acdaa5802b25812bd3ff921d3d SHA512 84f0c7f6dc6ec27cf1659178a71b1a936d4d2155530dc51fc457aa08cfe02c89a967f8e169d56d9aa2179265153fe0c998f18e0240255c3dadc5b386f915e6f6 -EBUILD celestia-9999.ebuild 2479 BLAKE2B 7b6a3f8d756c56c59f07c90f1f61ed148537aafd8eb5c987789829b585aa861c8f1fdf79c216f27bc44c7f51112c4b54962a598f68af44a99d5e1f65d81c3cd9 SHA512 7e2a0c18b169125a60001fd0303d3d67911bd2779f9d47c40e72297b157e21d1f25ac07b6a6a48edf94567520441d5ed879a055ea0045c82783fa7056f6f3f99 +EBUILD celestia-9999.ebuild 2546 BLAKE2B c72d8d78533a4e03e0eb4ea7ddfac8ce1a49690c44d1bb8595cc74223d744626c44cc3d5455f128f2948bad46c978c30888320b860dbe8a1a36c33a0c7754c17 SHA512 4645ff704d2450c879ea0207e9f62e16ab5335a8be724218ab6fdf05e4297827443cb73112b5e2402fb41e2e34d8e566ee48173c586a1e2ed183f2fef4a24dbe MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9 diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild index 4e61192de39e..b3f1f95bcbf7 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 } diff --git a/sci-astronomy/celestia/files/celestia-1.6.99-cfg.patch b/sci-astronomy/celestia/files/celestia-1.6.99-cfg.patch index 53b0e5ad265e..943d81b416b1 100644 --- a/sci-astronomy/celestia/files/celestia-1.6.99-cfg.patch +++ b/sci-astronomy/celestia/files/celestia-1.6.99-cfg.patch @@ -1,6 +1,6 @@ -From af91ecccb4fe46181d22d4195cb4cca1c734ae63 Mon Sep 17 00:00:00 2001 +From 82023197fabf148e164c538ce0839e3add31068d Mon Sep 17 00:00:00 2001 From: Lars Wendler <polynomial-c@gentoo.org> -Date: Wed, 4 Apr 2018 15:28:32 +0200 +Date: Wed, 2 Jan 2019 14:25:37 +0100 Subject: [PATCH] celestia.cfg: Add ~/.celestia as extras directory. --- @@ -8,18 +8,18 @@ Subject: [PATCH] celestia.cfg: Add ~/.celestia as extras directory. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/celestia.cfg b/celestia.cfg -index 1a69b422..635b0084 100644 +index ea9e4f58..00edf250 100644 --- a/celestia.cfg +++ b/celestia.cfg -@@ -176,7 +176,7 @@ StarTextures +@@ -197,7 +197,7 @@ StarTextures # or # ExtrasDirectories [ "D:\\celestia-extras" ] #------------------------------------------------------------------------ -- ExtrasDirectories [ "data" "extras" ] -+ ExtrasDirectories [ "data" "extras" "~/.celestia" ] +- ExtrasDirectories [ "extras-standard" "extras" ] ++ ExtrasDirectories [ "extras-standard" "extras" "~/.celestia" ] #------------------------------------------------------------------------ -- -2.17.0 +2.20.1 diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest index fb7beaa9c844..43c2babb9d9a 100644 --- a/sci-astronomy/stellarium/Manifest +++ b/sci-astronomy/stellarium/Manifest @@ -1,4 +1,4 @@ -AUX stellarium-0.18.2.patch 6217 BLAKE2B 5e4df179b4364f1bf56d2c9f719d07783d25ee95242ca33fe6ea2843fecd74a63aeff3675913bc3dde7cc0f75603a3a256dd7b08c54800c5ff8fd57af7f8976c SHA512 1107d8960c337606bc9526100ef963c252a616f77566253dbac4c96706a4a0c0830dcd9496759fb46f7aa27cc667364cd820567cde3eccc2a00eeb5eecffe6e0 +AUX stellarium-0.18.2-as-needed.patch 6217 BLAKE2B 5e4df179b4364f1bf56d2c9f719d07783d25ee95242ca33fe6ea2843fecd74a63aeff3675913bc3dde7cc0f75603a3a256dd7b08c54800c5ff8fd57af7f8976c SHA512 1107d8960c337606bc9526100ef963c252a616f77566253dbac4c96706a4a0c0830dcd9496759fb46f7aa27cc667364cd820567cde3eccc2a00eeb5eecffe6e0 DIST stars_4_1v0_1.cat 17040932 BLAKE2B 6715c129b27bb82b4b9b432bd56ed56dcbb1fbe9b9b608154656431119e75ab27e3c8afa66bce0fed1b2f7d080df49e770ddf63241f253e9f6f139be8238349d SHA512 adf2241d0a8b58eb6b8ad5f885dd8a3a66610a63ae949f17f26e81f1ac8d1094d77879e361a0de3929e0d447b0de77142e0c7de0f1f123bd145e130fbfbe0f9a DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0 @@ -8,5 +8,5 @@ DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9 DIST stellarium-0.16.0.tar.gz 204675673 BLAKE2B fe34ab611569e23277ae9f273d1ae72139d5b860d0ae1b5650a9744960ce8bac6953d7de98b60bd224374aa77db33c00081ed90d1683b2007ef1b5068af158ff SHA512 0f75441435ff1d0fa149264116e9ae6ec3b3553f7c66e78832bdb0ffd55cbef656b820680134d95f89c73e80ef283372660ea7545db7fff205da66cf4cf8e9d6 DIST stellarium-0.18.2.tar.gz 265334731 BLAKE2B d8527f93f2ea856466f98e7ab326a34e4265c4937c4d399755878cc6bbb1202580c825a6253e090986ebc80119fb33881b120a1ed6873278dacef75a1e69c517 SHA512 f658b19524b78739a5125ac7c89f5d2b48284d8696da54e39d2390bbbe5eeb8da70837c4e9055a650a492f3f71ebbc966c4c1341729982ba37d93b26fcb91912 EBUILD stellarium-0.16.0-r1.ebuild 2678 BLAKE2B 4ad1b128b5d332059796e02782935c7fbb4c355339264eb5679e86a2d10e734f76bb203c6b18401e7ef96f7b851b862a9a7d6501e86a76a45aa831dcd856d01f SHA512 db6a1df905b969aa878ed6bd5274e7496696805df7200366f70621929aa83239d5d20082d89eab83af02cd99b843d695ab8dbcbe3e750da54f3d2bbc3b68cabf -EBUILD stellarium-0.18.2.ebuild 2365 BLAKE2B 2a358d252f3f84dd13caa7e60804b333568f11c84b08e2660c0852071ef5f0418d40631b1155313a4380a0cff5d2d468248b317b80577297d2cfad4a353ae0e4 SHA512 761d81af3128dce8f6b8497124e80d42a9ab6c78b9a1f0ce5a1a07b2873662b5367b04dfc2dcf3cf041d2e84ddadf0de3f64448439c262544174fa1267a636b7 +EBUILD stellarium-0.18.2.ebuild 2375 BLAKE2B f974927509125a102d88d0ccd3f8727892b036ea557ea4d2b8ec05474c116f8e096999b6e3c18732613bd8634149bb745693e8eef028fbe0472e0aa7fc216ce2 SHA512 36c2609a7cfaa05062920e1b2c2d487541c4a1efed8470b04bab14d1c7fcc6166ba8d98c349963e3b71ba7ea2396d63d193e5f0ba70d7a7865a1c64867bec3f3 MISC metadata.xml 758 BLAKE2B 69f3db0b3705b55f1eb04d67e0e6d6baab7e7e7df214f0a5386b74efd2863b63290581cd6c5b90000bab20a423902722ab560a670aa25796c7d555875a5961ac SHA512 33bc261705580ece702dce6d2f4d4143e80daa072a09bfbb40bb522d3a494f5f438d560a3ff0aa089313b365015189aa909b831a95166c8e709477dc6625a31c diff --git a/sci-astronomy/stellarium/files/stellarium-0.18.2.patch b/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch index 71fc8ccf2d70..71fc8ccf2d70 100644 --- a/sci-astronomy/stellarium/files/stellarium-0.18.2.patch +++ b/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch diff --git a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild index 5b88d75bd45d..42b839f37191 100644 --- a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild +++ b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -25,10 +25,10 @@ IUSE="debug gps media nls stars test" RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtscript:5 dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu @@ -43,7 +43,7 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " -PATCHES=( "${FILESDIR}"/${P}.patch ) +PATCHES=( "${FILESDIR}"/${P}-as-needed.patch ) src_prepare() { cmake-utils_src_prepare @@ -53,8 +53,8 @@ src_prepare() { src_configure() { local mycmakeargs=( -DENABLE_GPS="$(usex gps)" - -DENABLE_NLS="$(usex nls)" -DENABLE_MEDIA="$(usex media)" + -DENABLE_NLS="$(usex nls)" -DENABLE_TESTING="$(usex test)" ) cmake-utils_src_configure |