x11-base/xwayland : version bump

6 files changed, 48 insertions, 10 deletions

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-21.12.0-r10.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.12.0-r10.ebuild
new file mode 100644
index 00000000..2e4d7b72
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.12.0-r10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+HOMEPAGE="https://kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+bittorrent dropbox samba +webengine"
+
+RDEPEND="
+	>=kde-apps/kget-${PV}:${SLOT}
+	>=kde-apps/kopete-${PV}:${SLOT}
+	>=kde-apps/krdc-${PV}:${SLOT}
+	>=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
+	>=kde-misc/kdeconnect-${PV}:${SLOT}
+	>=kde-misc/kio-gdrive-${PV}:${SLOT}
+	>=net-irc/konversation-${PV}:${SLOT}
+	bittorrent? (
+		>=net-libs/libktorrent-${PV}:${SLOT}
+		>=net-p2p/ktorrent-${PV}:${SLOT}
+	)
+	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
+	samba? ( >=kde-apps/kdenetwork-filesharing-${PV}:${SLOT} )
+	webengine? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
+"
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-21.12.0-r10 b/metadata/md5-cache/kde-apps/kdenetwork-meta-21.12.0-r10
new file mode 100644
index 00000000..df8e8250
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-21.12.0-r10
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=8
+HOMEPAGE=https://kde.org/
+IUSE=+bittorrent dropbox samba +webengine
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kget-21.12.0:5 >=kde-apps/kopete-21.12.0:5 >=kde-apps/krdc-21.12.0:5 >=kde-apps/zeroconf-ioslave-21.12.0:5 >=kde-misc/kdeconnect-21.12.0:5 >=kde-misc/kio-gdrive-21.12.0:5 >=net-irc/konversation-21.12.0:5 bittorrent? ( >=net-libs/libktorrent-21.12.0:5 >=net-p2p/ktorrent-21.12.0:5 ) dropbox? ( >=kde-apps/dolphin-plugins-dropbox-21.12.0:5 ) samba? ( >=kde-apps/kdenetwork-filesharing-21.12.0:5 ) webengine? ( >=kde-apps/plasma-telepathy-meta-21.12.0:5 )
+SLOT=5
+_md5_=1be392adb3d18352eb682ab4538c3d2a
diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.3-r100 b/metadata/md5-cache/x11-base/xwayland-21.1.4-r100
index 73a87566..34ce7986 100644
--- a/metadata/md5-cache/x11-base/xwayland-21.1.3-r100
+++ b/metadata/md5-cache/x11-base/xwayland-21.1.4-r100
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland amd64? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
+DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland amd64? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
 DESCRIPTION=Standalone X server running under Wayland
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/xserver.html
 INHERIT=meson
-IUSE=rpc unwind xcsecurity selinux
+IUSE=unwind xcsecurity selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland amd64? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
+RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland amd64? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
 SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-21.1.3.tar.xz
+SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-21.1.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=07d480fd85b59c25d0f6cb9284594914
+_md5_=aeb8fa078315e7166dba259847076b86
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index ec795004..f96e4491 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -23,6 +23,7 @@ dev-python/sh 1.12.14-r4: Python process launching
 dev-python/typer 0.2.1-r2: Build great CLIs. Easy to code. Based on Python type hints
 dev-python/wget 2.2-r2: Python library for downloading from http URLs
 gui-libs/display-manager-init 1.0-r100: RC init files for starting display and login managers
+kde-apps/kdenetwork-meta 21.12.0-r10: kdenetwork - merge this to pull in all kdenetwork-derived packages
 kde-plasma/kinfocenter 5.23.4-r10: Utility providing information about the computer hardware
 mail-client/mailspring 1.9.2-r1: A beautiful fast and maintained fork of Nylas Mail
 media-libs/libpipewire 0.3.32-r1: Pipewire client libraries
@@ -85,7 +86,7 @@ virtual/tmpfiles 0-r100: Virtual to select between different tmpfiles.d handlers
 virtual/udev 1000: Virtual to select between different udev daemon providers
 x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package)
 x11-base/xorg-server 21.1.1-r100: X.Org X servers
-x11-base/xwayland 21.1.3-r100: Standalone X server running under Wayland
+x11-base/xwayland 21.1.4-r100: Standalone X server running under Wayland
 x11-drivers/nvidia-drivers 470.94: NVIDIA Accelerated Graphics Driver
 x11-drivers/nvidia-drivers-legacy 390.147: NVIDIA Accelerated Graphics Driver
 x11-drivers/xf86-video-qxl 0.1.5_p20200205-r10: QEMU QXL paravirt video driver
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index ab838ea1..41832ac4 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1 +1 @@
-DIST xwayland-21.1.3.tar.xz 1261776 BLAKE2B bccecc3386ceb7e612929139b5b73e038df684bc43d9554c1196c4c3e66f200b346ea8615ec9224ae999400f34881d5f29365f06d4487bf4dda381c03b83e05b SHA512 24147ef788cce3fa16cd5604d293ffbe7ef4c6dc5fc2b1a1018d78ca4c0f10ade7b99c1ad6a8cdca5c581ff40f5834d7e34b2a314acca665a527eed700993594
+DIST xwayland-21.1.4.tar.xz 1261712 BLAKE2B 698886d450f340c4a275f583d27382a5ee22c09255d907bbe2babc6794da1827bd5bf3e575b9da77ff3b3c5c4cd3e30cc10b89d14e0f6365d2a71f8ade61e410 SHA512 54e18565b4c2514534501ddcc76058d6911cf0c2185cddf5c54833d317f51ba8eb8934bd9be269518ece05f3bc8cda81600b25871c61437c923eba916eccc525
diff --git a/x11-base/xwayland/xwayland-21.1.3-r100.ebuild b/x11-base/xwayland/xwayland-21.1.4-r100.ebuild
index becd8c8d..4064d322 100644
--- a/x11-base/xwayland/xwayland-21.1.3-r100.ebuild
+++ b/x11-base/xwayland/xwayland-21.1.4-r100.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Standalone X server running under Wayland"
 HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
 SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
 
-IUSE="rpc unwind xcsecurity selinux"
+IUSE="unwind xcsecurity selinux"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,7 +27,6 @@ DEPEND="
 	>=media-libs/libepoxy-1.5.4[X,egl(+)]
 	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
 	>=x11-libs/libxshmfence-1.1
-	rpc? ( net-libs/libtirpc )
 	>=x11-libs/libXau-1.0.4
 	media-libs/libglvnd[X]
 	unwind? ( sys-libs/libunwind )
@@ -56,7 +55,6 @@ PATCHES=(
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use rpc secure-rpc)
 		$(meson_use selinux xselinux)
 		$(meson_use unwind libunwind)
 		$(meson_use xcsecurity)