jer 14/10/20 17:34:43 Modified: ChangeLog xautolock-2.2.ebuild Log: Add alternative dependency on x11-misc/slim (remove x11-misc/slimlock) by eroen (bug #489018). EAPI bump. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.31 x11-misc/xautolock/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xautolock/ChangeLog?rev=1.31&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xautolock/ChangeLog?rev=1.31&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xautolock/ChangeLog?r1=1.30&r2=1.31 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-misc/xautolock/ChangeLog,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ChangeLog 10 Aug 2014 20:04:48 -0000 1.30 +++ ChangeLog 20 Oct 2014 17:34:43 -0000 1.31 @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xautolock # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautolock/ChangeLog,v 1.30 2014/08/10 20:04:48 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautolock/ChangeLog,v 1.31 2014/10/20 17:34:43 jer Exp $ + + 20 Oct 2014; Jeroen Roovers <j...@gentoo.org> xautolock-2.2.ebuild: + Add alternative dependency on x11-misc/slim (remove x11-misc/slimlock) by + eroen (bug #489018). EAPI bump. 10 Aug 2014; Sergei Trofimovich <sly...@gentoo.org> xautolock-2.2.ebuild: QA: drop trailing '.' from DESCRIPTION 1.11 x11-misc/xautolock/xautolock-2.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xautolock/xautolock-2.2.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xautolock/xautolock-2.2.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xautolock/xautolock-2.2.ebuild?r1=1.10&r2=1.11 Index: xautolock-2.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-misc/xautolock/xautolock-2.2.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xautolock-2.2.ebuild 10 Aug 2014 20:04:48 -0000 1.10 +++ xautolock-2.2.ebuild 20 Oct 2014 17:34:43 -0000 1.11 @@ -1,7 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautolock/xautolock-2.2.ebuild,v 1.10 2014/08/10 20:04:48 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautolock/xautolock-2.2.ebuild,v 1.11 2014/10/20 17:34:43 jer Exp $ +EAPI=5 inherit toolchain-funcs DESCRIPTION="An automatic X screen-locker/screen-saver" @@ -10,31 +11,38 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc sparc x86" -IUSE="" RDEPEND=" || ( x11-misc/alock x11-misc/i3lock - x11-misc/slimlock + x11-misc/slim x11-misc/slock x11-misc/xlockmore x11-misc/xtrlock ) - x11-libs/libXScrnSaver" -DEPEND="${RDEPEND} - x11-misc/imake + x11-libs/libXScrnSaver +" +DEPEND=" + ${RDEPEND} app-text/rman - x11-proto/scrnsaverproto" + x11-misc/imake + x11-proto/scrnsaverproto +" -src_compile() { +src_configure() { xmkmf || die - emake EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LDOPTIONS="${LDFLAGS}" } src_install () { - dobin xautolock || die + dobin xautolock newman xautolock.man xautolock.1 - dodoc Changelog Readme Todo || die + dodoc Changelog Readme Todo }