use econf, dont build with -ansi as it uses non ansi stuff, bug #241000, honour ldflags and cc, fix implicit declarations warnings

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

5 files changed, 62 insertions, 12 deletions

diff --git a/net-misc/shout/ChangeLog b/net-misc/shout/ChangeLog
index 770573eccf3c..b7826b5d20d5 100644
--- a/net-misc/shout/ChangeLog
+++ b/net-misc/shout/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/shout
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/ChangeLog,v 1.15 2007/02/09 08:13:09 flameeyes Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/ChangeLog,v 1.16 2008/12/19 19:04:16 aballier Exp $
+
+  19 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/implicitdecls.patch, +files/ldflags.patch, shout-0.8.0-r2.ebuild:
+  use econf, dont build with -ansi as it uses non ansi stuff, bug #241000,
+  honour ldflags and cc, fix implicit declarations warnings
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-misc/shout/Manifest b/net-misc/shout/Manifest
index 4bca77938230..84b523aba8b4 100644
--- a/net-misc/shout/Manifest
+++ b/net-misc/shout/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX implicitdecls.patch 294 RMD160 affeddab38578ea6a593f20f7992992e94f81e6b SHA1 86dd0b9810d0b5664ad8a431ccc13cbc2df892f0 SHA256 d6682eb4eae810502736dc56d5bd6f9eb1d12a1eada0bd8ae1ef25c2ae268e35
+AUX ldflags.patch 653 RMD160 7fb78d7985ce5bd3c24d17d846eb625b2fc8374a SHA1 f5a61610c682efcb49c03523355760f9abecd56b SHA256 9318a544d3606c07107f30edbe44409aac9e0f8a7038aa024cd95b021882f34f
 AUX variables.diff 1142 RMD160 71d58c6d31b30910dfdaea33378cf6dbac849beb SHA1 a1397b00e45680de64746c67845ba6d758bc7a0d SHA256 45b05676eb7f85040111d0f4778e15648ba0b54b6812482a8336eab84707536d
 DIST shout-0.8.0.tar.gz 66394 RMD160 3fd2173eff61954b183f0f80191808bdfdea7ae4 SHA1 6df3755e7292daa3133e6fff7ba74711ec06bf16 SHA256 7b36712730c370f7d25271ca93291f9055bb90ee3052e7aec33b5dae205d8227
-EBUILD shout-0.8.0-r2.ebuild 1016 RMD160 38a3f2ec6a3fb653a6c26b823aa61f5e4c0129ff SHA1 aac08e25950a86544fcd446aa3f0195a0a8a041b SHA256 45cd7d685b195749d17311d80933c690549776edd5601c326acba542884061cc
-MISC ChangeLog 2262 RMD160 6436f2286cad48471cccf06a0284446191d18940 SHA1 1f5321996b4414f852c2791015c6fa578a7b6852 SHA256 6bc582a859613462a9919fd24afb70089ad693e189cad73c836ab85193a23305
+EBUILD shout-0.8.0-r2.ebuild 1084 RMD160 4d34c6246551b491fc4e69d892614047bb72e749 SHA1 6dfab209db486bce8cdc2b896cbbc96be647cda0 SHA256 20463e16f7d15bcdf5d61e6f63184ecc883259a81cef52189e3e0d65722a4b23
+MISC ChangeLog 2524 RMD160 a11ee522583d7d18fd551ad1cc9105c9de0ffdc8 SHA1 19b6702b60e03afe803de55ee14433b94a013d90 SHA256 ce8cef9ade24613b382bd2af747f8147437ec3e6338888d0ccf4eadabf9c7961
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklL8DYACgkQvFcC4BYPU0ogHACbBYZpdF7tkpBwWr0qBLMjsj8z
+z/kAn0ZVmfG12lCFw1GM7jL6yjKBEMRD
+=LeXH
+-----END PGP SIGNATURE-----
diff --git a/net-misc/shout/files/implicitdecls.patch b/net-misc/shout/files/implicitdecls.patch
new file mode 100644
index 000000000000..b7a6999f121e
--- /dev/null
+++ b/net-misc/shout/files/implicitdecls.patch
@@ -0,0 +1,12 @@
+Index: shout-0.8.0/sock.c
+===================================================================
+--- shout-0.8.0.orig/sock.c
++++ shout-0.8.0/sock.c
+@@ -25,6 +25,7 @@
+ #include <arpa/inet.h>
+ #include <sys/time.h>
+ #include <unistd.h>
++#include <string.h>
+ #endif /* !win32 */
+ 
+ #include "sock.h"
diff --git a/net-misc/shout/files/ldflags.patch b/net-misc/shout/files/ldflags.patch
new file mode 100644
index 000000000000..3d049d98d318
--- /dev/null
+++ b/net-misc/shout/files/ldflags.patch
@@ -0,0 +1,21 @@
+Index: shout-0.8.0/Makefile.in
+===================================================================
+--- shout-0.8.0.orig/Makefile.in
++++ shout-0.8.0/Makefile.in
+@@ -2,7 +2,6 @@
+ 
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+-LDFLAGS = @LIBS@
+ 
+ SHELL=/bin/sh
+ 
+@@ -26,7 +25,7 @@ COMPILE_CFLAGS=$(CFLAGS) $(DEFS) 
+ all: shout
+ 
+ shout: shout.c rand.o mpeg.o configfile.o sock.o util.o
+-	$(CC) $(COMPILE_CFLAGS) -o shout shout.c rand.o mpeg.o configfile.o sock.o util.o $(LDFLAGS)
++	$(CC) $(COMPILE_CFLAGS) $(LDFLAGS) -o shout shout.c rand.o mpeg.o configfile.o sock.o util.o @LIBS@
+ 
+ configfile.o: configfile.c
+ 	$(CC) $(COMPILE_CFLAGS) -c -o configfile.o configfile.c
diff --git a/net-misc/shout/shout-0.8.0-r2.ebuild b/net-misc/shout/shout-0.8.0-r2.ebuild
index d70c8c7fab0b..36c2cf937b9d 100644
--- a/net-misc/shout/shout-0.8.0-r2.ebuild
+++ b/net-misc/shout/shout-0.8.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0-r2.ebuild,v 1.6 2008/12/03 06:32:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0-r2.ebuild,v 1.7 2008/12/19 19:04:16 aballier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Shout is a program for creating mp3 stream for use with icecast or shoutcast"
 HOMEPAGE="http://www.icecast.org"
@@ -17,16 +17,16 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/variables.diff
+	epatch "${FILESDIR}"/ldflags.patch
+	epatch "${FILESDIR}"/implicitdecls.patch
 	rm -f sock.o
+	sed -i -e "s/-ansi//" configure
 }
 
 src_compile() {
-	./configure --prefix=/usr \
-		--host=${CHOST} \
-		--sysconfdir=/etc/shout \
-		--localstatedir=/var \
-		|| die "econf failed."
-
+	tc-export CC
+	econf --sysconfdir=/etc/shout \
+		--localstatedir=/var
 	emake || die "emake failed."
 }