summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-02-20 16:12:13 +0000
committerJeroen Roovers <jer@gentoo.org>2012-02-20 16:12:13 +0000
commit8d97750c13b2327cfd09438a5bd6991ca078f2ab (patch)
tree5ff89b6fab2b6c6b52787f547280d75016a96c22 /x11-misc
parentRespect the system set MAKEOPTS too, as per ssumien's sugesstion. (diff)
downloadgentoo-2-8d97750c13b2327cfd09438a5bd6991ca078f2ab.tar.gz
gentoo-2-8d97750c13b2327cfd09438a5bd6991ca078f2ab.tar.bz2
gentoo-2-8d97750c13b2327cfd09438a5bd6991ca078f2ab.zip
Old.
(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/slock/ChangeLog6
-rw-r--r--x11-misc/slock/slock-0.9-r1.ebuild32
-rw-r--r--x11-misc/slock/slock-0.9.ebuild38
3 files changed, 5 insertions, 71 deletions
diff --git a/x11-misc/slock/ChangeLog b/x11-misc/slock/ChangeLog
index 482e439a8e4b..3920c2485f4c 100644
--- a/x11-misc/slock/ChangeLog
+++ b/x11-misc/slock/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/slock
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/ChangeLog,v 1.34 2012/02/20 09:13:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/ChangeLog,v 1.35 2012/02/20 16:12:13 jer Exp $
+
+ 20 Feb 2012; Jeroen Roovers <jer@gentoo.org> -slock-0.9.ebuild,
+ -slock-0.9-r1.ebuild:
+ Old.
20 Feb 2012; Agostino Sarubbo <ago@gentoo.org> slock-1.0.ebuild:
Stable for AMD64, wrt security bug #401645
diff --git a/x11-misc/slock/slock-0.9-r1.ebuild b/x11-misc/slock/slock-0.9-r1.ebuild
deleted file mode 100644
index edbee00a5229..000000000000
--- a/x11-misc/slock/slock-0.9-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/slock-0.9-r1.ebuild,v 1.3 2012/02/02 17:04:18 jer Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple X screen locker"
-HOMEPAGE="http://tools.suckless.org/slock"
-SRC_URI="http://code.suckless.org/dl/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND=${DEPEND}
-
-src_prepare() {
- sed -i config.mk \
- -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
- -e '/^CC/d' \
- -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
- || die
- tc-export CC
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/x11-misc/slock/slock-0.9.ebuild b/x11-misc/slock/slock-0.9.ebuild
deleted file mode 100644
index 2a8692013e96..000000000000
--- a/x11-misc/slock/slock-0.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/slock-0.9.ebuild,v 1.5 2012/02/02 17:04:17 jer Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="simple X screen locker"
-HOMEPAGE="http://tools.suckless.org/slock"
-SRC_URI="http://code.suckless.org/dl/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND=${DEPEND}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- sed -i \
- -e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall -g/" \
- -e "s/LDFLAGS = -s/LDFLAGS += -g/" \
- config.mk || die "sed failed"
-}
-
-src_compile() {
- append-ldflags "-Wl,-z,now"
- emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
-
- dodoc README
-}