gentoo resync : 20.03.2021

7 files changed, 5 insertions, 236 deletions

diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index 290738fc6712..fe82248cc53f 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -1,12 +1,5 @@
 AUX xautolock-2.2_p5_p1-waitpid.patch 777 BLAKE2B 82031ddb959208db99472a72db6c1e8079a0f22ac91084742ed93df51b27e42fcabce36009f811f5d456e6ff803a08c75651ef7fbb9eab4248d79d3e09f8cb27 SHA512 4ac7fee35265c996a6bc82e3895d69e702b33e164f904da3dd022ce0f591b721c8e74493a53633695f66e332464a63007548fd24181b00b7dcd4228475355411
 DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
-DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
-DIST xautolock_2.2-5.2.debian.tar.xz 6216 BLAKE2B bda8c7a084e8975d268d626cc5aa02c87c7e6b0ae92351375f298cde4fabd8e48a0578c7c4bf32a280e2ecf13d82b7dcd73a874863616c0f9812ea98ffbe27e8 SHA512 807c9c7da51b16ed3a6600732f8d3b606d2f6c628238df0e6d975ea176ddce3d0e321779b19662f693ed1811b288ddae1b45228c0939e0728c122c1a2e556391
-DIST xautolock_2.2-6.debian.tar.xz 6376 BLAKE2B a7ef40b0fedd21146e359b85b7245695d9395a54aac568800b80a89fb13a08616fe771997d8b9e155c49f8218447022fcb2b256802156ee5f66d923e394a53ba SHA512 c5d350ae2e123e63564e9145de3a7a180b47cca745262cc4f935ced83e0fe2450d68fcbd0c3de3f4566e6650b3d6183b4491f5a2d0caed838221d2bc0b9e1613
 DIST xautolock_2.2-7.debian.tar.xz 7976 BLAKE2B d56687d0eee58e513eae152f2d6d30496346935a05410759eb116eb9fb19c3073db10f1393ab26ae5a63436693b82557b01c0dc18be75af4ee04de8a783bc618 SHA512 5cc0cce408466a57fc99d701199b6a1b3545d9faae86e2474450263a07fbe9920dc89cc3ac14bd8a00274e7e80768be3e360e81ad7378bcdbe34ada23958745a
