[gentoo-commits] repo/gentoo:master commit in: dev-libs/wayland/files/, dev-libs/wayland/

[Manuel Rüger]

commit:     003499661d7cd6d22237b9b42acb554665a007f6
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 23:41:04 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 23:41:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00349966

dev-libs/wayland: Remove old

Package-Manager: portage-2.3.1

 dev-libs/wayland/Manifest                          |   3 -
 ...uild-fix-configure-disable-dtd-validation.patch | 247 ---------------------
 .../1.10.0-scanner-avoid-executable-stack.patch    |  45 ----
 dev-libs/wayland/wayland-1.10.0-r1.ebuild          |  66 ------
 dev-libs/wayland/wayland-1.6.1.ebuild              |  57 -----
 dev-libs/wayland/wayland-1.8.1.ebuild              |  62 ------
 6 files changed, 480 deletions(-)

diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 8de9c34..edc4486 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,7 +1,4 @@
-DIST wayland-1.10.0.tar.xz 368976 SHA256 4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc SHA512 772e89bdfa494bc263b5c6c4692784738e55a6c6196d5a8e6180f269e0c2d7592f159efb0dca1b1489273e14ba8cda16f5522e58fc9824beff8688f11a00f985 WHIRLPOOL 35a6c27deee3b2f1fe272c54f242c77bed84feaed0d47d94d03563bf9738c60ed54f9bd7d26a862ed165de6eb8817decad49b100ed1f10179f00b25a0636b6c9
 DIST wayland-1.11.0.tar.xz 374468 SHA256 9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0 SHA512 c8a0c927b6e095707a58398fe545ed708f4c808a70920c1f82c79d4275e6137cdf9926c0f18227faba511f717f4db4dfee9528075e00ec600ea44b97479471dd WHIRLPOOL 6361bb1b05c5629b56e32d75ef4dd8398bacc31c03174e082b75850aeda2284fad929ccf91548b9d95b65524d3200013c27e02038c63ccb7e7f2f680e47cd3dd
 DIST wayland-1.12.0.tar.xz 379520 SHA256 d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1 SHA512 cde05344e6c9ee40c80651f5b6d6b4a14787a9cf2c8e3099d69b8f78672610e3ccbe4a87446f9ae93ca402cfbb916ef7444294efa7a0fc88ef1a984f94dabd20 WHIRLPOOL 8dc03639759908921c7d5d5df4dc02c6f7e96d9c9a7e8728bd64310a10c54fe50c4042ced3db4954ff4512f073c1bd8993df207b45182d862f6ffeeb0b1283e4
-DIST wayland-1.6.1.tar.xz 418628 SHA256 d1aeb95b433cab33a928b56cb80efa551802e0a064adb4a8ea1517249d3c10b0 SHA512 28a0980ece2fb4ba0ca688f3913ffba34c2741167d7686be80cfbc9cb56f995282a68173d69d2849eb5c2986684ebe6d5cfaca04518ab74a4512c8dfb4d8d0c2 WHIRLPOOL be307a292c8f939921700fc85c9ad1675c491fdc3e1a16ffc52512e39d971f6afdbd378c60c57a64781cdccb364ed77271e07b64f5c3b7b96abd45a1595dfc4e
 DIST wayland-1.7.0.tar.xz 372004 SHA256 bdea47a2db96f7e53f1ce0351559c0af5b7f7aae7e95f0a884a78af9f1057c9c SHA512 2475a5e8c2ef5c4bc97d90f946a89e4155d840a342886a7634df5423e5764973dbf5d721e1a8a941b7bd2305017cdcb74af7a29bee7bb8b58373306e5c03add7 WHIRLPOOL 152be0d1c3ac314cd3dcd765e6a04eaa71b618b1577c423147ccb5b1d82cdeaf09d09c8933746e6bd100b2d59374749084eede36b9075a153328fda179955ea2
