gentoo resync : 14.12.2020

7 files changed, 15 insertions, 138 deletions

diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 50a9afe59995..49ff2c798b25 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,10 +1,5 @@
-AUX i3lock-2.11-version.patch 395 BLAKE2B dee64a9c8b255e3cbadd27419929da66a8fe66c097dac64ada091d78d900595cd32645eac912eaa151b11fa565cbd4d613502e218cef8d118892bf7455fb0749 SHA512 26bffc363d833a6c7049bd6cc0b05d6d2e737dce184e0265d67949f04371c399f41cc54e7071a63d1bffec5d9166aa7c4a4d0bb8fc3fe6b67cb1366963dc08b0
-AUX i3lock-2.12-fno-common.patch 312 BLAKE2B d93783fe971d5a36212e8a4f50d1ccfee35000656f0411d7ccbab8bd723c3564bf5a40e2eebe5c0e662363909ee147a395c61d0d3c004a5606031240405e6134 SHA512 4fdbb7d3c2e18738c788e3cece95735f3a91af4c2f26b74417fd48e789a4342b3e60b0ad456c4882628ed7a240c5285097991aad161d87e8ddfe51f9fb0b0ff7
 DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
-DIST i3lock-2.11.1.tar.bz2 145434 BLAKE2B 9a2ff0be922162710f9dbbf597f93ad939684641d2264c6ed38dc8a7eeb77c253f61aa1a2e873f03de2c8cc6d661e79ff166e4302c423261a65f66582749c962 SHA512 8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c
-DIST i3lock-2.12.tar.bz2 147521 BLAKE2B 38ae5b4d6a92f918bc432e425301e8d04f9cc3bf8569e5f4e443dafed5aba19abf6604bfa102bc00ea5db87052583f1e9927a4f8e55906545b501829d95081e7 SHA512 84f1558368381bcad9a64f41ab6134a6614dea453d1ee5ecfe886185b9e1baebeeca446c4635158deb8dae5b25c09d47d3990239d76c44e5325ca5bfaad9b2ad
+DIST i3lock-2.13.tar.bz2 149332 BLAKE2B 4b285fb3a27463f0d538d291134942a19933394c4c2d0acf27dfe5624a854cef0f29c5fc2e4ce4398c85ac0e6b774521c7daa65abedc0d38b0fd4897b2e6db88 SHA512 3a9bed3d14a2d59e641b3603448bb46d769104995b1c0239eca87d582e80e64dd8905b8e455bd5b0e635d4b37d7a87208d8de37253e9af799c65f4f8d396789d
 EBUILD i3lock-2.10-r1.ebuild 673 BLAKE2B 812f0149566d91f2ace6ee875e6531e88d848971117a39101574f6edb98db41fe1cdc74eee6979ce9a1b810d9489ab4e48d7dc9c9b65c84ee6883b81b8b28ea4 SHA512 4c1f403cb6bf8bf5351336e99ae0a1c909d6b1ee7b4d27d0338808a59db1443d82aedcc4030a00a5a19cc62abca711200ea2d6a41c59f517c4e8cbeab645c17e
