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/alock/Manifest | 4 +- x11-misc/alock/alock-1.0.0-r1.ebuild | 74 ++++++++++++++++++++++ x11-misc/alock/alock-1.0.0.ebuild | 71 --------------------- .../implicit_pointer_conversion_fix_amd64.patch | 6 +- 4 files changed, 78 insertions(+), 77 deletions(-) create mode 100644 x11-misc/alock/alock-1.0.0-r1.ebuild delete mode 100644 x11-misc/alock/alock-1.0.0.ebuild (limited to 'x11-misc/alock') diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest index 5285b9c67574..f659e66daef4 100644 --- a/x11-misc/alock/Manifest +++ b/x11-misc/alock/Manifest @@ -1,8 +1,8 @@ AUX check-setuid.patch 839 BLAKE2B b0e360fa73174cc022891e7c4533d72c82ea9620a076054e51a5b885db65fb0aff540b88b10bef4e653942fca3e655b938623c68bd87a4d3dbc81fc9a3c447f8 SHA512 6c86673f33420ec672f7f74c1ff2423ebd43e6a6c9b54db7509196c66387c077bf105d76027a580f60f53f6dafc31c102364b4b6568e17ac5587a8833540315e AUX fix-aliasing.patch 1076 BLAKE2B ecd1b2ae5fc366342fdea7197eedcbcdbafa896304ed5018383f5776c8ca0ac93b11c45775b12e3fac2d9182c5758bc92cbd0f0022bb6370a4e7ed620e9d76c4 SHA512 edcc182ddc8a78c031111b301b090b9af97b0628dd6b53b353c144183d33f276d730596b0cd3947aba89bb1163135f990dada475b09a8f8ae8453e471671848f -AUX implicit_pointer_conversion_fix_amd64.patch 440 BLAKE2B 604de647696dc0bd518d7df986117f3160cba18e70b82e9a75465652538c0286e88b6fb459a877edecdf005b2933ab8363ccf9f3b86987dfb154dedf7d88bf14 SHA512 052c2b01792411131c72f6c50ea2874ab0f4376ca2e79e97ece0e5167fc844d7a5e0a44408635e2477f0dac351f1441c52506fece049e811058ce8cae185c789 +AUX implicit_pointer_conversion_fix_amd64.patch 307 BLAKE2B 39ea89191e3d4633ea4b77018fed933a31d698c91af10a4044e1090592f96803bfaff72006af70de6aa235ce419b3e63a319abc849efd0400d4285cbf9c47541 SHA512 1f036dde054ab641ea4af31d621eb6b6a41371749d9d54c70908981817f6c52c8b64d8b4967b525cdad2d62b78b81224187bbc8759ef3f5621ad3874a88079d9 AUX no-xf86misc.patch 3220 BLAKE2B 1588866bdb372b5bfae031569a981e1fc0be716ec2b96cc46aa4118cd8db3e500760fb90a9394abbf792872d7cf65963daaf47c46a5db87249fd172370396711 SHA512 a27a7dff601c35ad5b41170be0aa3b2453c2b46c679f76ad4ae0b229731aa0d1e13e3c3dfeffbe690e119048a51c76ae091fa3673db8ceecb2f82f81d3857488 AUX tidy-printf.patch 801 BLAKE2B 3015b266465ac1da7127cbc2c871daa729c22ce97c8bf9e88dff5ec3228192bc81bbc0fc31239add4256b8a0d44a852eb543079fbdecb909db41ac57f43ec070 SHA512 253f731e5be75676ef56ab320ee52625bee17a0a8f2bbb025efb8b9ac8a49da7330e5123bb0070eaa9c01f3cd66fadb85ead65c75c9412e6503744705402e9c4 DIST alock-1.0.0.tar.gz 71497 BLAKE2B e61a5fd9fb9a5bcc23a535fcc81da7ae2006300c636a6103132125e0c84c18977690e0f44f489788bf8228f0af900638066ab8706ef731fdf32604dc013684e9 SHA512 7f2515410919ef1324019cd8d218650f54537f9fddf1d74bebd255c7572eff9433ded92f2d1f4ee5f352151dd15f4a7f53f7b639f82d4e6f936f831262d508a5 -EBUILD alock-1.0.0.ebuild 1601 BLAKE2B 5edec1e5c06056c487512f27701eccf5148aabb0240f3340d927ae3a214fc3136c57d94cd93d9fcfdb87486d14cf89eac99ec12efc0b6a0bfddb1ad866358261 SHA512 1ccca966c7a6e2efba90e5d472e17bedc67ec0d376955af9e3ca7a03b6cd692c1ad18d170e5d5166c54df160f3e40684279169f0497f5c31f7a3127d4777bf28 +EBUILD alock-1.0.0-r1.ebuild 1632 BLAKE2B a14723ff008e1898c6e233f01868b08a40af50d5124a46ddfcf907f9a48a07e9a0f034866f3b82f17981b5880b069eeab4424e977d37999074dda85559dd20e6 SHA512 6122502715d9a16da4e771f3d8bebf53f9ab1bdbadf76db284b3968c92be09d98cbe1a11bb3393476f6e3a6a96d8171b335197820646446fb2fdb2dc168a43bc MISC metadata.xml 602 BLAKE2B 4afdc04e15531b1ebc4312f67e1c3afca07841f4fc0053994b95ea0e1758b6ab6e146ad1d4e67cd816ee01212f02ff6a1ca9ddb25b8085db17e128c724a72bb8 SHA512 6c78760e2037a294560a54f09469b7fd2840379c7d2cdf417c72f7953e18df437fa327e61efbff1346a0ced4eb443f2e23376a247a24e0286ea186eca636fbb6 diff --git a/x11-misc/alock/alock-1.0.0-r1.ebuild b/x11-misc/alock/alock-1.0.0-r1.ebuild new file mode 100644 index 000000000000..33a86aadaf0a --- /dev/null +++ b/x11-misc/alock/alock-1.0.0-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +# We need this since there are no tagged releases yet +DESCRIPTION="locks the local X display until a password is entered" +HOMEPAGE="https://darkshed.net/projects/alock + https://github.com/mgumz/alock" +SRC_URI="https://github.com/mgumz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="doc imlib pam" + +DEPEND="virtual/libcrypt:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm + x11-libs/libXrender + x11-libs/libXcursor + imlib? ( media-libs/imlib2[X] ) + pam? ( sys-libs/pam )" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( app-text/asciidoc )" + +PATCHES=( + "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch + "${FILESDIR}"/check-setuid.patch + "${FILESDIR}"/tidy-printf.patch + "${FILESDIR}"/fix-aliasing.patch + "${FILESDIR}"/no-xf86misc.patch +) + +src_configure() { + tc-export CC + + econf \ + --prefix=/usr \ + --with-all \ + $(use_with pam) \ + $(use_with imlib imlib2) +} + +src_compile() { + # xmlto isn't required, so set to 'true' as dummy program + # alock.1 is suitable for a manpage + emake XMLTO=true +} + +src_install() { + dobin src/alock + + if use doc; then + # We need to generate the manpage... + a2x -d manpage -f manpage ./"${PN}".txt || die "a2x conversion failed." + doman alock.1 + dodoc {CHANGELOG,README,TODO}.txt + fi + + insinto /usr/share/alock/xcursors + doins contrib/xcursor-* + + insinto /usr/share/alock/bitmaps + doins bitmaps/* + + if ! use pam; then + # Sets suid so alock can correctly work with shadow + fperms 4755 /usr/bin/alock + fi +} diff --git a/x11-misc/alock/alock-1.0.0.ebuild b/x11-misc/alock/alock-1.0.0.ebuild deleted file mode 100644 index e636eb5415e6..000000000000 --- a/x11-misc/alock/alock-1.0.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -# we need this since there are no tagged releases yet -DESCRIPTION="locks the local X display until a password is entered" -HOMEPAGE="https://darkshed.net/projects/alock - https://github.com/mgumz/alock" -SRC_URI="https://github.com/mgumz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="doc imlib pam" - -DEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXcursor - imlib? ( media-libs/imlib2[X] ) - pam? ( sys-libs/pam ) - doc? ( app-text/asciidoc )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch - "${FILESDIR}"/check-setuid.patch - "${FILESDIR}"/tidy-printf.patch - "${FILESDIR}"/fix-aliasing.patch - "${FILESDIR}"/no-xf86misc.patch -) - -src_configure() { - tc-export CC - - econf \ - --prefix=/usr \ - --with-all \ - $(use_with pam) \ - $(use_with imlib imlib2) -} - -src_compile() { - # xmlto isn't required, so set to 'true' as dummy program - # alock.1 is suitable for a manpage - emake XMLTO=true -} - -src_install() { - dobin src/alock - if use doc; then - # We need to generate the manpage... - a2x -d manpage -f manpage ./"${PN}".txt || die "a2x conversion failed." - doman alock.1 - dodoc {CHANGELOG,README,TODO}.txt - fi - - insinto /usr/share/alock/xcursors - doins contrib/xcursor-* - - insinto /usr/share/alock/bitmaps - doins bitmaps/* - - if ! use pam; then - # Sets suid so alock can correctly work with shadow - fperms 4755 /usr/bin/alock - fi -} diff --git a/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch b/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch index 1184ee73a612..b3172aa61841 100644 --- a/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch +++ b/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch @@ -1,7 +1,5 @@ -Index: alock-svn-94/src/auth_passwd.c -=================================================================== ---- alock-svn-94.orig/src/auth_passwd.c -+++ alock-svn-94/src/auth_passwd.c +--- a/src/auth_passwd.c ++++ b/src/auth_passwd.c @@ -43,7 +43,7 @@ \* ---------------------------------------------------------------- */ -- cgit v1.2.3