-DIST wayland-1.8.1.tar.xz 374116 SHA256 f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8 SHA512 392edd22203fc44a37a66d7a099d0534f047f49e91b28614092346f0167c07a39431c5919f2ea1deaf460dc53a77fba8504a7a7f5d03af638267c767bb07ae19 WHIRLPOOL f15ea109324c0c84b848f458acb6786248fb1c7ee8dafd6ef945d4f80f5b87b911dd2d2c0485b1ceeeed95454990e186e7d8b04d366f903954dd8998a1f3999f
 DIST wayland-1.9.0.tar.xz 351096 SHA256 9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa SHA512 245569f404474ab25e4f771d7652e77674363ac43233d49ecfeff0c52f02d34231064c17d56e61b6822259cb3956fc8c3789d788d9a84716f947915ad62fee6d WHIRLPOOL ce46b5568b6c6b23bec5129030680c7486cb6b6a7e761fbb5041b640d5a14eb45f88f46c4ea6b0a7e9cbda425bed13ae7ff58618ce3d1346f7422f8da4649060

diff --git a/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch b/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch
deleted file mode 100644
index 7b55e2f..00000000
--- a/dev-libs/wayland/files/1.10.0-build-fix-configure-disable-dtd-validation.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From: Pekka Paalanen <pekka.paalanen@××××××××××××.uk>
-Date: Mon, 29 Feb 2016 14:59:51 +0200
-Subject: [PATCH] build: fix ./configure --disable-dtd-validation
-
-When configured with --disable-dtd-validation:
-
-  CPPAS    src/dtddata.o
-src/dtddata.S: Assembler messages:
-src/dtddata.S:39: Error: file not found: src/wayland.dtd.embed
-Makefile:1520: recipe for target 'src/dtddata.o' failed
-
-This is because the variable name used does not match the implicit
-variable name in autoconf.
-
-Fix the variable name, making both --disable-dtd-validation and
---enable-dtd-validation to what they should.
-
-Do not try to build dtddata.S if dtd-validation is disabled. It depends
-on wayland.dtd.embed which is created by configure only if
-dtd-validation is enabled.
-
-If not building dtddata.S, also make sure the extern definitions in
-scanner.c are compiled out.
-
-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=575212
-Reported-by: leio@g.o
-Signed-off-by: Pekka Paalanen <pekka.paalanen@××××××××××××.uk>
-Reviewed-by: Quentin Glidic <sardemff7+git@×××××××××.net>
-Tested-by: Bryce Harrington <bryce@×××××××××××.com>
-[Mart: Added Makefile.in and configure changes to patch file to avoid autoreconf]
-Signed-off-by: Mart Raudsepp <leio@g.o>
----
- Makefile.am   |  5 ++++-
- Makefile.in   | 20 ++++++++++++--------
- configure     | 18 ++++++++++++++++--
- configure.ac  |  5 +++--
- src/scanner.c |  6 +++---
- 5 files changed, 38 insertions(+), 16 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e850abc..49e25a6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -23,11 +23,14 @@ pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA =
- 
- bin_PROGRAMS = wayland-scanner
--wayland_scanner_SOURCES = src/scanner.c src/dtddata.S
-+wayland_scanner_SOURCES = src/scanner.c
- wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS)
- wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la
- pkgconfig_DATA += src/wayland-scanner.pc
- 
-+if DTD_VALIDATION
-+wayland_scanner_SOURCES += src/dtddata.S
-+endif
- src/dtddata.o: protocol/wayland.dtd
- 
- if USE_HOST_SCANNER
-diff --git a/configure.ac b/configure.ac
-index f54a8b9..b27f34b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation],
- 	      [AC_HELP_STRING([--disable-dtd-validation],
- 			      [Disable DTD validation of the protocol])],
- 	      [],
--	      [enable_dtdvalidation=yes])
-+	      [enable_dtd_validation=yes])
- 
- AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
- 
-@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [],
- 	 AC_SUBST(EXPAT_LIBS)
- 	])
- 
--if test "x$enable_dtdvalidation" = "xyes"; then
-+AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
-+if test "x$enable_dtd_validation" = "xyes"; then
- 	PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
- 	AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available])
- 	AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
-diff --git a/aclocal.m4 b/aclocal.m4
-index 71ca3dc..86eace8 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1327,6 +1327,7 @@ AC_SUBST([am__tar])
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
- 
-+#timestamp update to avoid regen
- m4_include([m4/libtool.m4])
- m4_include([m4/ltoptions.m4])
- m4_include([m4/ltsugar.m4])
-diff --git a/config.h.in b/config.h.in
-index 1400592..33f0e99 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -15,6 +15,7 @@
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
- 
-+/* Timestamp update */
- /* libxml-2.0 is available */
- #undef HAVE_LIBXML
- 
-diff --git a/Makefile.in b/Makefile.in
-index 6d9ffb2..32e6d51 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -82,8 +82,9 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- bin_PROGRAMS = wayland-scanner$(EXEEXT)
--@ENABLE_LIBRARIES_TRUE@am__append_1 = libwayland-private.la
--@ENABLE_LIBRARIES_TRUE@am__append_2 = src/wayland-client.pc \
-+@DTD_VALIDATION_TRUE@am__append_1 = src/dtddata.S
-+@ENABLE_LIBRARIES_TRUE@am__append_2 = libwayland-private.la
-+@ENABLE_LIBRARIES_TRUE@am__append_3 = src/wayland-client.pc \
- @ENABLE_LIBRARIES_TRUE@	src/wayland-server.pc \
- @ENABLE_LIBRARIES_TRUE@	cursor/wayland-cursor.pc
- @ENABLE_LIBRARIES_TRUE@TESTS = array-test$(EXEEXT) \
-@@ -101,7 +102,7 @@ bin_PROGRAMS = wayland-scanner$(EXEEXT)
- @ENABLE_LIBRARIES_TRUE@	resources-test$(EXEEXT) \
- @ENABLE_LIBRARIES_TRUE@	message-test$(EXEEXT) \
- @ENABLE_LIBRARIES_TRUE@	headers-test$(EXEEXT) $(am__EXEEXT_1)
--@ENABLE_CPP_TEST_TRUE@@ENABLE_LIBRARIES_TRUE@am__append_3 = cpp-compile-test
-+@ENABLE_CPP_TEST_TRUE@@ENABLE_LIBRARIES_TRUE@am__append_4 = cpp-compile-test
- @ENABLE_LIBRARIES_TRUE@check_PROGRAMS = $(am__EXEEXT_2) \
- @ENABLE_LIBRARIES_TRUE@	exec-fd-leak-checker$(EXEEXT)
- @ENABLE_LIBRARIES_TRUE@noinst_PROGRAMS = fixed-benchmark$(EXEEXT)
-@@ -382,8 +383,10 @@ am__socket_test_SOURCES_DIST = tests/socket-test.c
- @ENABLE_LIBRARIES_TRUE@	tests/socket-test.$(OBJEXT)
- socket_test_OBJECTS = $(am_socket_test_OBJECTS)
- @ENABLE_LIBRARIES_TRUE@socket_test_DEPENDENCIES = libtest-runner.la
-+am__wayland_scanner_SOURCES_DIST = src/scanner.c src/dtddata.S
-+@DTD_VALIDATION_TRUE@am__objects_1 = src/dtddata.$(OBJEXT)
- am_wayland_scanner_OBJECTS = src/wayland_scanner-scanner.$(OBJEXT) \
--	src/dtddata.$(OBJEXT)
-+	$(am__objects_1)
- wayland_scanner_OBJECTS = $(am_wayland_scanner_OBJECTS)
- wayland_scanner_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) libwayland-util.la
-@@ -491,7 +494,8 @@ DIST_SOURCES = $(am__libtest_runner_la_SOURCES_DIST) \
- 	$(am__resources_test_SOURCES_DIST) \
- 	$(am__sanity_test_SOURCES_DIST) \
- 	$(am__signal_test_SOURCES_DIST) \
--	$(am__socket_test_SOURCES_DIST) $(wayland_scanner_SOURCES)
-+	$(am__socket_test_SOURCES_DIST) \
-+	$(am__wayland_scanner_SOURCES_DIST)
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- 	ctags-recursive dvi-recursive html-recursive info-recursive \
- 	install-data-recursive install-dvi-recursive \
-@@ -918,8 +922,8 @@ dist_pkgdata_DATA = \
- 	protocol/wayland.dtd
- 
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = src/wayland-scanner.pc $(am__append_2)
--wayland_scanner_SOURCES = src/scanner.c src/dtddata.S
-+pkgconfig_DATA = src/wayland-scanner.pc $(am__append_3)
-+wayland_scanner_SOURCES = src/scanner.c $(am__append_1)
- wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS)
- wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la
- @USE_HOST_SCANNER_FALSE@wayland_scanner = $(top_builddir)/wayland-scanner
-@@ -929,7 +933,7 @@ libwayland_util_la_SOURCES = \
- 	src/wayland-util.c			\
- 	src/wayland-util.h
- 
--noinst_LTLIBRARIES = libwayland-util.la $(am__append_1)
-+noinst_LTLIBRARIES = libwayland-util.la $(am__append_2)
- @ENABLE_LIBRARIES_TRUE@lib_LTLIBRARIES = libwayland-server.la \
- @ENABLE_LIBRARIES_TRUE@	libwayland-client.la \
- @ENABLE_LIBRARIES_TRUE@	libwayland-cursor.la
-diff --git a/configure b/configure
-index 83e4971..6340d4f 100755
---- a/configure
-+++ b/configure
-@@ -711,6 +711,8 @@ HAVE_XSLTPROC_TRUE
- XSLTPROC
- LIBXML_LIBS
- LIBXML_CFLAGS
-+DTD_VALIDATION_FALSE
-+DTD_VALIDATION_TRUE
- EXPAT_LIBS
- EXPAT_CFLAGS
- FFI_LIBS
-@@ -15728,7 +15730,7 @@ fi
- if test "${enable_dtd_validation+set}" = set; then :
-   enableval=$enable_dtd_validation;
- else
--  enable_dtdvalidation=yes
-+  enable_dtd_validation=yes
- fi
- 
- 
-@@ -16114,7 +16116,15 @@ $as_echo "yes" >&6; }
- 
- fi
- 
--if test "x$enable_dtdvalidation" = "xyes"; then
-+ if test "x$enable_dtd_validation" = "xyes"; then
-+  DTD_VALIDATION_TRUE=
-+  DTD_VALIDATION_FALSE='#'
-+else
-+  DTD_VALIDATION_TRUE='#'
-+  DTD_VALIDATION_FALSE=
-+fi
-+
-+if test "x$enable_dtd_validation" = "xyes"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML" >&5
-@@ -16669,6 +16679,10 @@ if test -z "${ENABLE_LIBRARIES_TRUE}" && test -z "${ENABLE_LIBRARIES_FALSE}"; th
-   as_fn_error $? "conditional \"ENABLE_LIBRARIES\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${DTD_VALIDATION_TRUE}" && test -z "${DTD_VALIDATION_FALSE}"; then
-+  as_fn_error $? "conditional \"DTD_VALIDATION\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${HAVE_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then
-   as_fn_error $? "conditional \"HAVE_XSLTPROC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff --git a/src/scanner.c b/src/scanner.c
-index d3e2328..04747e3 100644
---- a/src/scanner.c
-+++ b/src/scanner.c
-@@ -40,13 +40,13 @@
- 
- #if HAVE_LIBXML
- #include <libxml/parser.h>
--#endif
--
--#include "wayland-util.h"
- 
- /* Embedded wayland.dtd file, see dtddata.S */
- extern char DTD_DATA_begin;
- extern int DTD_DATA_len;
-+#endif
-+
-+#include "wayland-util.h"
- 
- enum side {
- 	CLIENT,
--- 
-2.6.4
-

diff --git a/dev-libs/wayland/files/1.10.0-scanner-avoid-executable-stack.patch b/dev-libs/wayland/files/1.10.0-scanner-avoid-executable-stack.patch
deleted file mode 100644
index ff4899a..00000000
--- a/dev-libs/wayland/files/1.10.0-scanner-avoid-executable-stack.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f8f3e54aa7bc15871ca4296cbc16ae065b07de4e Mon Sep 17 00:00:00 2001
-From: Pekka Paalanen <pekka.paalanen@××××××××××××.uk>
-Date: Wed, 2 Mar 2016 11:00:35 +0200
-Subject: [PATCH] scanner: avoid executable stack
-
-Before this patch:
-$ scanelf -lpqe ./wayland-scanner
-RWX --- ---  ./wayland-scanner
-
-That indicates the stack is executable, which is a bad thing for
-security. Wayland-scanner does not actually need an executable stack, it
-is just an oversight from using an .S file in the sources.
-
-Add a special incantation in dtddata.S to make it not cause the stack to
-become executable.
-
-Reported-by: Mart Raudsepp <leio@g.o>
-Signed-off-by: Pekka Paalanen <pekka.paalanen@××××××××××××.uk>
-Tested-by: Mart Raudsepp <leio@g.o>
----
- src/dtddata.S | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/dtddata.S b/src/dtddata.S
-index 68e3435..ce51133 100644
---- a/src/dtddata.S
-+++ b/src/dtddata.S
-@@ -20,6 +20,14 @@
-  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+/*
-+ * Avoid executable stack.
-+ * from: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
-+ */
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
- /* from: http://www.linuxjournal.com/content/embedding-file-executable-aka-hello-world-version-5967#comment-348129 */
- 
- .macro binfile name file
--- 
-2.6.4
-

diff --git a/dev-libs/wayland/wayland-1.10.0-r1.ebuild b/dev-libs/wayland/wayland-1.10.0-r1.ebuild
deleted file mode 100644
index fc3f536..00000000
--- a/dev-libs/wayland/wayland-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	AUTOTOOLS_AUTORECONF=1
-fi
-
-inherit autotools-multilib toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS=""
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~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"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-build-fix-configure-disable-dtd-validation.patch"
-	"${FILESDIR}/${PV}-scanner-avoid-executable-stack.patch"
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_native_use_enable doc documentation)
-		$(multilib_native_enable dtd-validation)
-	)
-	if tc-is-cross-compiler ; then
-		myeconfargs+=( --with-host-scanner )
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	autotools-multilib_src_test
-}