-EBUILD xautolock-2.2_p5_p1-r1.ebuild 1276 BLAKE2B 085548a8d13cb2f19faa216864409a49a4cd46205a9dc0455977432ae3f8ff6fa3c9fef222853acfce3a6ba410a0d2d8a91e0f5cd67c445c29e73c980fe508e2 SHA512 8b842594fc91dc669d78d65cb091ec91c45e9172c94686d9e2c072b81d3024a1859d2cb03fb555872360969de15b91897c4fd27059f68ffa5930c12059f1b527
-EBUILD xautolock-2.2_p5_p1.ebuild 1411 BLAKE2B 50ba51c716e15d20309d3be25f030f21310b0d85e61e921e59e377806ee7d08d4fe56fbeea40044304bff1fb753052ffe6f1c0768f9c1623e5d67fc5f983e54f SHA512 9c09ce4bce65235afa3f44fa01eee830639131d6741b8d258f34844ae29c2d5e5be167377c92e419e0f0ecd5efcbfa2238f9d1fe4512d4253e624880235cf930
-EBUILD xautolock-2.2_p5_p2.ebuild 1038 BLAKE2B b58e78b0a320e36511e2b10fc8d86ab8f8018ebcfeb922646f99ae708ae67022cc9d84a6004f8385630899ed78034cf99a72901edcb9ad668ddb5efb35c7c76a SHA512 fcefc00b8d5f38a52af61ed3efc067409ac8f63fdf6f2fe21ddad43f907449d5bd6ab010cc1df542cd28b269d0b9a7005e6f21819f159bcd509c97ea33871de3
-EBUILD xautolock-2.2_p6.ebuild 1103 BLAKE2B 3c426d434e0c799d0b20414270343d08a0065129d7de9dd0f921a378fe2ade5b9e8f6f946949782aa327fb7a2681e67e9c0161abb6d339ad8a2e0409680b2147 SHA512 d5f7a06d84452ef25341f07733c9073cb4704ae5eec0019b9ec185be763137aba18dac8a1dd0fbece5b24a090b25dc75997e689ed76e6d031fee579db5deccff
-EBUILD xautolock-2.2_p7.ebuild 1103 BLAKE2B 3c426d434e0c799d0b20414270343d08a0065129d7de9dd0f921a378fe2ade5b9e8f6f946949782aa327fb7a2681e67e9c0161abb6d339ad8a2e0409680b2147 SHA512 d5f7a06d84452ef25341f07733c9073cb4704ae5eec0019b9ec185be763137aba18dac8a1dd0fbece5b24a090b25dc75997e689ed76e6d031fee579db5deccff
-MISC metadata.xml 637 BLAKE2B d1b4ecdd6eda1ba1db1550aa7187e1cd90b6093fd257600b4b3506ffb560946ceefe52bedd4364c0506be586daeebbdb1467197047db7a72f23aee9f41680e64 SHA512 62dcaa38a5e6ed4b9f020379fedb6d59f87628ea036b74acb73f600b89d0eab640548c18b104306df3d56c055ce39adbadf49683eaa46ece7ca26c79539c32d9
+EBUILD xautolock-2.2_p7.ebuild 1099 BLAKE2B 25e14281688c39a269d0aefb477c8c9f4bf191a5d1e2bd97501d476eff0945425417816137accb811bec25729c5ee7693693cb4366a90d454e03fa0fe67022d4 SHA512 b2a3c87f44e1afc69da6c4042679532655ad04ad9c2d8d491d7ad7b6702b45bb85a81a05870f39d883b77ebd07ac3c8448663891fe4106149a56282e835a8b75
+MISC metadata.xml 637 BLAKE2B 629cea827f88702a5dec0d030eb17c48d745ff1441485d16cf2975ca4658ad34c3f227859729c8ad663009956eb50ce0ddc803dfc4e3c9aaecb1cf3881803c3b SHA512 e2d71409624d3682285e323b72f67eabddf8724a6bd4c2563e98f60297431b364745c34411aaa9a63abf3be9c1c15bff6f4780fd1ce1ffee380efbb2ef94e0b2
diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml
index b822c45366ac..509109f110cb 100644
--- a/x11-misc/xautolock/metadata.xml
+++ b/x11-misc/xautolock/metadata.xml
@@ -5,7 +5,7 @@
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 If no user activity is detected after a set timeout, xautolock runs a program
 for you. If you want that program (with optional arguments) to be a screen
 locker, then one of these packages might fit your purpose:
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
deleted file mode 100644
index d9595592a63a..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REV_MAJ="$(get_version_component_range 3)"
-DEB_REV_MIN="$(get_version_component_range 4)"
-DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
-SRC_URI="
-	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="
-	x11-libs/libXScrnSaver
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-PATCHES=(
-	"${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch
-	"${WORKDIR}"/debian/patches/11-fix-no-dpms.patch
-	"${WORKDIR}"/debian/patches/12-fix-manpage.patch
-	"${WORKDIR}"/debian/patches/13-fix-hppa-build.patch
-	"${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
-)
-S=${WORKDIR}/${P/_p*}
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xautolock
-	newman xautolock.man xautolock.1
-	dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
deleted file mode 100644
index 5cff11d974cd..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REV_MAJ="$(get_version_component_range 3)"
-DEB_REV_MIN="$(get_version_component_range 4)"
-DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
-SRC_URI="
-	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-RDEPEND="
-	|| (
-		x11-misc/alock
-		x11-misc/i3lock
-		x11-misc/slim
-		x11-misc/slock
-		x11-misc/xlockmore
-		x11-misc/xtrlock
-	)
-	x11-libs/libXScrnSaver
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-
-S=${WORKDIR}/${P/_p*}
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch
-	"${WORKDIR}"/debian/patches/11-fix-no-dpms.patch
-	"${WORKDIR}"/debian/patches/12-fix-manpage.patch
-	"${WORKDIR}"/debian/patches/13-fix-hppa-build.patch
-	"${WORKDIR}"/debian/patches/14-do-not-use-union-wait-type.patch
-)
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xautolock
-	newman xautolock.man xautolock.1
-	dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
deleted file mode 100644
index 6125ac05fb94..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REV_MAJ="$(ver_cut 4)"
-DEB_REV_MIN="$(ver_cut 6)"
-DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
-SRC_URI="
-	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-
-RDEPEND="
-	x11-libs/libXScrnSaver
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
-	eapply "${WORKDIR}"/debian/patches/*.patch
-	default
-}
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xautolock
-	newman xautolock.man xautolock.1
-	dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p6.ebuild b/x11-misc/xautolock/xautolock-2.2_p6.ebuild
deleted file mode 100644
index 1abba4868157..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REVISION="$(ver_cut 4)"
-SRC_URI="
-	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-
-RDEPEND="
-	x11-libs/libXScrnSaver
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
-)
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
-	mv "${WORKDIR}"/debian/patches/14-do-not-use-union-wait-type.patch{,.skip} || die
-	eapply "${WORKDIR}"/debian/patches/*.patch
-	default
-}
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xautolock
-	newman xautolock.man xautolock.1
-	dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
index 1abba4868157..bfd5bdfe3a6c 100644
--- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 "
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc sparc x86"
 
 RDEPEND="
 	x11-libs/libXScrnSaver