gentoo resync : 02.08.2019

3 files changed, 2 insertions, 72 deletions

diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 1c7915738d1f..ef4ac9c00de8 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,6 +1,4 @@
-DIST xorgproto-2018.4.tar.gz 493597 BLAKE2B f25a637317ff2d7ba34d416368261b5afb617e42a1fb642cc78ab3e877752a81291fe0523d1af6cd0fe27399676b14a70ceea7178d521187423bb503c9b1c63b SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362
 DIST xorgproto-2019.1.tar.gz 1119813 BLAKE2B eed29e0e236cc448b2ff220a844c68f69b0d1d2d7cfb4e82219731bbedadfc9352cf894ce8ba3c2a9f7dd1689a46be0a9ed4b0d061c661b752b0e81ef1057f27 SHA512 7d3a5b24cf5c5ff78c63f61b7e4e2fe6f8b6ca64c345422a1943688af8dccd621cf22833035ee632d37ebb96bf4864d1c18a8015373d69e734299cccb481615a
-EBUILD xorg-proto-2018.4.ebuild 1843 BLAKE2B 7ac6c1ef845ac38bc53316cf16ed63fb2a0db71fc1e63c96e412324bfdc98fea34209ab7ecc4d75ea78c51cd734558c1af6a22ed1a0f62aada5662b791352e88 SHA512 b3bfc81d6b81dc882f26d4baa8d83963cf44e1ea9e8a638c87c13273c86a800906557d5d42bddb225a6a2905abfd588251222a89a7634f606d920afd305196f6
-EBUILD xorg-proto-2019.1.ebuild 1845 BLAKE2B c385978e6baf6b4856972020c4a1f24224bcbd7b31228197a2bbdf238240efacbc94255e5525a86f883a1d604c92ee199918de6d1c2c49bd74003b47b84983b7 SHA512 cb1f91e636b897e54f41aad38a6fae5a06507d90d7038644b833d1cce1cef4b35548bb40d108349d4c3d1706791f4e7cc355444f1eea9d8dfe543fe1309e1bbc
+EBUILD xorg-proto-2019.1.ebuild 1843 BLAKE2B 86e3aca0861e8636bf58cce7c5dbe944477c37a7eb89a71a8f032d9c4e72b9a382cb8c228c2e13cac55f8bc235f078bb733db517648c25142e917e81806882aa SHA512 5c2e4603f94f3435bf0e7dba374bb3d35dc79cd0da3c4b350c58c4903fb616d38535265a42d8b5580c60f15e5212a4478a46dc5b7c19cb79b37c5fe9935dfe02
 EBUILD xorg-proto-9999.ebuild 1854 BLAKE2B 49f6dbf2a63f3c67dd5c81fe4bbcddf545e8cce801dae7757e7ef093f0292ece21ab6fc0dcf88b1c8926657c8d69c1f6d799c2cfd9a0527c48d363ab66dd6cec SHA512 43d0d0e9dfa1a57d4212ed4de9a02b2df7a6e071d37a575b3fc41cab49376856c11721940281ef77506b96f262a4956ecceddbb9942ef0f4310902cbf94f35e4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
deleted file mode 100644
index 581f897fdb2b..000000000000
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/xorg-/xorg}"
-MY_P="${MY_PN}-${PV}"
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	!<x11-proto/bigreqsproto-1.1.2-r1
-	!<x11-proto/compositeproto-0.4.2-r2
-	!<x11-proto/damageproto-1.2.1-r2
-	!<x11-proto/dmxproto-2.3.1-r2
-	!<x11-proto/dri2proto-2.8-r2
-	!<x11-proto/dri3proto-1.0-r1
-	!<x11-proto/fixesproto-5.0-r2
-	!<x11-proto/fontsproto-2.1.3-r1
-	!<x11-proto/glproto-1.4.17-r2
-	!<x11-proto/inputproto-2.3.2-r1
-	!<x11-proto/kbproto-1.0.7-r1
-	!<x11-proto/presentproto-1.1-r1
-	!<x11-proto/randrproto-1.5.0-r1
-	!<x11-proto/recordproto-1.14.2-r2
-	!<x11-proto/renderproto-0.11.1-r2
-	!<x11-proto/resourceproto-1.2.0-r1
-	!<x11-proto/scrnsaverproto-1.2.2-r2
-	!<x11-proto/trapproto-3.4.3-r1
-	!<x11-proto/videoproto-2.3.3-r1
-	!<x11-proto/xcmiscproto-1.2.2-r1
-	!<x11-proto/xextproto-7.3.0-r1
-	!<x11-proto/xf86bigfontproto-1.2.0-r2
-	!<x11-proto/xf86dgaproto-2.1-r3
-	!<x11-proto/xf86driproto-2.1.1-r2
-	!<x11-proto/xf86miscproto-0.9.3-r1
-	!<x11-proto/xf86vidmodeproto-2.3.1-r2
-	!<x11-proto/xineramaproto-1.2.1-r2
-	!<x11-proto/xproto-7.0.31-r1
-
-	!x11-proto/fontcacheproto
-	!x11-proto/xf86rushproto"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
diff --git a/x11-base/xorg-proto/xorg-proto-2019.1.ebuild b/x11-base/xorg-proto/xorg-proto-2019.1.ebuild
index 5750021eeba3..738ad573db92 100644
--- a/x11-base/xorg-proto/xorg-proto-2019.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2019.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi