gentoo resync : 17.05.2018

5 files changed, 1 insertions, 55 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 107ba6ed06ea..5e3c48c6f373 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 8812acc65381..9d7401b89455 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -6,9 +6,7 @@ AUX celestia-1.6.1-libpng15.patch 391 BLAKE2B 6114b4b82a92dd572c3b13ecae23118fb2
 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-glew_linking.patch 812 BLAKE2B 1094b87f2204d3b8a3bf070c2af35c34347b10dad26e9e0133116abed5889a5d8f49469e122f3dd2d9f100df1cf2cef0690d6890ecb6e65dc2dd2f691c13f7a5 SHA512 ec25b82845a25716ccfd7442e537462558e0f813d189abee0e0886a4aad1eeb70641f6493f4c705caa0ed9ba42a267df0236415d432169c309780a9def39ca70
-AUX celestia-1.6.99-gtk_libs.patch 654 BLAKE2B 91ca803b64dd49cac8a0235f09b3585fc0abea9d3b1fc9753e23dd89e9d2fcc247380191824841246513a0ade3859096756ae9a73115226ec070d416dffd6e6a SHA512 d19122696c1a6da2ca01d5ea0fd69df2a3e584d6fb8cf72e72fe899130505cfa45ab6fed72da290fe59335f76af33b7b9669ba726f9d6fe3f197a1069121d999
 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 2625 BLAKE2B da4ad971e3e5a3383d8c9da08917b13d1cdf5b99712c4e08a593f75d5cb48d3fe6f4463eb960324b963e039683c448a35a87cec71b920c8462b0b606a0b2dcd8 SHA512 1bd5c12f230c171f0cafd362c840745c7f98ea72c019b6949e8f7e43bc72fff67b22270175a981639261787ba852faa928f248b41b464003364425caf2dfe56b
+EBUILD celestia-9999.ebuild 2479 BLAKE2B 7b6a3f8d756c56c59f07c90f1f61ed148537aafd8eb5c987789829b585aa861c8f1fdf79c216f27bc44c7f51112c4b54962a598f68af44a99d5e1f65d81c3cd9 SHA512 7e2a0c18b169125a60001fd0303d3d67911bd2779f9d47c40e72297b157e21d1f25ac07b6a6a48edf94567520441d5ed879a055ea0045c82783fa7056f6f3f99
 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 23ad6bc99f7c..4e61192de39e 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -41,10 +41,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.0-desktop.patch
 	# add a ~/.celestia for extra directories
 	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
-
-	# https://github.com/CelestiaProject/Celestia/pull/48
-	"${FILESDIR}"/${PN}-1.6.99-gtk_libs.patch
-	"${FILESDIR}"/${PN}-1.6.99-glew_linking.patch
 )
 
 pkg_setup() {
diff --git a/sci-astronomy/celestia/files/celestia-1.6.99-glew_linking.patch b/sci-astronomy/celestia/files/celestia-1.6.99-glew_linking.patch
deleted file mode 100644
index 4c8657f34ced..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.6.99-glew_linking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/celengine/Makefile.am b/src/celengine/Makefile.am
-index 77d909b7..dd0b0a66 100644
---- a/src/celengine/Makefile.am
-+++ b/src/celengine/Makefile.am
-@@ -1,7 +1,10 @@
- noinst_LIBRARIES = libcelengine.a
- noinst_HEADERS = $(wildcard *.h)
- 
--AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/curveplot/include
-+AM_CPPFLAGS = -I$(top_srcdir)/src \
-+	      -I$(top_srcdir)/thirdparty/Eigen \
-+	      -I$(top_srcdir)/thirdparty/curveplot/include \
-+	      -I$(top_srcdir)/thirdparty/glew/include
- 
- libcelengine_a_CXXFLAGS = $(LUA_CFLAGS) $(SPICE_CFLAGS) $(GLEW_CFLAGS)
- 
-@@ -75,4 +78,5 @@ libcelengine_a_SOURCES = \
- 	vertexprog.cpp \
- 	virtualtex.cpp \
- 	visibleregion.cpp \
-+	../../thirdparty/glew/src/glew.c \
- 	../../thirdparty/curveplot/src/curveplot.cpp
diff --git a/sci-astronomy/celestia/files/celestia-1.6.99-gtk_libs.patch b/sci-astronomy/celestia/files/celestia-1.6.99-gtk_libs.patch
deleted file mode 100644
index 2f175d967079..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.6.99-gtk_libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 80bd68c7ff75f3e87574a4557ccf149fc70752b3 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 15 May 2018 11:28:08 +0200
-Subject: [PATCH 1/2] Fix gtk related undefined references
-
----
- src/celestia/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/celestia/Makefile.am b/src/celestia/Makefile.am
-index 60609fd3..a08fb0c7 100644
---- a/src/celestia/Makefile.am
-+++ b/src/celestia/Makefile.am
-@@ -14,7 +14,8 @@ endif
- 
- if ENABLE_GTK
- SUBDIRS += gtk
--celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+celestiaGTKLIBS = gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- if ENABLE_QT
--- 
-2.17.0
-