From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-863098-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 2226759CA2
	for <garchives@archives.gentoo.org>; Sat, 13 Feb 2016 20:57:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1A74F21C00E;
	Sat, 13 Feb 2016 20:57:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 717AA21C00E
	for <gentoo-commits@lists.gentoo.org>; Sat, 13 Feb 2016 20:57:28 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 47066340BE3
	for <gentoo-commits@lists.gentoo.org>; Sat, 13 Feb 2016 20:57:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 25A6D8E9
	for <gentoo-commits@lists.gentoo.org>; Sat, 13 Feb 2016 20:57:25 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1455397037.b14e1d9c1c668d2f138872daadfd4c885e277f05.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-misc/slock/Manifest x11-misc/slock/files/slock-1.3-dontdieonme.patch x11-misc/slock/slock-1.3.ebuild
X-VCS-Directories: x11-misc/slock/files/ x11-misc/slock/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: b14e1d9c1c668d2f138872daadfd4c885e277f05
X-VCS-Branch: master
Date: Sat, 13 Feb 2016 20:57:25 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9dc586ed-3556-41d9-8342-9511266bb353
X-Archives-Hash: e16e80b745e02ce7df16e2aade4e4b25

commit:     b14e1d9c1c668d2f138872daadfd4c885e277f05
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 20:55:40 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 20:57:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14e1d9c

x11-misc/slock: Version bump.

Package-Manager: portage-2.2.27

 x11-misc/slock/Manifest                          |  1 +
 x11-misc/slock/files/slock-1.3-dontdieonme.patch | 10 ++++
 x11-misc/slock/slock-1.3.ebuild                  | 59 ++++++++++++++++++++++++
 3 files changed, 70 insertions(+)

diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 3d81cb7..077a64b 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1 +1,2 @@
 DIST slock-1.2.tar.gz 4853 SHA256 3402658f890a88da3f34db04fca1783ed549ade45c2ebb8d8f0cd2b549f633b3 SHA512 0e66c5451c72a5df391a61eefa6b1a1493705fc9c0b04d9db934a56c11852c284ecca8706f47ceb1d1c8cfc5241c818c6026afb30fc9cf3938e44ea282338bee WHIRLPOOL b24a0efaa4272520f05991a7370bdbf2e34c31c58b01b900e39f2398081e829461b62c43c322fd40f0debaa491c57f768a652055341b213cc98d88680923916d
+DIST slock-1.3.tar.gz 5943 SHA256 bab4a3aea4046aa0fd0361c3649b79b90ca531bc5dfae3c4a6c0fe436152bd18 SHA512 5024588f6d25f9d72a9d2b8ef9d8a2a94e5d5e53f30f4a15df83b693a3706b1ad6550422f36af29f54429a9c516d14a349e46aeb9896c6e32009ff0da5c02a8f WHIRLPOOL 0f5d89117ad6a51f4d409f0e00b6cc114bf19e36265d8a476420fee688b224c0e9fe688d961537fbd7794c8f13df51629f7396a7e2fbc16e7b85b877b151959c

diff --git a/x11-misc/slock/files/slock-1.3-dontdieonme.patch b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
new file mode 100644
index 0000000..dd08ba7
--- /dev/null
+++ b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
@@ -0,0 +1,10 @@
+--- a/slock.c
++++ b/slock.c
+@@ -55,7 +55,6 @@
+ 	va_start(ap, errstr);
+ 	vfprintf(stderr, errstr, ap);
+ 	va_end(ap);
+-	exit(1);
+ }
+ 
+ #ifdef __linux__

diff --git a/x11-misc/slock/slock-1.3.ebuild b/x11-misc/slock/slock-1.3.ebuild
new file mode 100644
index 0000000..0cfb4d8
--- /dev/null
+++ b/x11-misc/slock/slock-1.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fcaps savedconfig toolchain-funcs
+
+DESCRIPTION="simple X screen locker"
+HOMEPAGE="http://tools.suckless.org/slock"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-dontdieonme.patch
+
+	epatch_user
+
+	sed -i \
+		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+		-e '/^CC/d' \
+		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+		config.mk || die
+	sed -i \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+	if use elibc_FreeBSD; then
+		sed -i -e 's/-DHAVE_SHADOW_H//' config.mk || die
+	fi
+	restore_config config.h
+	tc-export CC
+}
+
+src_compile() { emake slock; }
+
+src_install() {
+	dobin slock
+	save_config config.h
+}
+
+pkg_postinst() {
+	# cap_dac_read_search used to be enough for shadow access
+	# but now slock wants to write to /proc/self/oom_score_adj
+	# and for that it needs:
+	fcaps cap_dac_override,cap_sys_resource /usr/bin/slock
+
+	savedconfig_pkg_postinst
+}