diff --git a/dev-libs/wayland/wayland-1.6.1.ebuild b/dev-libs/wayland/wayland-1.6.1.ebuild
deleted file mode 100644
index c3a34d6..00000000
--- a/dev-libs/wayland/wayland-1.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	AUTOTOOLS_AUTORECONF=1
-fi
-
-inherit autotools-multilib toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable doc documentation)
-	)
-	if tc-is-cross-compiler ; then
-		myeconfargs+=( --disable-scanner )
-	fi
-	if ! multilib_is_native_abi; then
-		myeconfargs+=( --disable-documentation )
-	fi
-
-	autotools-multilib_src_configure
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	autotools-multilib_src_test
-}

diff --git a/dev-libs/wayland/wayland-1.8.1.ebuild b/dev-libs/wayland/wayland-1.8.1.ebuild
deleted file mode 100644
index a2d62f2..00000000
--- a/dev-libs/wayland/wayland-1.8.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	AUTOTOOLS_AUTORECONF=1
-fi
-
-inherit autotools-multilib toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]"
-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_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable doc documentation)
-	)
-	if tc-is-cross-compiler ; then
-		myeconfargs+=( --disable-scanner )
-	fi
-	if ! multilib_is_native_abi; then
-		myeconfargs+=( --disable-documentation )
-	fi
-
-	autotools-multilib_src_configure
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	autotools-multilib_src_test
-}