gentoo resync : 20.02.2019

3 files changed, 13 insertions, 22 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 58d888b646cf..76c383d607cb 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 94241da69f9c..41d7bd1cf151 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -8,5 +8,5 @@ AUX celestia-1.6.1-linking.patch 1526 BLAKE2B 8244fa0dcd7771887c2bd09e5ac2c8abba
 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 2546 BLAKE2B c72d8d78533a4e03e0eb4ea7ddfac8ce1a49690c44d1bb8595cc74223d744626c44cc3d5455f128f2948bad46c978c30888320b860dbe8a1a36c33a0c7754c17 SHA512 4645ff704d2450c879ea0207e9f62e16ab5335a8be724218ab6fdf05e4297827443cb73112b5e2402fb41e2e34d8e566ee48173c586a1e2ed183f2fef4a24dbe
+EBUILD celestia-9999.ebuild 2405 BLAKE2B 8b8e1421f4152f1a9226b7f108ecf55a63a7a8d03ae362c6510043f506f9882c6a01b0fb1c48c2bcd077d8318a8cce1a949936b6ee6f228ab98897398559e85b SHA512 8da007157a0e51ccb789d437098128d8d8bb64f183f3442265188cd9160e25be407ca1246a6e63b02c97c2a9a4f6463f32ae34f33d2087e714593867ff27af16
 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 b3f1f95bcbf7..182456385fd5 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
-}