gentoo resync : 30.09.2018

3 files changed, 2 insertions, 76 deletions

diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 3229d4bca007..4294a3b9f218 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-1.14.0.tar.xz 413960 BLAKE2B b6d6bb35d3b664ef4cb91cbb9fc9687475730466306d9d2722991ce912be26fd4b3440fd0b94aba2b707911fe43a7c91e053b379261a17197c414ebc08818f83 SHA512 bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5
 DIST wayland-1.15.0.tar.xz 432932 BLAKE2B d86e5ba52c16664926e4688317db3fad4f9629c3903239dde46ee238ef7874f28e39daa6bbda96519dfda4ff83a1f540522f21fbabe9b71aa263523481d4eb5b SHA512 f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8
-EBUILD wayland-1.14.0.ebuild 1716 BLAKE2B 7da42f2763831e108e5b13cf648da2bf72a7e113ef4e7aeca149f225a0a2127f10bcd2df3e1a8f191d814345f7aafe3b75c92152db970561279ed86e7b81b416 SHA512 33aae7d701a910cfb9cec52d861c81d232d21a2802054d434944656fb0e8f103944e35606b7e522766d9cc5e2d8207baa6b893add6a6f93d16f22a6d5a88c303
-EBUILD wayland-1.15.0.ebuild 1748 BLAKE2B 6a101262dda24c27e5cd484d8a72e782c940ff6d8f5023382ec71055b4bad92421b10cbfdd84ae9a03139b2014338a4e209239a8061685b4de04d695bad3fe60 SHA512 2112502a4c5ef0f5844551cb396a4a3416aa042cc2c036a71afbee2635862c87db93eda165bd72ed83857befd7aeedd72787761296a7356acff372116d64093e
+EBUILD wayland-1.15.0.ebuild 1745 BLAKE2B 833f9fa82246d92583090cc859fd98fe1084e4ce1f82f1ed135da2d6b48e075174239de3dc824a7a6f08c663d6b14807af593456da1a5c99617799b679792179 SHA512 d13a68804828eed61dddb4ca73e91898ad316fc7adbcb0bc94c73a13f4cbb6d6bf73787bcfa39724baa07aa9a49305d963edf0b0c7fe567d499dc4ba9d9497d1
 EBUILD wayland-9999.ebuild 1755 BLAKE2B 43f897b83819708141c70c1b8d678509101c5497a21d4ded684901c43295ada64934f95693a2458597a1bcfa7bb508a638a8447789ed511769219fb7d271bf0e SHA512 24b4b3d664e4cdd331d78f8f22ea3670513411577849c8f980b5b9f7c7687b692bce959dd25970055b940aa835fac1d22766dc40bba23d989b0300d29fd6474b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.14.0.ebuild b/dev-libs/wayland/wayland-1.14.0.ebuild
deleted file mode 100644
index 3ea948e26b83..000000000000
--- a/dev-libs/wayland/wayland-1.14.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit autotools libtool ltprune multilib-minimal toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:="
-DEPEND="${RDEPEND}
-	doc? (
-		>=app-doc/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-		sys-apps/grep[pcre]
-	)
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
-}
-
-multilib_src_configure() {
-	local myconf
-	if tc-is-cross-compiler ; then
-		myconf+=' --with-host-scanner '
-	fi
-
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(multilib_native_use_enable doc documentation) \
-		$(multilib_native_enable dtd-validation) \
-		${myconf}
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
-
-src_test() {
-	# We set it on purpose to only a short subdir name, as socket paths are
-	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
-	export XDG_RUNTIME_DIR="${T}"/xdr
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	multilib-minimal_src_test
-}
diff --git a/dev-libs/wayland/wayland-1.15.0.ebuild b/dev-libs/wayland/wayland-1.15.0.ebuild
index 1ea64ca6370a..e13f0b8db1a4 100644
--- a/dev-libs/wayland/wayland-1.15.0.ebuild
+++ b/dev-libs/wayland/wayland-1.15.0.ebuild
@@ -18,7 +18,7 @@ if [[ $PV = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"