Add "X" USE flag dependency on imlib2. (Bug 427164) Add patch to fix building with GCC 4.7. (Bug 426866)

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 75 insertions, 1 deletions

diff --git a/x11-misc/slimlock/ChangeLog b/x11-misc/slimlock/ChangeLog
index c1a06341e318..04f39d9f7ceb 100644
--- a/x11-misc/slimlock/ChangeLog
+++ b/x11-misc/slimlock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/slimlock
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slimlock/ChangeLog,v 1.2 2012/06/27 15:29:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slimlock/ChangeLog,v 1.3 2012/08/18 18:57:21 titanofold Exp $
+
+*slimlock-0.11-r1 (18 Aug 2012)
+
+  18 Aug 2012; Aaron W. Swenson <titanofold@gentoo.org>
+  +slimlock-0.11-r1.ebuild, +files/slimlock-0.11-gcc47.patch:
+  Add "X" USE flag dependency on imlib2. (Bug 427164) Add patch to fix building
+  with GCC 4.7. (Bug 426866)
 
   27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> slimlock-0.11.ebuild:
   Missing quoting when $(tc-getCC) and $(tc-getCXX) are used as args.
diff --git a/x11-misc/slimlock/files/slimlock-0.11-gcc47.patch b/x11-misc/slimlock/files/slimlock-0.11-gcc47.patch
new file mode 100644
index 000000000000..3f21c9053912
--- /dev/null
+++ b/x11-misc/slimlock/files/slimlock-0.11-gcc47.patch
@@ -0,0 +1,22 @@
+diff -u a/panel.h b/panel.h
+--- a/panel.h	2012-02-07 05:11:48.000000000 +0100
++++ b/panel.h	2012-07-16 17:36:40.951304995 +0200
+@@ -21,6 +21,7 @@
+ #include <stdlib.h>
+ #include <signal.h>
+ #include <iostream>
++#include <unistd.h>
+ #include <string>
+ 
+ #ifdef NEEDS_BASENAME
+diff -u a/slimlock.cpp b/slimlock.cpp
+--- a/slimlock.cpp	2012-02-07 05:11:48.000000000 +0100
++++ b/slimlock.cpp	2012-07-16 17:36:23.796304587 +0200
+@@ -21,6 +21,7 @@
+ #include <pthread.h>
+ #include <err.h>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #include "cfg.h"
+ #include "util.h"
\ No newline at end of file
diff --git a/x11-misc/slimlock/slimlock-0.11-r1.ebuild b/x11-misc/slimlock/slimlock-0.11-r1.ebuild
new file mode 100644
index 000000000000..c18f8b76915f
--- /dev/null
+++ b/x11-misc/slimlock/slimlock-0.11-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slimlock/slimlock-0.11-r1.ebuild,v 1.1 2012/08/18 18:57:21 titanofold Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Screen locker borrowing the interface of the SLiM login-manager"
+HOMEPAGE="http://joelburget.com/slimlock/"
+SRC_URI="http://github.com/joelburget/slimlock/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/freetype-2
+		 media-libs/imlib2[X,png,jpeg]
+		 virtual/pam
+		 x11-libs/libX11
+		 x11-libs/libXext
+		 x11-libs/libXft
+		 x11-misc/slim[pam]
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	# GitHub tarballs the package under a randomly named TLD.
+	mv * ${P}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc47.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFGDIR="${EPREFIX%/}/etc" \
+		MANDIR="${EPREFIX%/}/usr/share/man"
+		PREFIX="${EPREFIX%/}/usr"
+}