[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     0eee9ed77ba81cba3bdd28b5862b6557c6f5e65f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 06:07:08 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 06:07:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eee9ed7

x11-misc/slock: Old.

Package-Manager: portage-2.3.0

 x11-misc/slock/Manifest                          |  1 -
 x11-misc/slock/files/slock-1.2-dontdieonme.patch | 11 -----
 x11-misc/slock/slock-1.2.ebuild                  | 57 ----------------------
 x11-misc/slock/slock-1.3-r2.ebuild               | 61 ------------------------
 4 files changed, 130 deletions(-)

diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 077a64b..ad2719c 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,2 +1 @@
-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.2-dontdieonme.patch b/x11-misc/slock/files/slock-1.2-dontdieonme.patch
deleted file mode 100644
index e4d1b46..00000000
--- a/x11-misc/slock/files/slock-1.2-dontdieonme.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/slock.c
-+++ b/slock.c
-@@ -57,7 +57,7 @@
- 	if (fd < 0 && errno == ENOENT)
- 		return;
- 	if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0)
--		die("cannot disable the out-of-memory killer for this process\n");
-+		fprintf(stderr, "cannot disable the out-of-memory killer for this process\n");
- }
- #endif
- 

diff --git a/x11-misc/slock/slock-1.2.ebuild b/x11-misc/slock/slock-1.2.ebuild
deleted file mode 100644
index ae04a40..00000000
--- a/x11-misc/slock/slock-1.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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}"/${P}-dontdieonme.patch
-
-	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
-}

diff --git a/x11-misc/slock/slock-1.3-r2.ebuild b/x11-misc/slock/slock-1.3-r2.ebuild
deleted file mode 100644
index c6a9b51..00000000
--- a/x11-misc/slock/slock-1.3-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 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
-	x11-libs/libXrandr
-"
-DEPEND="
-	${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/xproto
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-warning.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
-}