gentoo resync : 22.05.2018

4 files changed, 3 insertions, 38 deletions

diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 03fbaaf409af..06b7fc6a8120 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,7 +1,3 @@
-DIST libxshmfence-1.1.tar.bz2 291347 BLAKE2B 76b9f91e2bd03cd52212ca5ac548d7f4c64ad93bb0e2c8e2ecc719b820295fc53521089241bd9e7e892dbf60c1644bd73fad93732b95aa552e1121a4e8359404 SHA512 ed3aae4a44849c11ce041df53d47667606dba5357059c13d5c0989205df57dfa626598db6ad66432114a80e69ab4118fb067877ea275897aab64d4bbf9bcd346
-DIST libxshmfence-1.2.tar.bz2 267170 BLAKE2B 16e253a9f8e567cab048f8b54838929f8e78d222549c854baa682ec6736e5dd13d3cb5d1b9c2635d79b1bf41ee03dded0fac1845fbeedd07385c173f2660567f SHA512 340a6dff5c7ce7f0fe89d8094ee91a0572c8bf0da888861c5262d6a65a13ecad0e2a079949ccc115e15a2d0d108c4f1ba1743874289cacbbc17aa3a05cd8e072
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.1.ebuild 464 BLAKE2B 0688f6dc0549ce92f64ff70181e7f810c79c22a09fe669bbc5224e2cbc8d030b80375ad227b74c8c44b3b35ea9d47f14c0265792e563bb5a99ba3a89baa73ccb SHA512 d4bb938b7975702ea7d979c93c27a34e6e6181c445325b4a750322ef181e3b564f4ba9e08cb797a475bfbb29bb4fd47735c0cd6f8fa299f57b73c1b43134453b
-EBUILD libxshmfence-1.2.ebuild 466 BLAKE2B 26bdef08333387bc8f9a4ad2f358129307e644b34f370de616b6c07e72cf1ae883b428eff2743b7029905a5acf786d61eba8db42c9063b880aed52226806d5d8 SHA512 4003a74a9b05c1813cd078eec0a25c56b6efdc5bc43721a8ae9fa1570a6c9de31ce027d2a8b5615b99c03dc55a9e0dc38eb95212bcd4f2563eecc6b901dbfdb7
-EBUILD libxshmfence-1.3.ebuild 467 BLAKE2B a24b9281d272ab63a9dfecfdbc60ad730d22a9f14e422136f9e942e6c06cc471e4f77aa9bffe13c7a7fab45eaf0b70cc8b765bb4d397b12c5285500d70fcee12 SHA512 d0a18a03a0cfc712924d16b1a884be9d4ca9bbd44671d17f2873bfb8fbb091987e31e585ea99b8bbd22cb1dd06253c0e3a2acc7ba0ff8584c0898b14bb6bc6a4
+EBUILD libxshmfence-1.3.ebuild 426 BLAKE2B 6bdf3a30c37bfa20dd1b0df2b33e07ea683b5c84aa0dc3ba398e0cf6a5dbcb678bf1896e5aed707fb7326655be50fdffd93d1ebf17a75943580397529cca108e SHA512 4b3821f758847c1f19d64464e2b4eae8e20b44ca567e35211daa9efdbf5017eb2300f2fd9574aa5b413c604df143d33f09c6f66636e25e91f7e3560fbd48ce27
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.1.ebuild
deleted file mode 100644
index b94851a8c876..000000000000
--- a/x11-libs/libxshmfence/libxshmfence-1.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Shared memory fences using futexes"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	${RDEPEND}"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
deleted file mode 100644
index 8006b0c50cfa..000000000000
--- a/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Shared memory fences using futexes"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	${RDEPEND}"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
index 956711331662..4d71010ce83d 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
@@ -7,9 +7,8 @@ inherit xorg-2
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~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 ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
-DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
-	${RDEPEND}"
+DEPEND="x11-base/xorg-proto"