From 3ae887f91528a5a6ebc5d4914dd714194360a131 Mon Sep 17 00:00:00 2001 From: Harri Nieminen Date: Mon, 20 Feb 2017 20:43:39 +0200 Subject: x11-misc/xidle: Bump to 26052015, EAPI 6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4046 --- x11-misc/xidle/Manifest | 1 + x11-misc/xidle/files/xidle-26052015-dead.patch | 24 ++++++++++++++++ x11-misc/xidle/xidle-26052015.ebuild | 40 ++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 x11-misc/xidle/files/xidle-26052015-dead.patch create mode 100644 x11-misc/xidle/xidle-26052015.ebuild diff --git a/x11-misc/xidle/Manifest b/x11-misc/xidle/Manifest index 60dbdaebc40a..7446905e6ad4 100644 --- a/x11-misc/xidle/Manifest +++ b/x11-misc/xidle/Manifest @@ -1 +1,2 @@ DIST xidle-24102005.tar.bz2 4886 SHA256 c5b003bc552fd51595a522e09da15335f2d7cb21882d62cbea7d5f0df73d08f9 SHA512 c64b1ddf44ffee44de99b678fa5758e93607599a09d4feb729ac5187b86ecf0ad79ec10a057227eb6a3faa607b678e07aed6832201c22e011496c53df0548942 WHIRLPOOL 48805a03cb2e93a21ad70527978b723ab0dd74488d09e74d1def75ac0aed356c19ab98318ca38997d50ec408bf2f25cf11757c56c2b782b9b3fea0052c72e961 +DIST xidle-26052015.tar.bz2 5897 SHA256 a7ba1b887c0f4d9d080dc7f49569bf48e3df1d9f2c08b11cffd159c5a15b174c SHA512 bb132a431a5dd585be6a93519aa06a73eade63dde81bbe582a5dd966646c5eeaca65fa2573e6795b73bbfd08388390b4e92954929577051f13098ef8e38c2200 WHIRLPOOL 25a0dbb3d49eeb6241b8a291863a5286b4d4bf75f5412dac9ff895afa278b73aa68438b1381ddced0bddc9db5393f0ed1b2a0af3ec082eda16c84636dc76cb2f diff --git a/x11-misc/xidle/files/xidle-26052015-dead.patch b/x11-misc/xidle/files/xidle-26052015-dead.patch new file mode 100644 index 000000000000..715ab6c7d2b1 --- /dev/null +++ b/x11-misc/xidle/files/xidle-26052015-dead.patch @@ -0,0 +1,24 @@ +--- a/xidle.c 2015-05-26 08:22:15.000000000 +0300 ++++ b/xidle.c 2017-02-20 20:28:02.693153198 +0200 +@@ -43,7 +43,7 @@ + #endif + + #ifndef PATH_PROG +-#define PATH_PROG "/usr/X11R6/bin/xlock" ++#define PATH_PROG "/usr/bin/xlock" + #endif + + +@@ -98,10 +98,10 @@ + void parse_opts(int, char **, Display **, int *, int *, int *, int *, + char **); + int str2pos(const char *); +-__dead void usage(void); ++void usage(void); + + +-__dead void ++void + usage() + { + fprintf(stderr, "Usage:\n%s %s\n", __progname, diff --git a/x11-misc/xidle/xidle-26052015.ebuild b/x11-misc/xidle/xidle-26052015.ebuild new file mode 100644 index 000000000000..86b0c0e124df --- /dev/null +++ b/x11-misc/xidle/xidle-26052015.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit toolchain-funcs + +DESCRIPTION="Monitors inactivity in X and runs the specified program when a timeout occurs" +HOMEPAGE="http://www.freebsdsoftware.org/x11/xidle.html" +SRC_URI="http://distcache.freebsd.org/local-distfiles/novel/${P}.tar.bz2" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="" + +DEPEND=" + x11-libs/libX11 + x11-libs/libXScrnSaver + " +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-dead.patch" ) + +src_compile() { + local my_compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN}{,.c} + $($(tc-getPKG_CONFIG) --libs xscrnsaver) $($(tc-getPKG_CONFIG) --libs x11)" + echo ${my_compile} || die + eval ${my_compile} || die +} + +src_install() { + dobin ${PN} + doman ${PN}.1 +} + +pkg_postinst() { + elog "If you don't specify -program argument for xidle, xlock is ran by default." + elog "Install x11-misc/xlockmore for xlock if you wish to use default behaviour." +} -- cgit v1.2.3-65-gdbad