Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/x11-misc/slock/ChangeLog b/x11-misc/slock/ChangeLog
index 6ca57688c012572f6142fb19b0f2a806c243219b..92b05ab44a37c4a6b4e31554da83dfde01207bb0 100644 (file)
--- a/x11-misc/slock/ChangeLog
+++ b/x11-misc/slock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/slock
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/ChangeLog,v 1.49 2014/10/12 10:50:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/ChangeLog,v 1.50 2014/12/22 21:04:41 jer Exp $
+
+*slock-1.2 (22 Dec 2014)
+
+  22 Dec 2014; Jeroen Roovers <jer@gentoo.org> +slock-1.2.ebuild,
+  +files/slock-1.2-dontdieonme.patch:
+  Version bump.
 
   12 Oct 2014; Jeroen Roovers <jer@gentoo.org> -slock-1.1.ebuild:
   Old.

diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 6336c3c5dacfc9f49888bb833bd53095764089b1..23b0f5dc5d757504670f477082f3e5b20d7bb7a0 100644 (file)
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX slock-1.2-dontdieonme.patch 319 SHA256 47a02e775aec0f305c2f055669400cef70c4e5c489d7973447673ece28678af1 SHA512 97993e7d4f1c804ae4c25d65384be30a83b47735f5d12aad94d7828f58da48245a5dc6fb0abea0575a820379f893073d2ecc5394401370a64fdbe77795a95422 WHIRLPOOL 17c5afbd7640c43827369f65077291ea2eb92b8453bd03e5b5686949e0df47fa8349472f7d7292127717241c573a59edf062983bcc2784dab832fa2a5eeba6ee
 DIST slock-1.1.tar.gz 4604 SHA256 e04ae5070c646c78251780d386e14d16fd100367e877dd5cf616dc7aedd0e0e4 SHA512 67cd9a62edde6ca0f9f7c09989ab8fa02a11a6ec82cc52b228c0b4fd509c5605668954630b0d2727aeb3c7283580665e4b5e5c0a37f3094a6f5b2a540e45f6b5 WHIRLPOOL 48de5c869846b9489d80c316f8b3b9dadc834f888ee3c65b67823feb47f5b1bc86b4ce1b7b89f1873b6354099647a36ee4e799668e7aad1ab469c57bed5bc437
+DIST slock-1.2.tar.gz 4853 SHA256 3402658f890a88da3f34db04fca1783ed549ade45c2ebb8d8f0cd2b549f633b3 SHA512 0e66c5451c72a5df391a61eefa6b1a1493705fc9c0b04d9db934a56c11852c284ecca8706f47ceb1d1c8cfc5241c818c6026afb30fc9cf3938e44ea282338bee WHIRLPOOL b24a0efaa4272520f05991a7370bdbf2e34c31c58b01b900e39f2398081e829461b62c43c322fd40f0debaa491c57f768a652055341b213cc98d88680923916d
 EBUILD slock-1.1-r1.ebuild 1046 SHA256 ddfdf56da6a7b5be9bace66bb64f04b4b34836786c5394932d149a6cfa455989 SHA512 44195183ff599156bf5fac8ee2f350d414fd0b19efb7b885cc06ca0a8a9708f58a8775896c1776cb9ca5230d4ede31fff9010811188cf416888e04f4bdf95098 WHIRLPOOL 7f3da63f6e5a60d5c2a3feb81d214f0366cf6e2dca93da99133235e88a7078037b97067ddd0c24afac94d1bc64b4e6887051aed40e752fa1be9619ea9c3b8d6e
-MISC ChangeLog 5314 SHA256 c36a537c5003eead5995b4b7603f7cbae6eadaa8115024ce3e222bd00d300dd9 SHA512 2cce6a2585d4d33252161509af4c9a211c6fe2c4076c9f9fd84e0537cd0b2cd2609d55c1a4c72118cf1b4435c5dbe45750fed42593e86815eebd1013371cb823 WHIRLPOOL 77948113f849af1c0acfdf8de1541bceb7dcfe88f874254282724115f10ae358ced060fa136d36771d547cd1be671030773212e29a4689f3c3a9dd4d840e81ea
+EBUILD slock-1.2.ebuild 1254 SHA256 ac593b3d55663b29a25b675ab186bc4bee102d28846d67aaa0edab06d9538e6d SHA512 1bac3722b98bd61919fe6de33304069dee8f33cf85d416e952fd4db8b3977ddaac361015cfa93f27cb4e5ef6f6478ac6e19c6ad91f199676a9c28d9638a60bbf WHIRLPOOL dc3a8fd229f044db6fdb674920a5c4b0584370f1f5a8a17671bcf8ba2eda8b216210a3962a1a3edd2dc8498f5db0408a70db1e2f6316573bb99d7f846e72fd5f
+MISC ChangeLog 5461 SHA256 b0dde7096c3a7c2c869b4b7c1214ae25420e8232a6ab40aecc2b363b2e362616 SHA512 e7e489a19b2bde0914cf8ddaa3c227d0d8527848bf4c71b6c76ad1ec91f4f08c6edd5e0fffdd48aca98dbb21bb541ff050f11dfc35bb9fe439ad55a2130888c4 WHIRLPOOL 3ff5cc6fdc1e95b6f76f1bd24d69c7f418666db19ab09b56402d5ea10ee8b78aa2b2e037620dbbab522ef0e8d5d8c93a1fe364bb678c086063fe0a8e6dba9182
 MISC metadata.xml 282 SHA256 5b608ee63fd72c1f5cccef382da68647b1545c2b11ef8e576f5d1126cef6ffd8 SHA512 a4ebce4de779b28ac22fbe303953bcf5d286fa6b28a2b00b0aae62a3cb6de57b2d117d20ce38418dcc7f5245d0827cc959a1876a5ac3342506ec461eea3f286b WHIRLPOOL 2c455887dfffc362be6f132e1c96806e5ead0abb92fa6507840d1099a92c18feb3bb8920790a3f8026ea859402cbb678471bb595da25d23eecfc7a0f82a6abdd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ6XN8ACgkQVWmRsqeSphN4ZgCfXh4TFihUsMDA6nKOK0HY41hk
-iEkAnR+agJlGHc7xQOPanGHUKqwn1K4w
-=cEHB
+iEYEAREIAAYFAlSYh2sACgkQVWmRsqeSphMNVgCggAC60VvVH6okunO6c60+Qszp
+ppkAni9MfYvItplGI0sSs8Ii3dLHDZyv
+=0J43
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/slock/files/slock-1.2-dontdieonme.patch b/x11-misc/slock/files/slock-1.2-dontdieonme.patch
new file mode 100644 (file)
index 0000000..e4d1b46
--- /dev/null
+++ b/x11-misc/slock/files/slock-1.2-dontdieonme.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644 (file)
index 0000000..4dcd981
--- /dev/null
+++ b/x11-misc/slock/slock-1.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/slock-1.2.ebuild,v 1.1 2014/12/22 21:04:41 jer Exp $
+
+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
+}