gentoo resync : 30.09.2018

4 files changed, 2 insertions, 30 deletions

diff --git a/virtual/glu/Manifest b/virtual/glu/Manifest
index 6436b391bd85..fda4b5e320d8 100644
--- a/virtual/glu/Manifest
+++ b/virtual/glu/Manifest
@@ -1,4 +1,2 @@
-EBUILD glu-9.0-r1.ebuild 492 BLAKE2B d14d9fcc2391d3be26bd095abfe71d14b85bc5202abda6aba42dc3836aef96e77d7bb0a89a299984aee8f9c9961df5b73ef30db0b85fa845e42f01ef10b9df86 SHA512 5412b37b6b0b5208a017be73e6b65e7b17df3bdee10b9ce15bba8a2d855c1a9a159b011f521ebd017baeb39041c70f0e3b20918359e117a77260b0c45dee5741
-EBUILD glu-9.0-r2.ebuild 523 BLAKE2B 3e24a17194c993a29961748e694cda47dd95d842d04308871194a45b8ee8aee4bfaf52ad911b2207ed577cf61499ddaa142ab4da179d2eeed00f710c3dd71c9a SHA512 d6394a614e7cbc456feffe4f6a938e5b97edd87559bdd87c1fd58040cac1e6262b40e3368b5c639a0a1cb25e1e002edaaac49b140f293757e86044c6013252a7
-EBUILD glu-9.0.ebuild 441 BLAKE2B 287cca51501eea45d45c042d4b758e41653c96eb1222df97a4fe9a6e90b18e0e49745ae67980036cd67864e9440ca6a396846c9db63a84a7c46ed48d4e938a22 SHA512 7d93b7013b530130a655936a64ceb5e4856aef7aa68ad4bb72d3045d172393ae9f8d3abf63d51f22f5bea4e71ab0f80b69329f97f1f1903ecc9d3a6a8672023a
+EBUILD glu-9.0-r2.ebuild 520 BLAKE2B 57631849d316433d6af6bd5c937e093a9f03eb11d9984a7c102f6e8985b417dfd52c19d3935e1d1056d84e3077f24300395fd6d9f18c8f0d15f2da6ba63cfb55 SHA512 9b6bf8b67f2600453cf13a21d684b8cddd334ea2fff4ac9971ade03954ebb77220ff1e65d27c3a1aeadd72b608fa971c4da4f26c1a37a1cac967a1972f4cfb2f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/virtual/glu/glu-9.0-r1.ebuild b/virtual/glu/glu-9.0-r1.ebuild
deleted file mode 100644
index 91a5f0f51115..000000000000
--- a/virtual/glu/glu-9.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for OpenGL utility library"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| (
-		>=media-libs/glu-9.0.0-r1[${MULTILIB_USEDEP}]
-		media-libs/opengl-apple
-	)"
diff --git a/virtual/glu/glu-9.0-r2.ebuild b/virtual/glu/glu-9.0-r2.ebuild
index 8c2a624a9dd2..b896d0308e2e 100644
--- a/virtual/glu/glu-9.0-r2.ebuild
+++ b/virtual/glu/glu-9.0-r2.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for OpenGL utility library"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/glu/glu-9.0.ebuild b/virtual/glu/glu-9.0.ebuild
deleted file mode 100644
index 8b5c06748533..000000000000
--- a/virtual/glu/glu-9.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for OpenGL utility library"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="|| ( media-libs/glu <media-libs/mesa-9 media-libs/opengl-apple )"