gentoo resync : 04.05.2021

4 files changed, 54 insertions, 9 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index b0c07999671b..36188c3389c4 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/lavalauncher/Manifest b/gui-apps/lavalauncher/Manifest
index c26d2c2e2833..43e27e6cf20f 100644
--- a/gui-apps/lavalauncher/Manifest
+++ b/gui-apps/lavalauncher/Manifest
@@ -2,7 +2,9 @@ AUX lavalauncher-1.7.1-optional-man.patch 700 BLAKE2B f997ae6bac139094abc7e82d5f
 AUX lavalauncher-remove-werror.patch 224 BLAKE2B 01974a4bc2f3663b8b4ebb56ad1da9c4017e5a1a9ee37d73cc6333ca3ec06a898ea2f095ec0d48dd470e140c24345f985fb7e48ced42619c6516379f50d4738e SHA512 0e26935aa86756ee6bcaa1cbdce100cfc3aebee7307b6c56e802be3a3f5e39d96d4093b83e39fc2dcbe8a0f96f412064712165f7840d1abf633632a9b5c7eba1
 DIST lavalauncher-1.7.1.tar.gz 82550 BLAKE2B 043fd8a8fb977f89414b4c9eb5a29ae05cea6374ea7bdbf595a3c75eeee4c5273b2d84cd437a451b0a4fec4139e31dec6c520e4a0af745c06b438b1290c114b4 SHA512 e1848d29275a444aef2b85bd6b27ae056cfc76c337695da2f7061ca3d73f510b797f84663a5705d59615a2a4ea0be64388ce1d4d622379f86cfc23d82f2e51d8
 DIST lavalauncher-2.0.0.tar.gz 92083 BLAKE2B 723685eba36b89c2807619598af4eeec3c5783cf792d3ae68d30df6e4fab08a389c6c0d37e6f83df2d3e18217a08994d0fd38193034e037a094ede4190561c44 SHA512 e64e7cc394a5165a5b43c6c0db3f99b43d44b0b71cb75aa60d8a431ca7a39e1af50b822dc0d6ff86620029021852442a45fce302214e927929dbee627ec51c18
+DIST lavalauncher-2.1.0.tar.gz 101315 BLAKE2B 53dd855bbf2b24228adcda5bbc19b976a20ebb93eeefa953e92e18f010d8be4b29c1c2b053312be2578277645e84530535b820f3b487167886fecf5d137e281e SHA512 44d4ad9dc5a18af9926b93954b675114d95815a847e0f82ae940179138e7fe86243452c7d4287ff8a10e13bde8dded7ab6b551807d924f7b8f855c0c696984e9
 EBUILD lavalauncher-1.7.1.ebuild 923 BLAKE2B 9fe4c1e2333b9c059842924a185be6b80bfade76867fbf45c1208638ecf532dcb379bef7b98846c0f17155a2bc2b0d8ba33a6f04722689c3fb1a8618e1cd6f67 SHA512 8a0f9232e2f7fdbc3214e823df68c52f47802857c030d4b78f543ff5b1aa07f3d7496e0f68a21a084d721ffde77f0ae8893d682957832d30c5cdb545420ead34
 EBUILD lavalauncher-2.0.0.ebuild 997 BLAKE2B 1d68ed7713edb86e7ce05c06e0dd50f88eb32a0159e339a82f81249adb7771a94e0699508d1bc18e108f24ef6e2ac17d3e2783f3a9d58fb83a2c24b3fc8e1907 SHA512 eeb6b28465e28af4716f9370c142e4aec0c189aafefa1356109d26ef6b245a99d27ea0d80cf1a01eb72c895130fd635af23ace693970cc551f895d6c0633f270
-EBUILD lavalauncher-9999.ebuild 997 BLAKE2B 1d68ed7713edb86e7ce05c06e0dd50f88eb32a0159e339a82f81249adb7771a94e0699508d1bc18e108f24ef6e2ac17d3e2783f3a9d58fb83a2c24b3fc8e1907 SHA512 eeb6b28465e28af4716f9370c142e4aec0c189aafefa1356109d26ef6b245a99d27ea0d80cf1a01eb72c895130fd635af23ace693970cc551f895d6c0633f270
+EBUILD lavalauncher-2.1.0.ebuild 938 BLAKE2B bb0d5a4e12dc9338658ced13d43c69efdbcabdf6c8e34ddb161ab4fb50ac1cc898bcd9ef85993dad318ab792d457de3f03e83b1f26380b38448d2d768faf803d SHA512 1b8cffd6d0fecc24790820ec9e13e976527c1a3ffc985367af7dc90e99c473123a72115886af0c796b95074360cd22031889749d123dbd06499b3973d819d890
+EBUILD lavalauncher-9999.ebuild 938 BLAKE2B bb0d5a4e12dc9338658ced13d43c69efdbcabdf6c8e34ddb161ab4fb50ac1cc898bcd9ef85993dad318ab792d457de3f03e83b1f26380b38448d2d768faf803d SHA512 1b8cffd6d0fecc24790820ec9e13e976527c1a3ffc985367af7dc90e99c473123a72115886af0c796b95074360cd22031889749d123dbd06499b3973d819d890
 MISC metadata.xml 636 BLAKE2B 387e0d49924f5153739602f0d9010f58dc61ba2f7e2ae6d78a5b6bd59ffd9acbddb971b4c32978815bca3c243f601586ff12a9a49b430b21e90a19ae6081ae14 SHA512 968ad5e6b2a07ca063980b86468a23d3a0c656d3fe5d1a2b894057d9cd08e6a950a4c23b6958565baa11f6fba0296bf8d9a027a3be9c01ebde1aaffbabe45b75
diff --git a/gui-apps/lavalauncher/lavalauncher-2.1.0.ebuild b/gui-apps/lavalauncher/lavalauncher-2.1.0.ebuild
new file mode 100644
index 000000000000..050c2dce3451
--- /dev/null
+++ b/gui-apps/lavalauncher/lavalauncher-2.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Simple launcher for wayland"
+HOMEPAGE="https://git.sr.ht/~leon_plickat/lavalauncher"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~leon_plickat/lavalauncher"
+else
+	SRC_URI="https://git.sr.ht/~leon_plickat/lavalauncher/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+svg man"
+
+RDEPEND="
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	svg? ( gnome-base/librsvg )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+	man? ( >=app-text/scdoc-1.9.3 )
+"
+
+PATCHES=(
+	"${FILESDIR}/lavalauncher-remove-werror.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature man man-pages)
+		$(meson_feature svg librsvg)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/lavalauncher/lavalauncher-9999.ebuild b/gui-apps/lavalauncher/lavalauncher-9999.ebuild
index e1c0172de5eb..050c2dce3451 100644
--- a/gui-apps/lavalauncher/lavalauncher-9999.ebuild
+++ b/gui-apps/lavalauncher/lavalauncher-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,21 +23,17 @@ IUSE="+svg man"
 
 RDEPEND="
 	dev-libs/wayland
-	gnome-base/librsvg
 	x11-libs/cairo
+	x11-libs/libxkbcommon
+	svg? ( gnome-base/librsvg )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
+	man? ( >=app-text/scdoc-1.9.3 )
 "
 
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
-
 PATCHES=(
 	"${FILESDIR}/lavalauncher-remove-werror.patch"
 )