Fix building with GCC 4.4+ by removing -Werror wrt #260919.

(Portage version: 2.2_rc36/cvs/Linux x86_64)

3 files changed, 52 insertions, 13 deletions

diff --git a/media-tv/dvbstreamer/ChangeLog b/media-tv/dvbstreamer/ChangeLog
index 7bcaf502baef..0fbe83b5b4fa 100644
--- a/media-tv/dvbstreamer/ChangeLog
+++ b/media-tv/dvbstreamer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/dvbstreamer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstreamer/ChangeLog,v 1.11 2009/01/11 15:17:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstreamer/ChangeLog,v 1.12 2009/08/10 07:53:09 ssuominen Exp $
+
+  10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  dvbstreamer-1.1.ebuild, +files/dvbstreamer-1.1-Werror.patch:
+  Fix building with GCC 4.4+ by removing -Werror wrt #260919.
 
   11 Jan 2009; Markus Meier <maekke@gentoo.org> dvbstreamer-0.9.ebuild:
   x86 stable, bug #236103
diff --git a/media-tv/dvbstreamer/dvbstreamer-1.1.ebuild b/media-tv/dvbstreamer/dvbstreamer-1.1.ebuild
index 49887756f1de..426a97ea4cab 100644
--- a/media-tv/dvbstreamer/dvbstreamer-1.1.ebuild
+++ b/media-tv/dvbstreamer/dvbstreamer-1.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstreamer/dvbstreamer-1.1.ebuild,v 1.3 2009/01/10 17:56:00 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstreamer/dvbstreamer-1.1.ebuild,v 1.4 2009/08/10 07:53:09 ssuominen Exp $
 
-EAPI="1"
-
-inherit multilib
+EAPI=2
+inherit autotools eutils multilib
 
 DESCRIPTION="DVB over UDP streaming solution"
 HOMEPAGE="http://dvbstreamer.sourceforge.net/"
@@ -17,23 +16,23 @@ IUSE=""
 
 RDEPEND="dev-db/sqlite:3
 	sys-libs/readline"
-
 DEPEND="${RDEPEND}
 	media-tv/linuxtv-dvb-headers"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	# delete unneeded linking against libtermcap
-	sed -i "${S}"/src/Makefile* -e 's:-ltermcap::'
+	sed -i -e 's:-ltermcap::' src/Makefile.am || die "sed failed"
+	epatch "${FILESDIR}"/${P}-Werror.patch
+	AT_NO_RECURSIVE="yes" eautoreconf
 }
 
-src_compile() {
-	econf --libdir=/usr/$(get_libdir) || die "configure failed"
-	emake || die "make failed"
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	rm -rf "${D}"/usr/doc/
 
 	dodoc doc/*.txt ChangeLog README AUTHORS NEWS TODO
diff --git a/media-tv/dvbstreamer/files/dvbstreamer-1.1-Werror.patch b/media-tv/dvbstreamer/files/dvbstreamer-1.1-Werror.patch
new file mode 100644
index 000000000000..182b4ca6b3d2
--- /dev/null
+++ b/media-tv/dvbstreamer/files/dvbstreamer-1.1-Werror.patch
@@ -0,0 +1,36 @@
+diff -ur dvbstreamer-1.1.orig/src/dvbpsi/Makefile.am dvbstreamer-1.1/src/dvbpsi/Makefile.am
+--- dvbstreamer-1.1.orig/src/dvbpsi/Makefile.am	2008-10-31 16:25:01.000000000 +0200
++++ dvbstreamer-1.1/src/dvbpsi/Makefile.am	2009-08-10 10:49:55.000000000 +0300
+@@ -1,7 +1,7 @@
+ AM_CFLAGS =\
+      -I$(top_srcdir)/include \
+      -I$(top_srcdir)/include/dvbpsi \
+-     -Wall -Werror
++     -Wall
+      
+ noinst_LIBRARIES = libdvbpsi.a 
+ 
+diff -ur dvbstreamer-1.1.orig/src/Makefile.am dvbstreamer-1.1/src/Makefile.am
+--- dvbstreamer-1.1.orig/src/Makefile.am	2008-10-31 16:25:02.000000000 +0200
++++ dvbstreamer-1.1/src/Makefile.am	2009-08-10 10:50:04.000000000 +0300
+@@ -3,7 +3,7 @@
+ INCLUDES = @INCLTDL@
+ 
+ AM_CFLAGS =\
+-     -I$(top_srcdir)/include -Wall -Werror -D_GNU_SOURCE 
++     -I$(top_srcdir)/include -Wall -D_GNU_SOURCE 
+ 
+ 
+ bin_PROGRAMS = dvbstreamer dvbctrl setupdvbstreamer
+diff -ur dvbstreamer-1.1.orig/src/plugins/Makefile.am dvbstreamer-1.1/src/plugins/Makefile.am
+--- dvbstreamer-1.1.orig/src/plugins/Makefile.am	2008-10-31 16:24:58.000000000 +0200
++++ dvbstreamer-1.1/src/plugins/Makefile.am	2009-08-10 10:50:17.000000000 +0300
+@@ -2,7 +2,7 @@
+ # Plugins
+ #
+ AM_CFLAGS =\
+-     -I$(top_srcdir)/include  -Wall -Werror -D_GNU_SOURCE
++     -I$(top_srcdir)/include  -Wall -D_GNU_SOURCE
+ 
+ pluginsdir = @DVBSTREAMER_PLUGINDIR@
+