gentoo resync : 22.01.2019

4 files changed, 93 insertions, 1 deletions

diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index 07d1042fb42b..95819a932378 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -1,4 +1,6 @@
+AUX xautolock-2.2_p5_p1-waitpid.patch 777 BLAKE2B 82031ddb959208db99472a72db6c1e8079a0f22ac91084742ed93df51b27e42fcabce36009f811f5d456e6ff803a08c75651ef7fbb9eab4248d79d3e09f8cb27 SHA512 4ac7fee35265c996a6bc82e3895d69e702b33e164f904da3dd022ce0f591b721c8e74493a53633695f66e332464a63007548fd24181b00b7dcd4228475355411
 DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
 DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
+EBUILD xautolock-2.2_p5_p1-r1.ebuild 1239 BLAKE2B b1121134e2e9e4da0397ec4a01e321664faf086410a96f0d5f73c04a3a924fab4ab9e037ecaf2cb0d27b5fa50667fc7a16369f2df17e4f146a71508d06c15339 SHA512 fa6f130ffc11cd59ff0b81d1de4835fa5f37c9a5fd33fe9d6697da23dd14c66f6641b227ac346b4f494f410c8f1d0e5a19510fa3da975b320dff235d0e28248b
 EBUILD xautolock-2.2_p5_p1.ebuild 1377 BLAKE2B 57065aa8645601ef4047d84633226029a324fbfe057ca231db535169c8726c74ad47dacdf894bfba558d374c209b55c5eea51eddd0448cedead839a280ec8099 SHA512 4f2acd15acfb25139ae95d12e5755909364a0b6c60e83d1c7266ba46406f64ad19d03db775b9890dd5b786545db9c0871c98ac05c4f678c1bac06dd7817eb11e
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+MISC metadata.xml 637 BLAKE2B d1b4ecdd6eda1ba1db1550aa7187e1cd90b6093fd257600b4b3506ffb560946ceefe52bedd4364c0506be586daeebbdb1467197047db7a72f23aee9f41680e64 SHA512 62dcaa38a5e6ed4b9f020379fedb6d59f87628ea036b74acb73f600b89d0eab640548c18b104306df3d56c055ce39adbadf49683eaa46ece7ca26c79539c32d9
diff --git a/x11-misc/xautolock/files/xautolock-2.2_p5_p1-waitpid.patch b/x11-misc/xautolock/files/xautolock-2.2_p5_p1-waitpid.patch
new file mode 100644
index 000000000000..98d96b2e2d34
--- /dev/null
+++ b/x11-misc/xautolock/files/xautolock-2.2_p5_p1-waitpid.patch
@@ -0,0 +1,25 @@
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -210,22 +210,14 @@ evaluateTriggers (Display* d)
+ #else /* VMS */
+   if (lockerPid)
+   {
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
+-    union wait  status;      /* childs process status */
+-#else /* !UTEKV && !SYSV && !SVR4 */
+     int         status = 0;  /* childs process status */
+-#endif /* !UTEKV && !SYSV && !SVR4 */
+ 
+     if (unlockNow && !disabled)
+     {
+       (void) kill (lockerPid, SIGTERM);
+     }
+ 
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
+-    if (wait3 (&status, WNOHANG, 0))
+-#else /* !UTEKV && !SYSV && !SVR4 */
+     if (waitpid (-1, &status, WNOHANG)) 
+-#endif /* !UTEKV && !SYSV && !SVR4 */
+     {
+      /*
+       *  If the locker exited normally, we disable any pending kill
diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml
index 2ba8e9e851e4..b822c45366ac 100644
--- a/x11-misc/xautolock/metadata.xml
+++ b/x11-misc/xautolock/metadata.xml
@@ -5,4 +5,15 @@
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
+<longdescription lang='en'>
+If no user activity is detected after a set timeout, xautolock runs a program
+for you. If you want that program (with optional arguments) to be a screen
+locker, then one of these packages might fit your purpose:
+	x11-misc/alock
+	x11-misc/i3lock
+	x11-misc/slim
+	x11-misc/slock
+	x11-misc/xlockmore
+	x11-misc/xtrlock
+</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
new file mode 100644
index 000000000000..63dd3677304c
--- /dev/null
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator
+
+DESCRIPTION="An automatic X screen-locker/screen-saver"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
+
+DEB_REV_MAJ="$(get_version_component_range 3)"
+DEB_REV_MIN="$(get_version_component_range 4)"
+DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
+SRC_URI="
+	${HOMEPAGE}/${P/_p*/}.tgz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXScrnSaver
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
+	x11-misc/imake
+"
+PATCHES=(
+	"${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch
+	"${WORKDIR}"/debian/patches/11-fix-no-dpms.patch
+	"${WORKDIR}"/debian/patches/12-fix-manpage.patch
+	"${WORKDIR}"/debian/patches/13-fix-hppa-build.patch
+	"${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_configure() {
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install () {
+	dobin xautolock
+	newman xautolock.man xautolock.1
+	dodoc Changelog Readme Todo
+}