From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jul 2021 22:39:47 +0100 Subject: gentoo resync : 03.07.2021 --- x11-misc/slock/Manifest | 3 +- .../slock/files/slock-1.4-fix-link-paths.patch | 18 ++++++ x11-misc/slock/slock-1.4-r1.ebuild | 70 ++++++++++++++++++++++ x11-misc/slock/slock-1.4.ebuild | 62 ------------------- 4 files changed, 90 insertions(+), 63 deletions(-) create mode 100644 x11-misc/slock/files/slock-1.4-fix-link-paths.patch create mode 100644 x11-misc/slock/slock-1.4-r1.ebuild delete mode 100644 x11-misc/slock/slock-1.4.ebuild (limited to 'x11-misc/slock') diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest index 763fddb7feff..0a5187c5b222 100644 --- a/x11-misc/slock/Manifest +++ b/x11-misc/slock/Manifest @@ -1,3 +1,4 @@ +AUX slock-1.4-fix-link-paths.patch 558 BLAKE2B f2ef75f836b02ec23b98fdb9f302e671ec8a284b75d83f701e14f5d44a746916b670768730759d4767c9617259b6ad1ec6aceecd851973038ffc2382edd99558 SHA512 3610b7e03e7089ffb4207b136f08ac0944d411284dbbf6614c615596451dcab11ad001c01c4f32c0f040138c99d6764428d60050da59933619a8bbf7fd2a011e DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f -EBUILD slock-1.4.ebuild 1159 BLAKE2B 807dccf6cf4f13e0f9f253d2204d1b66bc8bb06b154793c88dfc74b9a4cd1f0b2595693dbfcf6892b5ef10c13d45ebd8b894e870afc5e39f4ca0cbf436a6dda3 SHA512 e44d5801fa59175a3648bc3343c04cf541cb410fb8a18a9c5e6cc85ec1676a8575ad057b54be480be8d93fef6ef6d50d8538b8f9459d84cbde14cc43dcf51ea7 +EBUILD slock-1.4-r1.ebuild 1246 BLAKE2B 88e425b7de3f48060cccf815f9f778d2681c9b61aaf51d18c96846609a415edce8eb75d4cdbd9afac755cdeafd96436782cc27d0e631b203774c11229d1ac516 SHA512 1758c511f74cc49dc0a28ef9be30a93ebed4467c19f821d6fcbabfc901c800ab809d4780537584c9a4acf9147b08fc370788e0b439b2bdad31ab2890b581f5ee MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9 diff --git a/x11-misc/slock/files/slock-1.4-fix-link-paths.patch b/x11-misc/slock/files/slock-1.4-fix-link-paths.patch new file mode 100644 index 000000000000..503c2e52f7a9 --- /dev/null +++ b/x11-misc/slock/files/slock-1.4-fix-link-paths.patch @@ -0,0 +1,18 @@ +From: Sam James +Date: Wed, 30 Jun 2021 06:54:36 +0100 +Subject: [PATCH] Drop unnecessary include, library paths + +Closes: https://bugs.gentoo.org/732410 +--- a/config.mk ++++ b/config.mk +@@ -11,8 +11,8 @@ X11INC = /usr/X11R6/include + X11LIB = /usr/X11R6/lib + + # includes and libs +-INCS = -I. -I/usr/include -I${X11INC} +-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr ++INCS = -I. -I${X11INC} ++LIBS = -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr + + # flags + CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H diff --git a/x11-misc/slock/slock-1.4-r1.ebuild b/x11-misc/slock/slock-1.4-r1.ebuild new file mode 100644 index 000000000000..615682671a07 --- /dev/null +++ b/x11-misc/slock/slock-1.4-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit fcaps savedconfig toolchain-funcs + +DESCRIPTION="simple X display locker" +HOMEPAGE="https://tools.suckless.org/slock" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 x86" + +RDEPEND=" + virtual/libcrypt:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}"/slock-1.4-fix-link-paths.patch +) + +src_prepare() { + default + + 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_setgid,cap_setuid,cap_sys_resource \ + /usr/bin/slock + + savedconfig_pkg_postinst +} diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild deleted file mode 100644 index a15511eda53d..000000000000 --- a/x11-misc/slock/slock-1.4.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 fcaps savedconfig toolchain-funcs - -DESCRIPTION="simple X display locker" -HOMEPAGE="https://tools.suckless.org/slock" -SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~hppa x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -src_prepare() { - default - - 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_setgid,cap_setuid,cap_sys_resource \ - /usr/bin/slock - - savedconfig_pkg_postinst -} -- cgit v1.2.3