Do not add -Wl,-z,now to LDFLAGS. Do not add -g to {C,LD}FLAGS. Set CC in src_install so that the options output does not confuse.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

2 files changed, 43 insertions, 2 deletions

diff --git a/x11-misc/slock/ChangeLog b/x11-misc/slock/ChangeLog
index a0baa1658c35..54a0e72e9dad 100644
--- a/x11-misc/slock/ChangeLog
+++ b/x11-misc/slock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/slock
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/ChangeLog,v 1.26 2008/12/27 22:54:01 coldwind Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/ChangeLog,v 1.27 2012/02/02 16:41:38 jer Exp $
+
+*slock-0.9-r1 (02 Feb 2012)
+
+  02 Feb 2012; Jeroen Roovers <jer@gentoo.org> +slock-0.9-r1.ebuild:
+  Do not add -Wl,-z,now to LDFLAGS. Do not add -g to {C,LD}FLAGS. Set CC in
+  src_install so that the options output does not confuse.
 
   27 Dec 2008; Santiago M. Mola <coldwind@gentoo.org> -slock-0.8.ebuild:
   Remove old.
diff --git a/x11-misc/slock/slock-0.9-r1.ebuild b/x11-misc/slock/slock-0.9-r1.ebuild
new file mode 100644
index 000000000000..870af0eb1e62
--- /dev/null
+++ b/x11-misc/slock/slock-0.9-r1.ebuild
@@ -0,0 +1,35 @@
+# 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.1 2012/02/02 16:41:38 jer Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="simple X screen locker"
+HOMEPAGE="http://www.suckless.org/programs/slock.html"
+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
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	emake CC=$(tc-getCC) DESTDIR="${D}" PREFIX="/usr" install
+}