gentoo resync : 28.04.2019

3 files changed, 2 insertions, 80 deletions

diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 0986afbc36dc..ac9c4b28b087 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,7 +1,5 @@
 AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f
-DIST mesa-demos-8.3.0.tar.bz2 10044647 BLAKE2B 66605d2be7a3e1ea30429b29c574d866961e7df6f17479647d8d4a3cb788f52701ee8c6379c208157348a265d0a3eb90b929415073fa03ba6aefc47f8a45e5c8 SHA512 9ba96980306953f7b72745063e75809fb8399bbd5fc58fca96290a8b4e61741bb82fb6171311eddf249ea12face83d7c7b087e6dade6833699a8d220fc752e3f
 DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
-EBUILD mesa-progs-8.3.0.ebuild 1801 BLAKE2B 16434cc4e5ae19d059dff9894225377028faa34a206fe29274a952eaa9956544b83fcefaaec1ea7b617d3cda0eedcff12c2dd919db7b6605a5626851e4f1f901 SHA512 7d3035951fedf085be091b02cd2101b7399f99fc54181694aa1cf1aabf721db675d51f5efa57bb147d9f2672bf0870adc3fccdced9ee72f7c61dfe026edd2e05
-EBUILD mesa-progs-8.4.0.ebuild 1729 BLAKE2B 3992f47bab4be80840f33e30b9943bd7eedc74099c115c203b8676b8415a8eafa52fbde8c114a4475c4ccc017490f48d1cc726453062a2b58a0e4be601e34dea SHA512 07e0c03ffb9784bb1ae96aa6ff3fff7ca354d846f4ad299cfb7e9723645c12e0840276156fd1df44b6e00c0d30e22169a494493a034d309ffcf0867d1eef7be3
+EBUILD mesa-progs-8.4.0.ebuild 1721 BLAKE2B 769531d4e0d0e3d5aaec85a212c014439b7489ac7fea01b59c072f4592ca026bb4caa1a0d20922f981c6c9f6c9e19dc96b378ceb57b4f55ff80fbf16acaeaa06 SHA512 f65cf8c754d299cff5d9b673a6205c4892434e33132d85c2b5c7d75ebece6ede1379148621b8894128beafea45dbf3797f7a9bb3952df645bca5286d58d74a60
 EBUILD mesa-progs-9999.ebuild 1673 BLAKE2B d265f6b8fd7275b51999da6c0f65e420d03702133b58f12a0d23f6b80bf9f3c1fdbc92cf2733886e299be46a46b7ab4acec8fc9261f32bb3d7c20c907c9b988d SHA512 e0b4b5ecf04a0a750524e90617b36d670a315867215e82a7d2c25e1e9c8b0e98fd5752f7915ea32c01f1b9624a82cf9cc8f90b43bb4592d3ccebe47122a4cd49
 MISC metadata.xml 475 BLAKE2B 4275e3d7871f0b092559ddf5c898bad781441267b093d55bdb14d7e9795ac070aa7d9a87cf7248d58b75798eb28a4413d588492bb6ab092ef79373434fb1652e SHA512 624480e9601ad6ad1cb996b25074c3e47a539113af39633de80c9eb0330322453f545ecfede9d602de7259d66047f507bf3a1cb115becb5f5e7d0613cb5bc675
diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
deleted file mode 100644
index fa5959248cd1..000000000000
--- a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN/progs/demos}
-MY_P=${MY_PN}-${PV}
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-inherit base autotools toolchain-funcs ${GIT_ECLASS}
-
-DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="egl gles2"
-
-RDEPEND="
-	media-libs/mesa[egl?,gles2?]
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	media-libs/glew
-	virtual/glu
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${MY_P}
-EGIT_CHECKOUT_DIR=${S}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	base_src_prepare
-
-	[[ $PV = 9999* ]] && eautoreconf
-}
-
-src_compile() {
-	emake -C src/xdemos glxgears glxinfo
-
-	if use egl; then
-		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
-		emake -C src/egl/eglut/ libeglut_x11.la
-		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
-
-		if use gles2; then
-			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
-			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
-		fi
-	fi
-}
-
-src_install() {
-	dobin src/xdemos/{glxgears,glxinfo}
-	if use egl; then
-		dobin src/egl/opengl/egl{info,gears_x11}
-
-		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
-	fi
-}
diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
index 84d6850209c3..ccb0fec4f23f 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2"