Respect CC, LDFLAGS, CFLAGS (bug #241548).

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 95 insertions, 13 deletions

diff --git a/x11-misc/xdesktopwaves/ChangeLog b/x11-misc/xdesktopwaves/ChangeLog
index 9feac7c1cece..50d1ce72054c 100644
--- a/x11-misc/xdesktopwaves/ChangeLog
+++ b/x11-misc/xdesktopwaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xdesktopwaves
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdesktopwaves/ChangeLog,v 1.13 2008/03/23 22:41:42 opfer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdesktopwaves/ChangeLog,v 1.14 2010/02/08 19:16:55 jer Exp $
+
+*xdesktopwaves-1.3-r1 (08 Feb 2010)
+
+  08 Feb 2010; Jeroen Roovers <jer@gentoo.org> +xdesktopwaves-1.3-r1.ebuild,
+  +files/xdesktopwaves-1.3-gentoo.patch:
+  Respect CC, LDFLAGS, CFLAGS (bug #241548).
 
   23 Mar 2008; Christian Faulhammer <opfer@gentoo.org>
   xdesktopwaves-1.3.ebuild:
diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest
index 3176669d7bab..c07ccbba3e04 100644
--- a/x11-misc/xdesktopwaves/Manifest
+++ b/x11-misc/xdesktopwaves/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xdesktopwaves-1.3-gentoo.patch 1166 RMD160 94f20fea97c3786f6b52cf26e835b28439505888 SHA1 70fe3c51c092baac9b8f478fe5277515a420d2b8 SHA256 fda0edda69eb62f3dcd3509af21fa02c83edbb7519e6cf3be0ffdb64f0e0c947
 DIST xdesktopwaves-1.3.tar.gz 49302 RMD160 9f0756ca3cb836ed8f0505ec1214631dbf97ed09 SHA1 96ec1ffcc163526901987c82549683b48cff0f14 SHA256 185a1fe56095610e95580713eec491ad1d93f4c89015ae612f214e1ccee51779
+EBUILD xdesktopwaves-1.3-r1.ebuild 1192 RMD160 69f27196831ab0f0ef9fcb45019bf406291a13a8 SHA1 6c23f61a173dfae28634d50ee1a7ed95eeda1a9f SHA256 7db65332b36432058d3f0d876fbd5a548e3061e000370e926806d5bf9beb6956
 EBUILD xdesktopwaves-1.3.ebuild 1089 RMD160 34d5ff9d0ace9fdd6099d9bb68da0cbe9e8dda33 SHA1 d006b4234f57944443bfb01b0819e53eb6f88f1e SHA256 480a41a94674359a1e67fa7df1b71e0e5b7515299078862000514fcd99d044ac
-MISC ChangeLog 1892 RMD160 0e37879430467198d59d288ac630b175669d3c3b SHA1 7829a3b756bbf143de3dc985a9fa872e71b1d0d4 SHA256 fb363a9fee581f03d3edad1ad9f800b309766b95838e801c3ca87fac76080e9a
+MISC ChangeLog 2091 RMD160 e29f2b5cef2781705909313e64f1544417ba0c84 SHA1 07dd9656a8b057a3adc2c3e8ec318b834fbd5817 SHA256 f29bea144fdde5d7eed3fb11a321ee2a7de11c961652873a72d7767a4030e54c
 MISC metadata.xml 471 RMD160 4e961b33f00947d1d9dd2950a3d48579e32631c4 SHA1 6fba4fa6edd7fa28320b498072f4726df738a6ea SHA256 354d454f50bb1015f8aa79635f7b4d5042d08151d6c367ae636f7c0a6fea46dd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH5t1TNQqtfCuFneMRAuJBAJ4jYjeWYWIFbYeUdChaCBdE8ZgNKACgnvFk
-A+RhUw2Bu3o++NzEOoQS0uE=
-=1tmH
------END PGP SIGNATURE-----
diff --git a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
new file mode 100644
index 000000000000..accbb4d9baec
--- /dev/null
+++ b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
@@ -0,0 +1,38 @@
+--- xdesktopwaves-1.3/Makefile.org	2004-12-18 06:47:40.000000000 +0100
++++ xdesktopwaves-1.3/Makefile	2010-02-08 20:05:31.000000000 +0100
+@@ -11,14 +11,13 @@
+ 
+ #=========================== C compiler configuration ==========================
+ 
+-CC     = gcc
+-CFLAGS = -I/usr/X11R6/include -O2
++CFLAGS += $(shell pkg-config --cflags x11 xext)
+ 
+ #============================= Linker configuration ============================
+ 
+-LINK   = gcc
+-LFLAGS = -L/usr/X11R6/lib
+-LIBS   = -lm -lX11 -lXext
++LINK   = $(CC)
++LFLAGS = $(LDFLAGS)
++LIBS   = -lm $(shell pkg-config --libs x11 xext)
+ 
+ #============================ Installer configuration ==========================
+ 
+--- xdesktopwaves-1.3/xdwapi/Makefile.org	2004-12-18 06:47:40.000000000 +0100
++++ xdesktopwaves-1.3/xdwapi/Makefile	2010-02-08 20:08:14.000000000 +0100
+@@ -1,10 +1,9 @@
+ # Makefile for the xdesktopwaves API and its demo program
+ 
+-CC     = gcc
+-CFLAGS = -I/usr/X11R6/include -O2
+-LINK   = gcc
+-LFLAGS = -L/usr/X11R6/lib
+-LIBS   = -lm -lX11
++CFLAGS += $(shell pkg-config --cflags x11 xext)
++LINK   = $(CC)
++LFLAGS = $(LDFLAGS)
++LIBS   = -lm $(shell pkg-config --libs x11 xext)
+ 
+ all: xdwapidemo
+ 
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild
new file mode 100644
index 000000000000..ccc2328ff03d
--- /dev/null
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild,v 1.1 2010/02/08 19:16:55 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water"
+HOMEPAGE="http://xdesktopwaves.sourceforge.net/"
+LICENSE="GPL-2"
+RDEPEND="x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "failed building program"
+	cd xdwapi
+	emake || die "failed building demo"
+}
+
+src_install() {
+	dobin xdesktopwaves xdwapi/xdwapidemo
+	doman xdesktopwaves.1
+	insinto /usr/share/pixmaps
+	doins xdesktopwaves.xpm
+	make_desktop_entry xdesktopwaves "xdesktopwaves" xdesktopwaves.xpm
+	dodoc README
+}
+
+pkg_preinst() {
+	elog "To see what xdesktopwaves is able to do, start it by running"
+	elog "'xdesktopwaves' and then run 'xdwapidemo'. You should see the"
+	elog "supported effects on your desktop"
+}