diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-10-20 17:34:43 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-10-20 17:34:43 +0000 |
| commit | 170b40064d889ff50e8400b46d726d7697ce79f1 (patch) | |
| tree | cb71d9b476abdab271e471df549cc6fc760344db /x11-misc | |
| parent | A quick fix regarding amd64 static building without ncurses (diff) | |
| download | gentoo-2-170b40064d889ff50e8400b46d726d7697ce79f1.tar.gz gentoo-2-170b40064d889ff50e8400b46d726d7697ce79f1.tar.bz2 gentoo-2-170b40064d889ff50e8400b46d726d7697ce79f1.zip | |
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)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xautolock/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xautolock/xautolock-2.2.ebuild | 32 |
2 files changed, 25 insertions, 13 deletions
diff --git a/x11-misc/xautolock/ChangeLog b/x11-misc/xautolock/ChangeLog index cb1876f9946d..404c9464ea95 100644 --- a/x11-misc/xautolock/ChangeLog +++ b/x11-misc/xautolock/ChangeLog @@ -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 <jer@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 <slyfox@gentoo.org> xautolock-2.2.ebuild: QA: drop trailing '.' from DESCRIPTION diff --git a/x11-misc/xautolock/xautolock-2.2.ebuild b/x11-misc/xautolock/xautolock-2.2.ebuild index b80d1d6b79ee..20557aa8811f 100644 --- a/x11-misc/xautolock/xautolock-2.2.ebuild +++ b/x11-misc/xautolock/xautolock-2.2.ebuild @@ -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 @@ HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/" 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 } |