Fix include directory wrt #204548. Respect CC and CFLAGS targets. Fix compiler QA warnings due to missing include stdlib.h.

(Portage version: 2.1.4_rc14)

4 files changed, 37 insertions, 29 deletions

diff --git a/x11-plugins/wmcp/ChangeLog b/x11-plugins/wmcp/ChangeLog
index 154a79fc41f0..938e6ffadec6 100644
--- a/x11-plugins/wmcp/ChangeLog
+++ b/x11-plugins/wmcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmcp
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.12 2007/07/22 05:16:39 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.13 2008/01/06 14:28:56 drac Exp $
+
+  06 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  -files/wmcp-1.2.8-makefile.patch, +files/wmcp-1.2.8-stdlibh.patch,
+  wmcp-1.2.8.ebuild:
+  Fix include directory wrt #204548. Respect CC and CFLAGS targets. Fix
+  compiler QA warnings due to missing include stdlib.h.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmcp-1.2.8.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-plugins/wmcp/files/wmcp-1.2.8-makefile.patch b/x11-plugins/wmcp/files/wmcp-1.2.8-makefile.patch
deleted file mode 100644
index 273dd23877ba..000000000000
--- a/x11-plugins/wmcp/files/wmcp-1.2.8-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN wmcp-1.2.8/Makefile wmcp-1.2.8-modified/Makefile
---- wmcp-1.2.8/Makefile	2002-10-04 09:40:22.000000000 -0500
-+++ wmcp-1.2.8-modified/Makefile	2002-10-04 09:46:45.000000000 -0500
-@@ -1,7 +1,7 @@
- 
- 
--INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
--LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
-+INCLUDES =-I/usr/X11R6/include/X11
-+LIBINC =-L/usr/X11R6/lib
- LIBS = -lm -lX11 -lXpm -lXext
- 
- TARGET  = wmcp
diff --git a/x11-plugins/wmcp/files/wmcp-1.2.8-stdlibh.patch b/x11-plugins/wmcp/files/wmcp-1.2.8-stdlibh.patch
new file mode 100644
index 000000000000..70d1c7c4e225
--- /dev/null
+++ b/x11-plugins/wmcp/files/wmcp-1.2.8-stdlibh.patch
@@ -0,0 +1,11 @@
+diff -ur wmcp-1.2.8.orig/wmcp.c wmcp-1.2.8/wmcp.c
+--- wmcp-1.2.8.orig/wmcp.c	1999-05-27 09:38:49.000000000 +0300
++++ wmcp-1.2.8/wmcp.c	2008-01-06 16:16:17.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <xpm.h>
+ #include <extensions/shape.h>
+ #include <keysym.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+ 
diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
index 0fd9ef7ec221..43a9273c9478 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
@@ -1,36 +1,40 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/wmcp-1.2.8.ebuild,v 1.16 2007/07/22 05:16:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/wmcp-1.2.8.ebuild,v 1.17 2008/01/06 14:28:56 drac Exp $
 
-inherit eutils
+inherit eutils multilib toolchain-funcs
 
-IUSE=""
 DESCRIPTION="A pager dockapp"
 HOMEPAGE="http://www.dockapps.com/file.php/id/158"
 SRC_URI="http://linux-sea.tucows.webusenet.com/files/x11/dock/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ia64 ppc ~sparc alpha hppa ~mips"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~sparc x86"
+IUSE=""
 
-DEPEND="x11-proto/xproto
-	x11-proto/xextproto
-	x11-libs/libX11
+RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile.patch
-	epatch ${FILESDIR}/${P}-gcc33.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc33.patch
+	epatch "${FILESDIR}"/${P}-stdlibh.patch
+	sed -i -e "s:gcc:$(tc-getCC):g" Makefile
 }
 
 src_compile() {
-	make || die "make failed"
+	emake -j1 INCLUDES="-I/usr/include/X11" \
+		LIBINC="-L/usr/$(get_libdir)" \
+		FLAGS="${CFLAGS}" || die "emake failed."
 }
 
 src_install() {
-	cd ${S}
 	dobin wmcp
 	dodoc README
 }