gentoo resync : 30.05.2020

7 files changed, 72 insertions, 20 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index e377c0735c20..8286b4ef1fc4 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xisxwayland/Manifest b/x11-apps/xisxwayland/Manifest
new file mode 100644
index 000000000000..362a0ff0ec61
--- /dev/null
+++ b/x11-apps/xisxwayland/Manifest
@@ -0,0 +1,4 @@
+DIST xisxwayland-1.tar.xz 4168 BLAKE2B a8e4a658427f5b03e3d05b25772c4f136c13be47a68619a6beab3db72a70e836e495fcbc8a19d5f9347f3336a1dc9b353f483fb75e47ebfdbb9b8409e63444f0 SHA512 9514442313cff4df0c71fed445ba0e3fe52f3c84ebbec81725a590f68cc42ea01ac96b23736a0108fe206da3aee48434c5c30d1c58905bfc75db35205c288bca
+EBUILD xisxwayland-1.ebuild 658 BLAKE2B efc940d5ec87691440cb8996569402b4384c3a549b410e099a11fa73ed288c5853afdd2cdb2363f15d28c093cd73847787930ecb1fe268ef35893c36e6c5cc69 SHA512 e859e3c45b9cd3260a12fccbf569cac1e0a7d9287fa474d4a5c20eaaccd0dfa3c2d7a5845055ef527d9b9d5cdb77ff1024b6957fd967e6f7ff1c78995d793170
+EBUILD xisxwayland-9999.ebuild 658 BLAKE2B efc940d5ec87691440cb8996569402b4384c3a549b410e099a11fa73ed288c5853afdd2cdb2363f15d28c093cd73847787930ecb1fe268ef35893c36e6c5cc69 SHA512 e859e3c45b9cd3260a12fccbf569cac1e0a7d9287fa474d4a5c20eaaccd0dfa3c2d7a5845055ef527d9b9d5cdb77ff1024b6957fd967e6f7ff1c78995d793170
+MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xisxwayland/metadata.xml b/x11-apps/xisxwayland/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xisxwayland/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xisxwayland/xisxwayland-1.ebuild b/x11-apps/xisxwayland/xisxwayland-1.ebuild
new file mode 100644
index 000000000000..9ecc6cb03fe4
--- /dev/null
+++ b/x11-apps/xisxwayland/xisxwayland-1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/app/${PN}.git"
+fi
+
+inherit ${GIT_ECLASS} meson
+
+DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/app/xisxwayland"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/app/${P}.tar.xz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xisxwayland/xisxwayland-9999.ebuild b/x11-apps/xisxwayland/xisxwayland-9999.ebuild
new file mode 100644
index 000000000000..9ecc6cb03fe4
--- /dev/null
+++ b/x11-apps/xisxwayland/xisxwayland-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/app/${PN}.git"
+fi
+
+inherit ${GIT_ECLASS} meson
+
+DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/app/xisxwayland"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/app/${P}.tar.xz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index 21b14ad1366c..bd34c1983349 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,5 +1,3 @@
-DIST xload-1.1.2.tar.bz2 136745 BLAKE2B 080c3885ce5ccabd2162cdbb855113a7718978b3d935493851315e682cbc9f6ba7652412130d414698b363aa1b3c74b21144293ab2475e45816ca15387fee925 SHA512 9c83d26bbb135cc0f2b3ef7f25b081cda5d080dd02b1c89195b40825a7d71211965b34336c853eb455472d9748f3edf64108455584b34b81673e2548806f423d
 DIST xload-1.1.3.tar.bz2 140327 BLAKE2B e3e4e817b65a405b2e4733fbf736d2f2a9803436bd752d8fc14204f2c6e342dcf60c9fe69d749283ed53345020fbf7c250c91453d4b6634c41795e91e072cd46 SHA512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
-EBUILD xload-1.1.2.ebuild 373 BLAKE2B d0d8f802b87812212163fd4db7ccb224ddd4b0178cfa53435c682146389e74c75324f9925ecb0907197a398d85875bec2fb596cc43117a16aa6953759558c42c SHA512 3f7bd858295c56e95d2d1c107bee7091d34567a103cdcf0d561bdcc5cee4ac3c9eb8bf717895ae5c368b9e6ab601046d37c8f00cb4a44bbcd4b802f86957c8c9
 EBUILD xload-1.1.3.ebuild 373 BLAKE2B d0d8f802b87812212163fd4db7ccb224ddd4b0178cfa53435c682146389e74c75324f9925ecb0907197a398d85875bec2fb596cc43117a16aa6953759558c42c SHA512 3f7bd858295c56e95d2d1c107bee7091d34567a103cdcf0d561bdcc5cee4ac3c9eb8bf717895ae5c368b9e6ab601046d37c8f00cb4a44bbcd4b802f86957c8c9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xload/xload-1.1.2.ebuild b/x11-apps/xload/xload-1.1.2.ebuild
deleted file mode 100644
index d32e2eb2a0f2..000000000000
--- a/x11-apps/xload/xload-1.1.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="system load average display for X"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"