diff options
| -rw-r--r-- | x11-misc/xautolock/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xautolock/Manifest | 10 | ||||
| -rw-r--r-- | x11-misc/xautolock/xautolock-2.2.ebuild | 32 |
3 files changed, 30 insertions, 18 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/Manifest b/x11-misc/xautolock/Manifest index ffed0ade87a6..68ced74956b8 100644 --- a/x11-misc/xautolock/Manifest +++ b/x11-misc/xautolock/Manifest @@ -2,13 +2,13 @@ Hash: SHA256 DIST xautolock-2.2.tgz 35288 SHA256 11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2 SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04 WHIRLPOOL c10262350dd39d9e69d491ee2164911ccb6077dd7f8be08981256e4fcb3d7059133fb172360d8f33b12d89e6576f4c4aa6b9d3ea4cdff427e4d5a0dab6ba757c -EBUILD xautolock-2.2.ebuild 968 SHA256 de89497ce982702f7e552fa969d6b7bb763ea9a0fd5fd3efc31e1fa1a0c76d4d SHA512 a2bea962d62d6182ba2238965eaf0fc8bb109a980da09f4d773d06b4c187b5261a56bcc54f0db6c9cec9ccde86d8515ee17cb4a751187bce5448c94a972de148 WHIRLPOOL 38b75a78cbb01b5e8129bc1e2c083a2472df8bb5f72f2ed1aa36c9037c2818fb6dd6658db0f6a0b8ad163775da93fe2d74dfbd3cf7c5216894fdf298d429e529 -MISC ChangeLog 3408 SHA256 21c521cea4da153228f5a96ccd96a1bc3bc8c27fb6f25858b3aa64b8778436f4 SHA512 b45888b877fb6c323a8274233f9e9694b4ea7503ac24bfcbf0f9b0b18ac58d5b07b54ba59efac438b8707a52b8003834fd55ea9cc3836e5725baf42bdb92a14b WHIRLPOOL c2ab5d22f1a1b8c920bfaf01698ad0182c52c9ed84970d5e6aa90f1478df127d44e96634876b16dcd4fc5ac6308f02084f5372b7f2b23e7a13595233bcf06946 +EBUILD xautolock-2.2.ebuild 972 SHA256 10a6f72a9a49868538ce11da0763c279dacef00fb1475bc5c8ab95e48cb29356 SHA512 5b706c274ab6de5add8c66e94fc49e0a6031f03db23709b0254b7a781605ec25518e0989e328689ce94bd140439dbd0ca3e8291f4cf64350a4db3284f8d8b499 WHIRLPOOL 5514054aa3849c87b1d0895d52d2f5c99bbb6e088ba2185882620d223710b42f6c5df22e0557c9381f5183829a88876c2e293d6384578139dcbe549ad4fae902 +MISC ChangeLog 3585 SHA256 3cb44f6b9b11aa478777c41edacd0204ceaf00f715e94f8e92186a8abb6f5164 SHA512 6e2a0c700eeee7255ec9e0367af5cc001d22bcd0001306846d2d53966f1ced0b4d0708d0e6edf603e7443979b69728278c63fa5c3dcf1e7586bcce5c830c09fc WHIRLPOOL e8a6d8e213294935c7083f6680e7194126003da75f98058e090498d71146656cda80e3c4d99fd11237f1fa2bd296b2ee0c0a35daae140ec2bd6543f48802658e MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPn0GEACgkQcaHudmEf86rrogCfegRDJC1sfaAwFpm4slKmFzjH -isUAmwTdvPy+gT2VIqr1Srbgq8vSylxj -=Ihm6 +iEYEAREIAAYFAlRFR7UACgkQVWmRsqeSphPqvQCeI+F+Zz0QeV61ZxVnQYw33uDc +MNAAn1uRN0L7w1tJvr2/BTqKqQ9YXwEZ +=aGOc -----END PGP SIGNATURE----- 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 } |