-EBUILD i3lock-2.11.1-r1.ebuild 795 BLAKE2B a5dc71760f2ef1ef8a08dafb8fdf26a255de816aba3e7821b32bbad9ef8efefa222be67b9cfc4b557aa31f7fae1e7d4a30ad4466fcad47c32ddd097a7944b9a6 SHA512 80d57ba92cba7f3f30e9315f6868e756ee5f3e7f6d63edc4bda99176873dd5e6f830ddfeed924a82133190f920216ac5f13d3593777e7eaac2562ca083a8ae9e
-EBUILD i3lock-2.12-r1.ebuild 750 BLAKE2B ddf64eb8b8219a49c7b5b9dc448b596b7be74c128ed38debc7bae4c9361bdfab5909d4690042899a6644117e69846823f9e103ce1c73201f1e791a80440e01dc SHA512 89da663a00fc64e4900ff74e1053906847c30fc90b7a00f718d2bf6d088080c07c29edd891f2df8034cb02588b97edbc33df3c1a1873f7d073e3c1e01d215f1c
-EBUILD i3lock-2.12-r2.ebuild 781 BLAKE2B 21494b572ec4a81756f2dcc0cc20200dea41b11d2242249195c71d33e66d9ca0e15d49fbf6363c543d712f1dc9862adf103b33d3780d64c17925a63d252d105e SHA512 1bc9ccab0673d265259b1a97f963b0c81bf5ef2836782f10a444038a2a10eee10abff7c2b34a47833a17f7a9e5c2dd05621e69040a03671cc07ec399567d7daf
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+EBUILD i3lock-2.13.ebuild 695 BLAKE2B 4a141ecca3734c76266b899c85928c9f1c315fc3cb47b6c637f8f9b7b774fc64dd29ee6f1888b7e8874d0f7b1b340e4e5e2d475f22d07028e8085791076a1260 SHA512 dd2593dffa96e736ff2a466402848da05764d4cb27bf768a4ed9a344ca7af35f72a8b09848d15e452521014b7bac421c9ff0146e680479018d3ec625913f98ec
+MISC metadata.xml 357 BLAKE2B 40dcfc882fb8c7149a23b006e6348eafebeb9da6895bc1f55b17c4a19c165cf336a28cb4695db0b7a794023a8b5758a59aeeb67e9e92998b83844f5bb1db895a SHA512 565f596c3057c2fde857dab1bc064bc6c040372f8898f021079a5f52264de6958ab4604a0dec7392de2e53c3a7142d922e80dc6ae52ad5c68fef99700678b1cb
diff --git a/x11-misc/i3lock/files/i3lock-2.11-version.patch b/x11-misc/i3lock/files/i3lock-2.11-version.patch
deleted file mode 100644
index df133cb91cdb..000000000000
--- a/x11-misc/i3lock/files/i3lock-2.11-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,7 @@
- # Run autoreconf -fi to generate a configure script from this file.
- 
- AC_PREREQ([2.69])
--AC_INIT([i3lock], [2.10], [https://github.com/i3/i3lock/issues])
-+AC_INIT([i3lock], [2.11], [https://github.com/i3/i3lock/issues])
- # For AX_EXTEND_SRCDIR
- AX_ENABLE_BUILDDIR
- AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])
-
diff --git a/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch b/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch
deleted file mode 100644
index 09003b165919..000000000000
--- a/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/unlock_indicator.c
-+++ b/unlock_indicator.c
-@@ -35,7 +35,7 @@
- 
- /* The current position in the input buffer. Useful to determine if any
-  * characters of the password have already been entered or not. */
--int input_position;
-+extern int input_position;
- 
- /* The lock window. */
- extern xcb_window_t win;
diff --git a/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild b/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild
deleted file mode 100644
index 5d706ccac8b5..000000000000
--- a/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=x11-libs/libxkbcommon-0.5.0[X]
-	dev-libs/libev
-	sys-libs/pam
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/xcb-util
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-DOCS=( CHANGELOG README.md )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11-version.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > I3LOCK_VERSION
-
-	sed -i -e 's:login:system-auth:' pam/${PN} || die
-
-	eautoreconf
-
-	tc-export CC
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/i3lock/i3lock-2.12-r1.ebuild b/x11-misc/i3lock/i3lock-2.12-r1.ebuild
deleted file mode 100644
index c2510a4767eb..000000000000
--- a/x11-misc/i3lock/i3lock-2.12-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=x11-libs/libxkbcommon-0.5.0[X]
-	dev-libs/libev
-	sys-libs/pam
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/xcb-util
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-DOCS=( CHANGELOG README.md )
-
-src_prepare() {
-	default
-
-	echo ${PV} > I3LOCK_VERSION
-
-	sed -i -e 's:login:system-auth:' pam/${PN} || die
-
-	eautoreconf
-
-	tc-export CC
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/i3lock/i3lock-2.12-r2.ebuild b/x11-misc/i3lock/i3lock-2.13.ebuild
index 07a68eb55c25..2ece4ee1a049 100644
--- a/x11-misc/i3lock/i3lock-2.12-r2.ebuild
+++ b/x11-misc/i3lock/i3lock-2.13.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Simple screen locker"
@@ -13,22 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
-	>=x11-libs/libxkbcommon-0.5.0[X]
 	dev-libs/libev
 	sys-libs/pam
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
 	x11-libs/xcb-util
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-DOCS=( CHANGELOG README.md )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12-fno-common.patch
-)
+	x11-libs/xcb-util-xrm"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml
index 2ba8e9e851e4..d6036a612f2b 100644
--- a/x11-misc/i3lock/metadata.xml
+++ b/x11-misc/i3lock/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 </pkgmetadata>