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

Package-Manager: portage-2.1.4_rc14

5 files changed, 49 insertions, 41 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/Manifest b/x11-plugins/wmcp/Manifest
index 356c77e17806..82b7be99bb6b 100644
--- a/x11-plugins/wmcp/Manifest
+++ b/x11-plugins/wmcp/Manifest
@@ -2,19 +2,19 @@ AUX wmcp-1.2.8-gcc33.patch 2397 RMD160 da34709258fc09eb77479c648beebef80e076165
 MD5 58db56f4ed82092432d3db3cc07748da files/wmcp-1.2.8-gcc33.patch 2397
 RMD160 da34709258fc09eb77479c648beebef80e076165 files/wmcp-1.2.8-gcc33.patch 2397
 SHA256 a5270ed4bd8f66017584e8204db750c8b2a810240088e032fd1f61aa96e79d9c files/wmcp-1.2.8-gcc33.patch 2397
-AUX wmcp-1.2.8-makefile.patch 446 RMD160 40d0f7a7fec599643df21189996bfa36c8eb2502 SHA1 53e2c6f1267d6843e3e7050e54580984a78ef47e SHA256 a2cc0fa6bef5c787ef5cd30cc7bcb9d4a8aac9e2fcd0718e9bf5b224f6195fa3
-MD5 bdcccfed4408157d33483585f88c7ccc files/wmcp-1.2.8-makefile.patch 446
-RMD160 40d0f7a7fec599643df21189996bfa36c8eb2502 files/wmcp-1.2.8-makefile.patch 446
-SHA256 a2cc0fa6bef5c787ef5cd30cc7bcb9d4a8aac9e2fcd0718e9bf5b224f6195fa3 files/wmcp-1.2.8-makefile.patch 446
+AUX wmcp-1.2.8-stdlibh.patch 321 RMD160 6e72ee260707fd123f22c2ac17254733ead5946e SHA1 0b4896a35e48fb1eb47ed5ea109b1bdf1ccd74a8 SHA256 39a92248f4563540c419096a3df2a2fb15f4bec0419a87ac2447eb882773c40b
+MD5 8d29a3df923e68666b3893126b609343 files/wmcp-1.2.8-stdlibh.patch 321
+RMD160 6e72ee260707fd123f22c2ac17254733ead5946e files/wmcp-1.2.8-stdlibh.patch 321
+SHA256 39a92248f4563540c419096a3df2a2fb15f4bec0419a87ac2447eb882773c40b files/wmcp-1.2.8-stdlibh.patch 321
 DIST wmcp-1.2.8.tar.gz 8673 RMD160 bb3f2fce429cb2c27d66c4eb67400d987bb993b5 SHA1 b2a249b63fec6a2e0931f01413f8e6e0fb6631e0 SHA256 2ecaee806442057d515c760ac58353c4b4cec41252a22e223a5b079776d55d31
-EBUILD wmcp-1.2.8.ebuild 797 RMD160 e21845f91c56e74ac871f3744766fb8d0b7fca09 SHA1 d3f18ec2ab12c8fc7da65b4301e8f914525587b0 SHA256 e1deb2aaddbf2ed6664f2c51394ebffd43a803b7ef4185d02b13134aec12fd12
-MD5 7371a3b1b5ab9eab4cb80fcf53f7a9a8 wmcp-1.2.8.ebuild 797
-RMD160 e21845f91c56e74ac871f3744766fb8d0b7fca09 wmcp-1.2.8.ebuild 797
-SHA256 e1deb2aaddbf2ed6664f2c51394ebffd43a803b7ef4185d02b13134aec12fd12 wmcp-1.2.8.ebuild 797
-MISC ChangeLog 1588 RMD160 eefb8224b78920846c5b69fb43da7db1aacc5a69 SHA1 279b6ee0a534c161dfbc8d0c78494f0d811c047b SHA256 895eea900b4ba2e9d25d5d10402b18e30c1558a499f332a96d4cf17770cc1acd
-MD5 985bcadf3b90ece44a360b0821fff00d ChangeLog 1588
-RMD160 eefb8224b78920846c5b69fb43da7db1aacc5a69 ChangeLog 1588
-SHA256 895eea900b4ba2e9d25d5d10402b18e30c1558a499f332a96d4cf17770cc1acd ChangeLog 1588
+EBUILD wmcp-1.2.8.ebuild 970 RMD160 cbdc993fa3f6b3455c9ca40a1fe4bee4d0bc8316 SHA1 e8a482d2e9790604d5881466b6e3085f6fefc578 SHA256 383907433cebaf2beeb54732b1540d488965a01789cf5dccd36d7797b7e373e7
+MD5 950ac488b29c7066ae31d6f92be08153 wmcp-1.2.8.ebuild 970
+RMD160 cbdc993fa3f6b3455c9ca40a1fe4bee4d0bc8316 wmcp-1.2.8.ebuild 970
+SHA256 383907433cebaf2beeb54732b1540d488965a01789cf5dccd36d7797b7e373e7 wmcp-1.2.8.ebuild 970
+MISC ChangeLog 1851 RMD160 1a3874ad0964f165a51a85215d653201cf5feba2 SHA1 dea49e9c2d7e9dd4dc93753442ca726ff61f22ef SHA256 62b9dadf46f5ec4be59b51ff7413c0e9106c2f5dc50a9014203f6031da77b582
+MD5 31600c57594a1c41c05ecfedfc9e3c95 ChangeLog 1851
+RMD160 1a3874ad0964f165a51a85215d653201cf5feba2 ChangeLog 1851
+SHA256 62b9dadf46f5ec4be59b51ff7413c0e9106c2f5dc50a9014203f6031da77b582 ChangeLog 1851
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
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
 }