gentoo resync : 25.11.2020

4 files changed, 63 insertions, 8 deletions

diff --git a/gui-apps/lavalauncher/Manifest b/gui-apps/lavalauncher/Manifest
index e94a19fb18d6..84f8127035e8 100644
--- a/gui-apps/lavalauncher/Manifest
+++ b/gui-apps/lavalauncher/Manifest
@@ -1,6 +1,8 @@
 AUX lavalauncher-1.7.1-optional-man.patch 700 BLAKE2B f997ae6bac139094abc7e82d5f4b1a8a52c720051584c7f4ee37f85ecbf96746debc5ebd197f35779aafe7e6f3cbc1c34e192c0a40ad3edd5f9ddf0afc38e2f4 SHA512 6396c32a3e61592715d36bb6f43c21fe0de22cf8c51c90e832f099e22d319ad805aa190fb6287e7a314cf24f82c9692fd05be93fe0f068a89fea4a67efbe9c5f
 AUX lavalauncher-remove-werror.patch 224 BLAKE2B 01974a4bc2f3663b8b4ebb56ad1da9c4017e5a1a9ee37d73cc6333ca3ec06a898ea2f095ec0d48dd470e140c24345f985fb7e48ced42619c6516379f50d4738e SHA512 0e26935aa86756ee6bcaa1cbdce100cfc3aebee7307b6c56e802be3a3f5e39d96d4093b83e39fc2dcbe8a0f96f412064712165f7840d1abf633632a9b5c7eba1
 DIST lavalauncher-1.7.1.tar.gz 82550 BLAKE2B 043fd8a8fb977f89414b4c9eb5a29ae05cea6374ea7bdbf595a3c75eeee4c5273b2d84cd437a451b0a4fec4139e31dec6c520e4a0af745c06b438b1290c114b4 SHA512 e1848d29275a444aef2b85bd6b27ae056cfc76c337695da2f7061ca3d73f510b797f84663a5705d59615a2a4ea0be64388ce1d4d622379f86cfc23d82f2e51d8
-EBUILD lavalauncher-1.7.1.ebuild 923 BLAKE2B 079ff03966db15dfdf9989320a02ba49da476d7d5dd94f462b6682affdd5b0f34fe43902ac685c401618b34e7a59e63df11577946bd6a902acb3d56f8f92edd1 SHA512 f9a2e1b3bee8126ed42133d1c69be84593e8881b18adbbefd2379358eab12a8818395c72a4b852c4facb7b33bb56aa1d6117bd413e5e3ff8f02d7d3304b3938f
-EBUILD lavalauncher-9999.ebuild 932 BLAKE2B f5ba2917f3e1437212f392e8819c0a8cf9616d7ed89254908a16483b48782e382dff40db9b88ed21f7304e448e9c10e9829929690374d9f92d87c6ce27cc9864 SHA512 b2c38845de0d1021eac94f6f9bc6ad75a52aee093627de9b498a48fd990e13a793f732712675719873aa657a85b6b6aa54e254c48324449b05b7e19da1ac9c32
+DIST lavalauncher-2.0.0.tar.gz 92083 BLAKE2B 723685eba36b89c2807619598af4eeec3c5783cf792d3ae68d30df6e4fab08a389c6c0d37e6f83df2d3e18217a08994d0fd38193034e037a094ede4190561c44 SHA512 e64e7cc394a5165a5b43c6c0db3f99b43d44b0b71cb75aa60d8a431ca7a39e1af50b822dc0d6ff86620029021852442a45fce302214e927929dbee627ec51c18
+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
 MISC metadata.xml 675 BLAKE2B 459e6a0696853acb9083e36923fa63110467836467cb2e06cbed8573a02878f7c2636d25d4d7ae9ac237a585d2ef7c44296f39c45e1f15c82f5ee58fb2fe87af SHA512 148df1b9e3298b0183a193ebc43f8447afb722c00ca45bbf0856dc8efd484547e2e7e4562b8cb448cd01e23e53cd7a05d0c0ecbd5c9eebccc1b2aabb51ae9032
diff --git a/gui-apps/lavalauncher/lavalauncher-1.7.1.ebuild b/gui-apps/lavalauncher/lavalauncher-1.7.1.ebuild
index 09c59864508c..ddd1466fc8f5 100644
--- a/gui-apps/lavalauncher/lavalauncher-1.7.1.ebuild
+++ b/gui-apps/lavalauncher/lavalauncher-1.7.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-DESCRIPTION="simple launcher for wayland"
+DESCRIPTION="Simple launcher for wayland"
 HOMEPAGE="https://git.sr.ht/~leon_plickat/lavalauncher"
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/gui-apps/lavalauncher/lavalauncher-2.0.0.ebuild b/gui-apps/lavalauncher/lavalauncher-2.0.0.ebuild
new file mode 100644
index 000000000000..e1c0172de5eb
--- /dev/null
+++ b/gui-apps/lavalauncher/lavalauncher-2.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019-2020 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
+	gnome-base/librsvg
+	x11-libs/cairo
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
+
+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"
+)
+
+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 22da8a44a0ec..e1c0172de5eb 100644
--- a/gui-apps/lavalauncher/lavalauncher-9999.ebuild
+++ b/gui-apps/lavalauncher/lavalauncher-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-DESCRIPTION="simple launcher for wayland"
+DESCRIPTION="Simple launcher for wayland"
 HOMEPAGE="https://git.sr.ht/~leon_plickat/lavalauncher"
 
 if [[ ${PV} == 9999 ]]; then
@@ -19,16 +19,17 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="man"
+IUSE="+svg man"
 
 RDEPEND="
 	dev-libs/wayland
+	gnome-base/librsvg
 	x11-libs/cairo
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
 	dev-libs/wayland-protocols
+	virtual/pkgconfig
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -43,7 +44,8 @@ PATCHES=(
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature man man-page)
+		$(meson_feature man man-pages)
+		$(meson_feature svg librsvg)
 	)
 	meson_src_configure
 }