gentoo resync : 29.12.2022

5 files changed, 64 insertions, 13 deletions

diff --git a/gui-apps/swaybg/Manifest b/gui-apps/swaybg/Manifest
index b9ee56df3d5f..37f22df78aaa 100644
--- a/gui-apps/swaybg/Manifest
+++ b/gui-apps/swaybg/Manifest
@@ -1,4 +1,6 @@
 DIST swaybg-1.0.tar.gz 15851 BLAKE2B 820edbce4161f2d109bc8e842fb2bef101a5793d1da90f4258e5771fe85ab089e184c063a0a7073adbe218c59307946f86bd02c4d62b0585aeb3f9cd5c7963f8 SHA512 67d0e0109b906ece51800729182940374cc59fa07d0866b57cf876d12191fe12e796b84350a849dc85183fa58a3b2d196191e48dcc03dcc3708a980ed4a8cff0
-EBUILD swaybg-1.0.ebuild 817 BLAKE2B 50bab38da4f28d6beaf0208a5f35a98971885fdcb9c60199baee5930389c29b559bf3484982f0bc897749e8e7dc78d51a699074b219418db310d813da6778421 SHA512 751b1c83c41f155e93ebc979b17d12da630d3d70f04e13a290e163ed21ff64b0edbf5c8a1b7e36fdb886266dafb3f698b9db9a9ead61eff21a985d8b8af0b70b
-EBUILD swaybg-9999.ebuild 813 BLAKE2B 749ea546ac884d7684006708287a703527df983e0890478842a1775e4e57debe0fb1afb5187ac360fc17c3a0ca1e584a319f80cbab0b4f104c70dd703cc55a75 SHA512 9dc55b737dfb5ac36ec2630e9aaa38f5c0bdf560d5a81bfed0825b7f5401b22216bd2bdca07cb4133a3c86027b9fcb2f9292b9876c50aefca202ccc5cfc8e336
-MISC metadata.xml 889 BLAKE2B efd4a93dcff7b974c3f6c327d72c77cbfa832c408c8f31e4321f5af6ac935966fa23ea166285acb66561ac6c3e3156069af1b5b0320394773dd040676213158b SHA512 33aaacc763136a332d85109c04b34530d289a68ad8628510c6aade991c40ad75f630392e265bfb529c365b994558a133e6ae8e520eb7161b17d8a9a9649a0121
+DIST swaybg-1.1.1.tar.gz 16474 BLAKE2B 21e966e28b5228688aa452f6086feea58bcd56d7fccfe53babe086b9e26702429705870b7d5c7e4900db40e281eab6e1f4077c4cc58f0be745e2d5a9a7d7f46f SHA512 e5ac7af1690974206f916e1d99a8dde0e837acbc686e2de2c46d505201f239a059f998adc22192205d1ad75b5905222f16aed243b31920e19c0ff2229b8eda2c
+EBUILD swaybg-1.0.ebuild 805 BLAKE2B 87e41c4e862b926705a5369374e4388efb65fb95f8b8096dd6a3c0cf82a0a5e7b5828987bf238efa40eb7e4f7a2da12e85b2f86d77615443f8140933d9628271 SHA512 cba247158f0a9da72e923e72868474148c44629d7d346b889a0bc2f6b2b4026ee36ee0414a88f491c24e8313665888c3e60d4b51e4a198860c374987d8abba02
+EBUILD swaybg-1.1.1.ebuild 913 BLAKE2B 15956c0eba5aad1d38a429a60fd6d005c4de5539df9bcdf7478dd2ba9acd15fdb55c5949f5ae75b72b6eeaddc1828059ecc71bd071bafe8e2be0b3217b48adfa SHA512 979f02a5dc3db96f98c333f05503868ae011c813237ab0692d24c98abc8451dc33f257a0f957c8ec1607dac1eeeaf2f4ee2d8789bc9d3e13bcf2b12c3cf86418
+EBUILD swaybg-9999.ebuild 912 BLAKE2B 8be35f789efc5f963bd2c1bf2eede9f0faee7ac4d773d6a71121a561bea79f6c738eef427dbcf8f3c3746c331f1c969f55cfe01e916c003e023f619f7cea041f SHA512 56a6d5c5f41c608a0e757372ab31d3361ea4c6aedfd0b19fd1424a87625caddb640ca8ae5ec476d622adf6b0cd1df6d49aea9fe5634460c295abf84a9de00ab4
+MISC metadata.xml 972 BLAKE2B fe63b13611637facf43ae654a098c257a4688291ba6caa02230f837c62106b5becde83c9de3f14be57354ef8df5ebc8ee83753f309e2d593e46414bb2c61e928 SHA512 d15cd858024da5e39cd5efcc71c2b89f5cde3dc5e3068eab75728b9fa89fc78d16b344375636608659f308d3c2f0eec16bf3f3eba40a27f04bc5c864c7cae9d8
diff --git a/gui-apps/swaybg/metadata.xml b/gui-apps/swaybg/metadata.xml
index c00e68acd181..98797bd88f43 100644
--- a/gui-apps/swaybg/metadata.xml
+++ b/gui-apps/swaybg/metadata.xml
@@ -22,4 +22,7 @@
 		<bugs-to>https://github.com/swaywm/swaybg/issues</bugs-to>
 		<changelog>https://github.com/swaywm/swaybg/releases</changelog>
 	</upstream>
