gentoo resync : 16.01.2021

4 files changed, 9 insertions, 61 deletions

diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index ff49adc2436a..f8adea9be57e 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,6 +1,4 @@
-DIST xwallpaper-0.7.2.tar.xz 86212 BLAKE2B 1958ad8eb3f80f2cccdd969230e32986e7d144bf820a4c820a93d0bfdbcaa5512f08eb4014a8b57edb40f1ed55ce54080835c2d2dd46205c399b2ea6adcf1df1 SHA512 2b7166b719edae0d21460682d6c8991739d1a753078920bccb253f905300c694cb6fb12695456be58707d895f8adacd6007023c8e1abd23a0e369e9e80e5106e
 DIST xwallpaper-0.7.3.tar.xz 86388 BLAKE2B 45942dbe7e3627fbbf99ac5ab94c88ecea919e48131f268f0be10a0fba15a4feddf207c0787ac47f75bc6a5cc94f2b78d599e97950609196930a73073ae21ec1 SHA512 7fa9cc9ca2445afdfcb647724a6dc8bb3b52b9a6c91d237f6b443cf1fe6624c67d16d611bf4e435c5f3dcdae6cbf73bbde257a4e194bc127dc13dca1f8067c19
-EBUILD xwallpaper-0.7.2.ebuild 972 BLAKE2B b4311d7453e1e242967db28ac436806dea2bc2fa75cf6964264635a4f4bfc3d5dc757639c767c5b1a68d3f4efe195946220f583cdd724069e81cef1fccc91381 SHA512 3b9d7c425c81ee841e0c17d463d4b1e52ff9bee238c65ca2d39ffa8ac4686d45d437425050cb4e4fd2115680ee16c0aa6935ce046b506b566cd3f73472c3ce7c
-EBUILD xwallpaper-0.7.3.ebuild 976 BLAKE2B c68ae52bc82362e6d77a0243e82241a137dbcad52591196f2d44d3e9a434459b67c956d8177ec8f60a4cf6e46936ab705c1250627b132c037a42b07471cd8a3c SHA512 3a818859908b0c37b68cfa9b4f4621fdac43ec6466b2dc0b8c9903fdb6661b5eff65ea6cd371c3528b05acb429a5706ec18319024965be4241774dc44062a0e2
-EBUILD xwallpaper-9999.ebuild 967 BLAKE2B 015785bb4227a1269a03488df74bf4258cf6e39d621be80bf8b0c11d22dd863f9c1f9034dbf08b41717cd4a5b445cd6bd3cc22e987ccb0b7e859ca5376748e5d SHA512 ce4fb8f6f20922422e2f7ff1a5537f3f03f9664db850461e411b3a5f4e89e60c4cfc7e848f12d6f574dd5b7f12f3849c78b6ae56c23989a10d8cf444c34f4b37
+EBUILD xwallpaper-0.7.3.ebuild 972 BLAKE2B 464e9e3c716845f13654c2c33d0f99500d8e380746f54258d469904006817d93549f0aeb6b4b1711ad3ecf47b6a8d66e0d97c89b5bdfdda21e57c5e5ea5f5428 SHA512 0eeda67a5eee6cb81fd7e5b886cfdddca0fae217ae60354975c34bf9041a833b097c3b270dd1f4384dac6656fd2bedd55801e61e587ed732ce9f0f64c162d1b0
+EBUILD xwallpaper-9999.ebuild 976 BLAKE2B 81ac722c9a42644ed32e12b0d0be2851f1ab8f28b1ac5743d31ed7eb86b6245e4c7962b3dd6e1550b72af02db23c31a39b56e40b8dfc8ad7a839ca47a780fa5e SHA512 affccbe00896db98ca8bf17a3116c95e6a944f1076c433c39166d04b23b265ae79cfc82c8a10f7dacd488846ad1fb3b82335cedf950d17e5ee0d5bbdb164224e
 MISC metadata.xml 805 BLAKE2B a7409f94475503fb529e9cf99e759294099f32b35107c35a35636d69bf2a0d6c7741eaa0ae52823132ce6abfb4a7a61e9a9913c1bb32967ee5c2b610d409c2be SHA512 57b629ed7f757e7e9bf59198ef9930f257a602f4b00954dd38f3c9ecdc527f4240d0885ce7b096b78cd1c1067625680d452988c434dfe5ca4c95a0451f3fc674
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild
deleted file mode 100644
index 2c89348e8c20..000000000000
--- a/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Wallpaper setting utility for X"
-HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
-else
-	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ppc64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="+jpeg +png seccomp xpm"
-
-RDEPEND="
-	x11-libs/pixman
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	xpm? ( x11-libs/libXpm )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with seccomp)
-		$(use_with xpm)
-		--with-randr
-	)
-	econf "${myconf[@]}"
-}
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild
index 548fe3496699..82ae178851d7 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.3.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
@@ -8,12 +8,12 @@ inherit autotools
 DESCRIPTION="Wallpaper setting utility for X"
 HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
 
-if [ ${PV} == "9999" ] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index 4b3d25796853..eabdc06bd22f 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.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
@@ -8,17 +8,17 @@ inherit autotools
 DESCRIPTION="Wallpaper setting utility for X"
 HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
 
-if [ ${PV} == "9999" ] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="jpeg png seccomp xpm"
+IUSE="+jpeg +png seccomp xpm"
 
 RDEPEND="
 	x11-libs/pixman