gentoo resync : 25.05.2018

3 files changed, 49 insertions, 18 deletions

diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 9b9288890363..f803a3ea2e05 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,4 +1,5 @@
+AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1795 BLAKE2B b2882132e9958df3a866ad65dcb00340a2b8c2a804f23d00fe51fc69e49bc73ee1dc10a2a3eda92943214b15282162d3bec5cd4e352b975ae791f5c5e4a4586b SHA512 0b584c4b4a2971dbf511d174555cfaf2ee2d4df7b706bf3a20bd3983a0d7e39028ed24c0a21cd48a77d4d8813e519942d0f1e864358dc89045c4118fd072a667
+EBUILD gtkglext-1.2.0-r4.ebuild 1554 BLAKE2B a337a17177ec9a90e7218a08a20cf44469644202aa95719fd34a1223f85f3a20854c936c2a26281e05f1616389916c677b88ab416706a17fcfb7553b3eb90530 SHA512 bdd055aa81a04be324a555e501e372eb5d7640f4b7ac19b8e40107dfe3a206e7fc28ee4f11bf627d5fa9792882da0b7bb6d5a18e1dd6b26fb9247a4ffa7b3608
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch
new file mode 100644
index 000000000000..266f5fefc1ed
--- /dev/null
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch
@@ -0,0 +1,34 @@
+From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
+Date: Thu, 15 Mar 2018 15:56:20 +0100
+Subject: [PATCH 2/2] GCC-8 fixes.
+
+---
+ gdk/gdkglshapes.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
+index f72abba..9d1197f 100644
+--- a/gdk/gdkglshapes.c
++++ b/gdk/gdkglshapes.c
+@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
+   {-Z, -X, 0}
+ };
+ 
+-static int index[20][3] =
++static int iindex[20][3] =
+ {
+   {0, 4, 1},
+   {0, 9, 4},
+@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
+   int i;
+ 
+   for (i = 19; i >= 0; i--) {
+-    drawtriangle(i, idata, index, shadeType);
++    drawtriangle(i, idata, iindex, shadeType);
+   }
+ }
+ 
+-- 
+2.14.3
+
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 518b12f06ebe..948cc280bb4e 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-GNOME2_LA_PUNT="yes"
+EAPI=6
 inherit autotools gnome2 multilib-minimal
 
 DESCRIPTION="GL extensions for Gtk+ 2.0"
@@ -15,35 +13,33 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
 	>=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-archive-2014.02.28
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
 
 src_prepare() {
+	# Fix build issues with gcc patch from Fedora, bug #649718
+	eapply "${FILESDIR}"/${P}-gcc8-fixes.patch
+
 	# Ancient configure.in with broken multilib gl detection (bug #543050)
 	# Backport some configure updates from upstream git master to fix
-	epatch "${FILESDIR}/${P}-gl-configure.patch"
+	eapply "${FILESDIR}/${P}-gl-configure.patch"
+
 	mv configure.{in,ac} || die "mv failed"
 	eautoreconf
 
 	gnome2_src_prepare
-
-	# Remove development knobs, bug #308973
-	sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
-		examples/Makefile.am examples/Makefile.in \
-		gdk/Makefile.am gdk/Makefile.in \
-		gdk/win32/Makefile.am gdk/win32/Makefile.in \
-		gdk/x11/Makefile.am gdk/x11/Makefile.in \
-		gtk/Makefile.am gtk/Makefile.in \
-		|| die "sed failed"
 }
 
 multilib_src_configure() {