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

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 55 insertions, 25 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/Manifest b/media-tv/dvbstreamer/Manifest
index a781a95e904e..a43ab49b004f 100644
--- a/media-tv/dvbstreamer/Manifest
+++ b/media-tv/dvbstreamer/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX dvbstreamer-1.1-Werror.patch 1333 RMD160 947cf9482e4d86a400a7c59ecebb1d1ed22158c8 SHA1 242b4f4babc8874c172ceebf677b6087280d667b SHA256 c5f6548c9365720a9762a302d9a81ee257808a39529bcfaa9dc9e61a6e00e5fd
 DIST dvbstreamer-0.9.tar.bz2 868036 RMD160 eb8b4999edde8881e0f830296372c9044a18210e SHA1 33c690f4c00b8c76a5125f8199654bc171a05e73 SHA256 0c1a240dbebda26a49c447936c4741a0fdb08ac44c9e66017d4b225d0db6474b
 DIST dvbstreamer-1.1.tar.bz2 1215626 RMD160 084fc02ff35d011cfbc6eb72193d64968695eab4 SHA1 55f593e97cebb0be7046ca10cc79309aad3d7715 SHA256 52315b436f00174ab8feac262bc9217a213facb7a7c5298159084f754ab46a23
 EBUILD dvbstreamer-0.9.ebuild 950 RMD160 0303a990655d2fdea2b8da68ce18fc9d7cd8d990 SHA1 61599398a32e1a598a1fb213ef506e7817f6e0e3 SHA256 0bbf0f0698c0d9e4b4b90e9e298d15e3345c449e087f7bd2fe16ffedb46c1452
-EBUILD dvbstreamer-1.1.ebuild 944 RMD160 3a533e4a2cff4916f41fe0c184d995152c159f47 SHA1 181e6303e418ea39332d0e63295c9474f6c67913 SHA256 935d605225446e2f72cb990596aba58df2729112523fcbf2559871b25970b555
-MISC ChangeLog 1877 RMD160 9172e4fa74ea05fa94ab011dc3b66eead8c0f015 SHA1 7ab0068f7c9edf7f22fee1749c9b034868f0482c SHA256 874fa9d27534f457e2611a8e45bc4f2ceb186ba18dd42568916c7e835fb25af3
+EBUILD dvbstreamer-1.1.ebuild 986 RMD160 d867f542966f70796710c39217beb0bbb2712d71 SHA1 6b0da9255921a1eea26c8ce39045550b9dfffa2e SHA256 4a80e4caa988134a66a54965b26ec0bd2d4b9cc34cf1773d536e79af3360d8c5
+MISC ChangeLog 2060 RMD160 d1de82015e967d41fe1338232e90f9cd4fc74ae9 SHA1 90149f2613c474dfb14ce805739282cdd3f5de9d SHA256 9f72166c5bff6de20bc23b256f873e2714c07e6b41af08e18e315988be1c208a
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklqDZoACgkQkKaRLQcq0GIxmQCgp3v5VZZvnG1xrsC5erjZzy4V
-/MYAnREUm643eb/Qbtn3G+wzsnrynh6O
-=YWA6
------END PGP SIGNATURE-----
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@
+