gentoo resync : 25.05.2018

8 files changed, 52 insertions, 21 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6942d8c7b9cb..a481efa87d2a 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
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() {
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 06b7fc6a8120..5681c408948d 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,3 +1,3 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.3.ebuild 426 BLAKE2B 6bdf3a30c37bfa20dd1b0df2b33e07ea683b5c84aa0dc3ba398e0cf6a5dbcb678bf1896e5aed707fb7326655be50fdffd93d1ebf17a75943580397529cca108e SHA512 4b3821f758847c1f19d64464e2b4eae8e20b44ca567e35211daa9efdbf5017eb2300f2fd9574aa5b413c604df143d33f09c6f66636e25e91f7e3560fbd48ce27
+EBUILD libxshmfence-1.3-r1.ebuild 426 BLAKE2B 6bdf3a30c37bfa20dd1b0df2b33e07ea683b5c84aa0dc3ba398e0cf6a5dbcb678bf1896e5aed707fb7326655be50fdffd93d1ebf17a75943580397529cca108e SHA512 4b3821f758847c1f19d64464e2b4eae8e20b44ca567e35211daa9efdbf5017eb2300f2fd9574aa5b413c604df143d33f09c6f66636e25e91f7e3560fbd48ce27
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
index 4d71010ce83d..4d71010ce83d 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 71dfc9c9180e..a6ced3a0b19b 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST rep-gtk-0.90.8.1.tar.xz 251652 BLAKE2B b10a2a88b1950da4cb0f85d7dea53167184fcbf28a515b68de70f9ffc6e6cb9a2e2208020f8d6a9a52235cf4b1454901a0edeae990a2bb7227ba7eaa5da6db45 SHA512 033c148b34591672f29b0a1636b4c962ff82423f627243db07746899bfbf0ccd479322743d0822903bf954cdb3bae662ef7b2f8064cbe2741c5e8cf886e56d1b
 DIST rep-gtk_0.90.8.3.tar.xz 120616 BLAKE2B a0ada2bb13a8104d0dd532f35b64e6b049711284b60b4c4960b730909061ecce058a0ee79517cc508db95647d93f9af95c5ca73cf76e26b59467c8441064ac07 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac
 EBUILD rep-gtk-0.90.8.1.ebuild 1163 BLAKE2B 29f07de2e6265aa82b35d8d9398714edb2edb62c0f201632404428e5a12debbddc8bfc7dada51b30c8ec1475738b28a2e6e23a4cf41fb9e3681cd2c7631e658f SHA512 f66f4e7bad2ef1611fe5aa64379706011d91f3962a078cb9c3448e152e2796bdff99c4e05352df61c5dc243c1ec4c3031fa99e4610560f5d64ee6b82e55dd0c4
-EBUILD rep-gtk-0.90.8.3.ebuild 993 BLAKE2B c970247cbf3a55fb67e559bd32b78cd058d85f42a045bba996fe476eb229f300cb9fb1ae57ef89bf7d99b9d422c4c8dd5d916942a8cb497aa2e7bea4f4dbc738 SHA512 ce67c3205d6a5975d6208a020cfd96a0c7e67ddeabcc62efca00b73b0a74d79c809bb00e170b5c37b8567b13b0b35f7e424496a839278a2ebaf85266ec8d6771
+EBUILD rep-gtk-0.90.8.3.ebuild 992 BLAKE2B 07fdc83b91f99f1a69af90774e296876f558fa70edc3ef4e1b61bd8a9f59bdfb08384f39d448b6f883068562d9722eb4f00e5b86a8ef5d361b3b79e90311a160 SHA512 c2128a9ddf5704242b74633bc0a0ea601a9bf640361efeb0e34ccb627fa89bbff9f4a5431cb612e63b258779316af85df998ad8c3da17668c6de7a6587ae3ae8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
index b639e968f95b..80b9fd2b78fd 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.tuxfamily.org/librep/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="gtk-2.0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="examples"
 
 RDEPEND=">=dev-libs/librep-0.90.5