gentoo resync : 30.09.2018

4 files changed, 2 insertions, 30 deletions

diff --git a/virtual/opengl/Manifest b/virtual/opengl/Manifest
index b0c7ae58f31d..74aa4e92d51e 100644
--- a/virtual/opengl/Manifest
+++ b/virtual/opengl/Manifest
@@ -1,4 +1,2 @@
-EBUILD opengl-7.0-r1.ebuild 489 BLAKE2B c1761492eebfb52c119f8fd369cbbc7d90f7b5897c0f7da53686f3588e95ee036b5321d91536de69d1f311d788b5fbee43d514a73ecc38712bdc0ba41aa7c94e SHA512 efe15234a528f9ec833736bc3356635ffbb0e672207c21152c27cc52949d2bcfe3408ac64bccf66466d8077554119b216450a42c8b03168dbcebd9d338601dd9
-EBUILD opengl-7.0-r2.ebuild 520 BLAKE2B 1216a61ab87b57cfa14f7ca950e3d503028dedcb3ad8f73fb47d1189955527b37ac13479465ac06e29ec050b266e211649da1e92510092801e07ed885323d8d4 SHA512 50ce13f7d73f62943d1aa4435a80aa35261007009c950d9889fd0c54a56a19b48dc7d33ade1cf6438d3e1a7483086e289da74a64c42180d09fc1a89dd2d0ea39
-EBUILD opengl-7.0.ebuild 422 BLAKE2B 851401ac65e6624d5ee1874484c3c0cf85859e935637f7252f4e50476914d72a75a79053472ef8c806621e768f8cbcc353e964f1165b318114724c7919375d28 SHA512 f0f2e45003fda195cb920ad74410793682ea6de3e73ec56fb75721e977a58953f9e2174ab16caf7a91a7a4faddbfd53582ec3515d5458090fa3eb0c79d7951a5
+EBUILD opengl-7.0-r2.ebuild 517 BLAKE2B f486b4661ee212b61b486d261dc304dd1989669d595b40d6a8ba95cae6f318b2aefc1e23cf70899ea46e206a062ffeb05736e28b84fdd0f0dccfb1ad9f4de57d SHA512 19d2f1464299029cf5b99d42b367d5f26383f33322d38fec68c5e1a64320b9e1f73c0fc5195ccdd29b15a6c4d3ae0bf4291184be12993bff7ecd6de7a6c5adfd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/virtual/opengl/opengl-7.0-r1.ebuild b/virtual/opengl/opengl-7.0-r1.ebuild
deleted file mode 100644
index c00a058a82e9..000000000000
--- a/virtual/opengl/opengl-7.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 implementation"
-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/mesa-9.1.6[${MULTILIB_USEDEP}]
-		media-libs/opengl-apple
-	)"
diff --git a/virtual/opengl/opengl-7.0-r2.ebuild b/virtual/opengl/opengl-7.0-r2.ebuild
index cf49d4dace04..dd7fabb9abeb 100644
--- a/virtual/opengl/opengl-7.0-r2.ebuild
+++ b/virtual/opengl/opengl-7.0-r2.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for OpenGL implementation"
 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/opengl/opengl-7.0.ebuild b/virtual/opengl/opengl-7.0.ebuild
deleted file mode 100644
index 44333f8f830a..000000000000
--- a/virtual/opengl/opengl-7.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 implementation"
-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/mesa media-libs/opengl-apple )"