gentoo resync : 18.08.2019

3 files changed, 49 insertions, 16 deletions

diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 8a7d1aae5491..e874ee0ebc58 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-protocols-1.17.tar.xz 107680 BLAKE2B cde978ceeaa9d71ac76cd007c511011fed6a110e772a6a9e880a5fd07a0318239a11235aac25b855d0f7ed5ae9980dd2103886092e85a92ed606c8a2f53de726 SHA512 5f3aacbba58717092036659d9b665dc10ff05ee51df61b1de38b22f0417285a74fd8a6d15ca049ad60d204f28203aa13d773c52140c7c02db2c498a6964c2643
+DIST wayland-protocols-1.18.tar.xz 108344 BLAKE2B 7e770bafa364ff96441354246801d1c6cbe561eefe864673610dc2d47e3aa5ac7cd22a2fc2925aa1060a261ed6df8b6b5ef81c33adbeb374170821feeecd651f SHA512 166be44f370a99281da442e7e2c2fc2f3169b61eeaa69263611b4e33847e93d1071f3cc89537597e1252d48d03993ce39c7d65f43b66a23c9b1551f47959e483
 EBUILD wayland-protocols-1.17.ebuild 871 BLAKE2B 5545ecff86f62dad1e8fe4f3f823ac4137904b1a79e39dea836d3424bc68344065e3be4d1021a90f58f7814abfceb0f2a8e7a1b18076d3af653c8e1eb6990d10 SHA512 dc7a9bfb0e4f181a1951c1f43a04b7794e3cdd437b219bcfe4c5e7c64a253ef72271e9f46ed51e4f0d95d10cae60b2ba107bafeeda38b4b8919cf9ff599f063b
-EBUILD wayland-protocols-9999.ebuild 882 BLAKE2B fb9318354b7cebad42f935ebf85d5c09827c612e7cc9bebc85dd6ca4c2e2f3b2cf489825b7a001f0e9f03072ab022942a1d06a2ca8f4c0cdd57b14aee4a73192 SHA512 0bb80c936c9aa9cc77bc8dc91c982a91d385b7c923607729924d10aed1a17a6a3321b4ba1f2e4d961ba0422525bd9a63b6b9dc9bbdd25cf0ee407c16ebc2dc83
+EBUILD wayland-protocols-1.18.ebuild 801 BLAKE2B 47c2feac8595a08e0cb05efc517caec202f5181cc62c3271c691ea8b018e9e62a109b5fbe34e4c3c880821f3322de41a715cdc347c5edc912f1b364b4c868da9 SHA512 4a9f7fa800c47e7db184d2b9fad45704ac8c522fcc7b409a0679d0f470680e4ebb5d175db889bc3cc1579588c966fb9c9b73dcdc33bc4f83bff586c82d1fd684
+EBUILD wayland-protocols-9999.ebuild 801 BLAKE2B 47c2feac8595a08e0cb05efc517caec202f5181cc62c3271c691ea8b018e9e62a109b5fbe34e4c3c880821f3322de41a715cdc347c5edc912f1b364b4c868da9 SHA512 4a9f7fa800c47e7db184d2b9fad45704ac8c522fcc7b409a0679d0f470680e4ebb5d175db889bc3cc1579588c966fb9c9b73dcdc33bc4f83bff586c82d1fd684
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
new file mode 100644
index 000000000000..837f825ff1b8
--- /dev/null
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wayland protocol files"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
+	inherit git-r3 autotools
+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=""
+
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	default
+}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild b/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
index 0b33125e7a05..837f825ff1b8 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
@@ -1,21 +1,15 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-	EXPERIMENTAL="true"
-
-	inherit git-r3 autotools
-else
-	inherit autotools
-fi
+EAPI=7
 
 DESCRIPTION="Wayland protocol files"
 HOMEPAGE="https://wayland.freedesktop.org/"
 
-if [[ $PV != 9999* ]]; then
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
+	inherit git-r3 autotools
+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
@@ -24,9 +18,9 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default