+	<use>
+		<flag name="gdk-pixbuf">Support image types other than PNG</flag>
+	</use>
 </pkgmetadata>
diff --git a/gui-apps/swaybg/swaybg-1.0.ebuild b/gui-apps/swaybg/swaybg-1.0.ebuild
index 37ec67bd1e63..102d9f6f0524 100644
--- a/gui-apps/swaybg/swaybg-1.0.ebuild
+++ b/gui-apps/swaybg/swaybg-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
@@ -38,7 +38,6 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		-Dman-pages=$(usex man enabled disabled)
-		"-Dwerror=false"
 	)
 
 	meson_src_configure
diff --git a/gui-apps/swaybg/swaybg-1.1.1.ebuild b/gui-apps/swaybg/swaybg-1.1.1.ebuild
new file mode 100644
index 000000000000..ce371ad99d1a
--- /dev/null
+++ b/gui-apps/swaybg/swaybg-1.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="A wallpaper utility for Wayland"
+HOMEPAGE="https://github.com/swaywm/swaybg"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gdk-pixbuf +man"
+
+DEPEND="
+	dev-libs/wayland
+	>=dev-libs/wayland-protocols-1.14
+	x11-libs/cairo
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
+"
+RDEPEND="
+	${DEPEND}
+	!<gui-wm/sway-1.1_alpha1
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+	)
+
+	meson_src_configure
+}
diff --git a/gui-apps/swaybg/swaybg-9999.ebuild b/gui-apps/swaybg/swaybg-9999.ebuild
index be7d136cfaa9..a665232edee6 100644
--- a/gui-apps/swaybg/swaybg-9999.ebuild
+++ b/gui-apps/swaybg/swaybg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,24 +13,25 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+man"
+IUSE="gdk-pixbuf +man"
 
 DEPEND="
 	dev-libs/wayland
+	>=dev-libs/wayland-protocols-1.14
+	x11-libs/cairo
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
 "
 RDEPEND="
 	${DEPEND}
 	!<gui-wm/sway-1.1_alpha1
 "
 BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	x11-libs/gdk-pixbuf
-	x11-libs/cairo
+	dev-util/wayland-scanner
 	virtual/pkgconfig
 	man? ( app-text/scdoc )
 "
@@ -38,7 +39,7 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		-Dman-pages=$(usex man enabled disabled)
-		"-Dwerror=false"
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
 	)
 
 	meson_src_configure