gentoo resync : 28.04.2021

3 files changed, 66 insertions, 63 deletions

diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index dbcb3a074341..7a66d43962bd 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -2,5 +2,5 @@ AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 AUX vlock-2.2.3-echo-printf.patch 375 BLAKE2B ae93fbf307dfd0a911a38b2426d89d0a7a864c47db4c533af01bf2b12f89227e4af38e1eba00dac677b1c467bf688166647681265b3ff7006a323cc91e971306 SHA512 30d1f3d20e7e7881b0fa759f0cba1fed3249cd27c91a784624de23df07db821b2c0ec73b5ae54ce90bb8f58d9d68c4cc3bf10f738d99fda6d7bd1f16a429de7d
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1353 BLAKE2B 384daa1edbe974986a04d13a4a44a212abcc318d7a94359d2913e1dd57363ca56dde58496c38b6ac25f11481c95a3b8821a2039bbe4b0fad07e241f3e70f2cda SHA512 b98529fc2c2085192f6a193b4eb37254f39bf8c446833495a77b55795ec8aca0657d8ca040e0629f564b1746aa678a0175161352c33744218ca88c9dd65f21dd
+EBUILD vlock-2.2.3-r2.ebuild 1422 BLAKE2B 3cfb8fac05d527bbd93515bdee3f6e844925d5b297fb43f49c93c612d332043b47c56f6788cd72f7e2040cb67930f5159c7328a0718fc6c81fbe79126beb638a SHA512 c1c8e656279e529374011aee9c00aa663848155bc6197aed838c59ab9a8250a5c892b164bc2f417a99d165e076ac8729ea21681f1045106e44834265035d2ccc
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
deleted file mode 100644
index 63003936c4cc..000000000000
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pam toolchain-funcs user
-
-COMMIT="f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"
-
-DESCRIPTION="A console screen locker"
-HOMEPAGE="https://github.com/WorMzy/vlock"
-SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="pam test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!>=sys-apps/kbd-2.0.4-r1[pam]
-	pam? ( sys-libs/pam )"
-
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cunit )"
-
-DOCS=( ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.2-asneeded.patch"
-	"${FILESDIR}/${PN}-2.2.2-test_process.patch"
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-}
-
-src_configure() {
-	local myconf="--enable-shadow"
-	use pam && myconf="--enable-pam"
-
-	# this package has handmade configure system which fails with econf...
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		CFLAGS="${CFLAGS} -pedantic -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" || die "configure failed"
-}
-
-src_install() {
-	default
-
-	# See bug #637598.
-	epatch "${FILESDIR}/${P}-echo-printf.patch"
-
-	use pam && pamd_mimic_system vlock auth
-}
diff --git a/app-misc/vlock/vlock-2.2.3-r2.ebuild b/app-misc/vlock/vlock-2.2.3-r2.ebuild
new file mode 100644
index 000000000000..eef753337853
--- /dev/null
+++ b/app-misc/vlock/vlock-2.2.3-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam toolchain-funcs
+
+EGIT_COMMIT="3542ef58a2b838cc8294fe82c341fb671c38611b"
+
+DESCRIPTION="Allows to lock one or all of the sessions of your console display"
+HOMEPAGE="https://github.com/WorMzy/vlock"
+SRC_URI="https://github.com/WorMzy/vlock/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+IUSE="pam test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!sys-apps/kbd[pam]
+	pam? ( sys-libs/pam )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-util/cunit )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/vlock
+"
+
+DOCS=( ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.2-asneeded.patch"
+	"${FILESDIR}/${PN}-2.2.2-test_process.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS} -pedantic -std=gnu99"
+		LD="$(tc-getLD)"
+		LDFLAGS="${LDFLAGS}"
+		$(usex pam '--enable-pam' '--enable-shadow')
+		--prefix="${EPREFIX}"/usr
+		--mandir="${EPREFIX}"/usr/share/man
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	# This package has handmade configure system which fails with econf
+	./configure "${myeconfargs[@]}" || die
+}
+
+src_install() {
+	default
+
+	# Bug #637598
+	eapply "${FILESDIR}/${P}-echo-printf.patch"
+
+	use pam && pamd_mimic_system vlock auth
+}