gentoo resync : 20.12.2017

5 files changed, 15 insertions, 66 deletions

diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index 8dfce83c55bf..d9f289f7e4dc 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,7 +1,5 @@
-AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B d32fb731251246dc26d5079eaaf781a1134c1ed5f6ef0f8f4f9293b9c2edf2ea105c6d1a9e546ad0ea385ad0ff3fed3b80590f789d85ece63e44ef5176e4ef81 SHA512 ad73953d0632f6b05be6dc2fd300f58cd9463ea7af082b0353df0e6e4850b7055c9957c27def4f5d745e02b7535058bd3f8622847cbf2124c023d1d309e59886
-AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 43179e0763a90bd44d3ac9699cf65c80314e24c31433d8f7da9be7633d99a9ab3ba4663591c6e4eef091aceaf62f5e8ddd1b3e3d56960439c45ea9240a14a372 SHA512 959d10b3c777936ce7b29b6a8efea55d8d76cf0007704c6b17217be4687516d2fb8d4d268d58175ebaca8594c9d5b47724788b235a5386ee2a458ed640fd63eb
+AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
+AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-DIST vlock-2.2.3.zip 85751 BLAKE2B 83ef3b55f84cd7bd9f173dbe574d004fc4fd002820aeea0c5a40d3f09d0db0eccdc063f84e019958b71c12867326fbac17c09b31b4fb0d540ed461c11b15df70 SHA512 90390bcecbc5cd55a19f9d3a6007fd39257183f63366d667263c8d49217206ba5d929814c32181bf3d3fa82197a544211ee815b65ab1c7e09a2502c4ab079b07
-EBUILD vlock-2.2.3-r1.ebuild 1113 BLAKE2B 572663f5263af2b67848f3275f08f5606891e0acb679743658957e224a6bbb99d157e60c6b8d2c564a54f224dfe140a2abd8d6a419df58cb6b3621074b8a486f SHA512 9dfd5483ceb711b44a98ce16f300d31c3ff09701128a919a992428d9ec677830575d41c17da166c425e5668eebc251ce4641e3af2a35df4f7a1a4d14a99aca03
-EBUILD vlock-2.2.3.ebuild 1257 BLAKE2B aaaa6c8a91b2fe65472543f5b8bf3279038384e44fd57ad90281b4ee20181b12aac617baf0b0260539933c4731d8dd24627b851570878d2b3ee7e151f4a4afd4 SHA512 200ee863b096f0601080f4851e13c8deddfabfff0aafceee4a1ac33c5b25323436361d8e47c9e61e4bd3518df236c75b2a3bbca7c19aafdb695bb169c6e0d1d2
+EBUILD vlock-2.2.3-r1.ebuild 1228 BLAKE2B 0c971292f98b419f7d19829cecef6c791cd1532b251647553ae3a38518984fc697e3506c09a4f70e5ac14feca914db70ccdecf9f0848f25a4f2a345429289070 SHA512 3854598d34688ea6c42b72504209d8760b49cff414e84c6ba2a34e7431bccb391e99d2649774716ac3fe5daa0810cfe516964f362e4efdf37ce03a46ea173d27
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/files/vlock-2.2.2-asneeded.patch b/app-misc/vlock/files/vlock-2.2.2-asneeded.patch
index 8baeed37caf6..cb4c3f42422b 100644
--- a/app-misc/vlock/files/vlock-2.2.2-asneeded.patch
+++ b/app-misc/vlock/files/vlock-2.2.2-asneeded.patch
@@ -1,5 +1,5 @@
---- tests/Makefile.old	2008-10-16 13:48:37.000000000 +0200
-+++ tests/Makefile	2008-10-16 13:48:53.000000000 +0200
+--- a/tests/Makefile	2008-10-16 13:48:37.000000000 +0200
++++ b/tests/Makefile	2008-10-16 13:48:53.000000000 +0200
 @@ -16,7 +16,7 @@
  TEST_SOURCES = $(TESTED_SOURCES:%=test_%)
  TEST_OBJECTS = $(TEST_SOURCES:.c=.o)
diff --git a/app-misc/vlock/files/vlock-2.2.2-test_process.patch b/app-misc/vlock/files/vlock-2.2.2-test_process.patch
index 83ecd4b14e2c..a725e9a5a851 100644
--- a/app-misc/vlock/files/vlock-2.2.2-test_process.patch
+++ b/app-misc/vlock/files/vlock-2.2.2-test_process.patch
@@ -1,5 +1,5 @@
---- tests/test_process.c.old	2008-10-16 14:10:16.000000000 +0200
-+++ tests/test_process.c	2008-10-16 14:11:26.000000000 +0200
+--- a/tests/test_process.c	2008-10-16 14:10:16.000000000 +0200
++++ b/tests/test_process.c	2008-10-16 14:11:26.000000000 +0200
 @@ -12,6 +12,7 @@
  
  #include "test_process.h"
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index d8f1739be0ed..a824254c0335 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -5,13 +5,15 @@ 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/master.zip -> ${P}.zip"
+SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam test"
 
 RDEPEND="
@@ -23,9 +25,10 @@ DEPEND="
 
 DOCS=( ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO )
 
-S="${WORKDIR}/${PN}-master"
-
-RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.2-asneeded.patch"
+	"${FILESDIR}/${PN}-2.2.2-test_process.patch"
+)
 
 pkg_setup() {
 	enewgroup "${PN}"
diff --git a/app-misc/vlock/vlock-2.2.3.ebuild b/app-misc/vlock/vlock-2.2.3.ebuild
deleted file mode 100644
index 8f2c3117c2fc..000000000000
--- a/app-misc/vlock/vlock-2.2.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils pam toolchain-funcs multilib user
-
-DESCRIPTION="A console screen locker"
-HOMEPAGE="http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html"
-SRC_URI="http://cthulhu.c3d2.de/~toidinamai/vlock/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="pam test"
-
-RDEPEND="pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cunit )"
-
-pkg_setup() {
-	enewgroup vlock
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-2.2.2-asneeded.patch" \
-		"${FILESDIR}/${PN}-2.2.2-test_process.patch"
-}
-
-src_configure() {
-	if use pam; then
-		myconf="--enable-pam"
-	else
-		myconf="--enable-shadow"
-	fi
-	# 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() {
-	emake DESTDIR="${D}" install
-	use pam && pamd_mimic_system vlock auth
-	dodoc ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO
-}