Respect CC, LDFLAGS (bug #268493). Change HOMEPAGE.

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

4 files changed, 35 insertions, 8 deletions

diff --git a/www-plugins/libflashsupport/ChangeLog b/www-plugins/libflashsupport/ChangeLog
index 4bfe30751cbd..4261f8da51a0 100644
--- a/www-plugins/libflashsupport/ChangeLog
+++ b/www-plugins/libflashsupport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/libflashsupport
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/ChangeLog,v 1.3 2009/12/28 15:18:27 lack Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/ChangeLog,v 1.4 2010/02/08 20:38:25 jer Exp $
+
+  08 Feb 2010; Jeroen Roovers <jer@gentoo.org> libflashsupport-1.2.ebuild,
+  +files/libflashsupport-1.2-gentoo.patch:
+  Respect CC, LDFLAGS (bug #268493). Change HOMEPAGE.
 
   10 Dec 2009; Jim Ramsay <lack@gentoo.org> libflashsupport-1.2.ebuild:
   Block >=www-plugins/adobe-flash-10, this is only needed for flash-9
diff --git a/www-plugins/libflashsupport/Manifest b/www-plugins/libflashsupport/Manifest
index c3cddb8273a9..bf889d28146b 100644
--- a/www-plugins/libflashsupport/Manifest
+++ b/www-plugins/libflashsupport/Manifest
@@ -1,5 +1,6 @@
 AUX libflashsupport-1.2-asneeded.patch 580 RMD160 d01293e8235a1e9f22fa9417079430add85c2c27 SHA1 88ada2de98fe1d566092b97da990c8fa7a675735 SHA256 d639ec064feb8065ee95dbae0e0f4faff02d140c99b990e622063cb2ed0d7a63
+AUX libflashsupport-1.2-gentoo.patch 652 RMD160 8c700ac88c9efc30a83acedd54484ec0abe115ab SHA1 1ce554fcef350d8993e969c4754ec486931b1497 SHA256 583caede29bcee5c3e2b99b17f612c051b4ff4e8268135b514adc0c5a802e64d
 DIST libflashsupport-1.2.tar.bz2 13381 RMD160 0b4936a4bf80078247ccc8f0bcca4827774768c6 SHA1 1bfd7f48ac4031c9936bf3799cf2ea615a678bca SHA256 343dd2726944adb84fe175b0f638ab078fa29fcfccb5700eb1ca34f42eaf9154
-EBUILD libflashsupport-1.2.ebuild 2273 RMD160 c3a3ac3db07e68c93c295b20e6e972eb56615325 SHA1 faf7ba43d6d6edf440231e2e6073f30ac53f4303 SHA256 6bab7458e9011791ce1c560410229c80960546c1b5cd4c59a66877685cb638ed
-MISC ChangeLog 1205 RMD160 f7b6ec0c022480c970bd5f56e2585abcd941ed20 SHA1 76d0374aac274bc23261a1824f03649b4fbb7222 SHA256 b41b0b36ee854b871c6ab57eb3057bbe08d752cb43322dc2a19954422b1d1a09
+EBUILD libflashsupport-1.2.ebuild 2341 RMD160 3e13d712b11bc1563b43791b416339b00bed1211 SHA1 3557bb32870e45203f5e8fbc68264509af140bad SHA256 45eb071b69b0f30c6ef61b6db78f8ba48d8171cdf1a74426cf7920525b3bfd9e
+MISC ChangeLog 1377 RMD160 611fa46cb74cef5cd69a73783cafa3b136bfa6d8 SHA1 b055394d8dd4755925807815e601976b669640f9 SHA256 92f7beff59dc063df9b6233faebd4633249934b76fbb4609d4d587dbb0b7ee1e
 MISC metadata.xml 254 RMD160 1f5a6322e4956b30592a1e0caf7edc67613ecc43 SHA1 f0813ac26740fae9e0f0899b5dad74b5a6fd5b3c SHA256 740784d71bef88214e4d8508e351a376d8908f4c4b6175d98b6b77e107799f12
diff --git a/www-plugins/libflashsupport/files/libflashsupport-1.2-gentoo.patch b/www-plugins/libflashsupport/files/libflashsupport-1.2-gentoo.patch
new file mode 100644
index 000000000000..478220db341d
--- /dev/null
+++ b/www-plugins/libflashsupport/files/libflashsupport-1.2-gentoo.patch
@@ -0,0 +1,20 @@
+--- libflashsupport-1.2/Makefile.org	2010-02-08 21:30:35.000000000 +0100
++++ libflashsupport-1.2/Makefile	2010-02-08 21:34:35.000000000 +0100
+@@ -1,6 +1,6 @@
+ #Default flags
+-CC=gcc
+-CFLAGS=-fPIC -shared -O2 -Wall -Werror 
++CC ?= gcc
++CFLAGS += -fPIC -shared -Wall
+ LIBS=-lpthread
+ 
+ #Define library directory
+@@ -49,7 +49,7 @@
+ all: libflashsupport.so
+ 
+ libflashsupport.so: flashsupport.c
+-	$(CC) $(CFLAGS) $(LIBS) -DLIBDIR=$(LIBDIR) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -DLIBDIR=$(LIBDIR) \
+ 	flashsupport.c -o libflashsupport.so \
+ 	$(ALSA) $(ALSALIBS) $(PULSE) $(LIBPULSEPATH) $(ESD) $(LIBESDPATH) \
+ 	$(OSS) $(SSL) $(SSLLIBS) $(V4L) $(ICULIBS)
diff --git a/www-plugins/libflashsupport/libflashsupport-1.2.ebuild b/www-plugins/libflashsupport/libflashsupport-1.2.ebuild
index b27587d5b4fd..9c2058b73fd1 100644
--- a/www-plugins/libflashsupport/libflashsupport-1.2.ebuild
+++ b/www-plugins/libflashsupport/libflashsupport-1.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/libflashsupport-1.2.ebuild,v 1.3 2009/12/28 15:18:27 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/libflashsupport-1.2.ebuild,v 1.4 2010/02/08 20:38:25 jer Exp $
 
-inherit multilib eutils
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Adds pulseaudio/esd/oss audio output and HTTPS/RTMPS support to
 Adobe Flash 9"
-HOMEPAGE="http://pulseaudio.revolutionlinux.com/PulseAudio"
+HOMEPAGE="http://pulseaudio.org/wiki/FlashPlayer9Solution"
 SRC_URI="https://svn.revolutionlinux.com/MILLE/XTERM/trunk/libflashsupport/Tarballs/${P}.tar.bz2"
 
 LICENSE="Adobe-SourceCode"
@@ -32,9 +32,11 @@ src_unpack() {
 		README flashsupport.c || die "sed failed"
 
 	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
+	tc-export CC
 	if use pulseaudio; then
 		export LIBPULSEPATH="-DLIBPULSEPATH='\"libpulse-simple.so.0\"'"
 		export PULSE="-DPULSEAUDIO"