Fixed compilation with gcc-3.4, Thanks to Peter Alfredsen <peter.alfredsen@gmail.com> for the patch, Bug #220165. Fixed quoting.

Package-Manager: portage-2.1.5_rc6

4 files changed, 45 insertions, 8 deletions

diff --git a/media-libs/libdvb/ChangeLog b/media-libs/libdvb/ChangeLog
index e265856822d7..3271ee29d56a 100644
--- a/media-libs/libdvb/ChangeLog
+++ b/media-libs/libdvb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libdvb
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.39 2007/07/01 03:06:32 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.40 2008/05/04 04:33:41 zzam Exp $
+
+  04 May 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/libdvb-0.5.5.1-gcc43.patch, libdvb-0.5.5.1-r3.ebuild:
+  Fixed compilation with gcc-3.4, Thanks to Peter Alfredsen
+  <peter.alfredsen@gmail.com> for the patch, Bug #220165. Fixed quoting.
 
   01 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   +files/digest-libdvb-0.5.5.1-r2, +files/digest-libdvb-0.5.5.1-r3,
diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
index 3f34f0507eb5..31eeb596fe6a 100644
--- a/media-libs/libdvb/Manifest
+++ b/media-libs/libdvb/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libdvb-0.5.5.1-autotools.patch 17596 RMD160 71fd8bd22cba0f0f54d6a0693405e2f24b2d2fc1 SHA1 59e5f4df8f74a4f6ea8505cebfc7b4cb9dd14f7c SHA256 181b6adfd615e8a82ba9c5b5f9ac547b2d4ff38a7dbdbeb5fe73a376d636dab1
+AUX libdvb-0.5.5.1-gcc43.patch 565 RMD160 fe4b3cb315f61b5370e5543ab005affad1857575 SHA1 f734790f3f7a8533cef51d28454f2f328636b52a SHA256 79ee130a6ea603a49957e4ca406c2b4236b0ba9b55714a674b09837ff1e94838
 AUX libdvb-0.5.5.1-gentoo-file-collisions.patch 4796 RMD160 5a1560aa05affc1eff09f71ff04f66971615057e SHA1 8a5f8b379b08c20da95fc4e8866012344ebf354a SHA256 61f350d5af255a621e32682c7634b6a778cfb475ece2bcf30d50552c3ade2d04
 AUX libdvb-0.5.5.1-gentoo.patch 1052 RMD160 16b94bbb5ccf30208dddeb778679599b18c5c788 SHA1 c8178b20313af38b397ce1a7eaa3ba909d27beff SHA256 371d977bca97c3f3c5649980108e4f5a74da5c9560cbc1debc0edfc1a34d0cde
 AUX libdvb-0.5.5.1-rename-analyze.patch 4785 RMD160 84e31e5ee8851a1fd05ae14cbddb5a1ae2f7dfdc SHA1 eae40f92d2967202e3031a1d7c20d3674674f453 SHA256 f240a8e3dc7284813e5cbf95edb811020df5b914e5f21b7fa4fecf33d1537b2c
 DIST libdvb-0.5.5.1.tar.gz 312295 RMD160 d6d938fb0dee08de632c25ad134f944fe3dfcddb SHA1 9f62be81e220a1902d4f7f80fe1330ca4ee655e4 SHA256 941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a
 EBUILD libdvb-0.5.5.1-r2.ebuild 1266 RMD160 678ec6159bc4075cec9de96ca24abd237d522ab6 SHA1 7d9be6164b043e46ab61ff9ceb9091555d8acc4c SHA256 30d3dcdb0e6b8bfaa9949bb3135fc58b1c301ee87810ac882a361e1e5c3c1b37
-EBUILD libdvb-0.5.5.1-r3.ebuild 1322 RMD160 0be2a9b0813031bc370d22f211b4bf699a214a6e SHA1 60483b936a8c55a8a3fae6960ea01a432f21ab28 SHA256 c1cd157c1c7577cbbeed2db6afa968d97f580243f5d3f3484dfae137e71e7172
-MISC ChangeLog 6996 RMD160 d88e909790eb0a8e5f45cc1d20e4cacc48b71de4 SHA1 d1e19671e9e4cf6ae6079d66312e6eefd3220604 SHA256 41b72442a1ce71396409c11688f2f5bcd0cd320475f83c60f0034c21a045754b
+EBUILD libdvb-0.5.5.1-r3.ebuild 1364 RMD160 e41498c3304b99ced64557f2e11c98062e1d7463 SHA1 941d0e98dfcf248f2c610cb639702d41b3aed54f SHA256 7ab62148f2e877637f9e624b1bc97ae80bfdfda10419ba06770cbeab52a5b26a
+MISC ChangeLog 7245 RMD160 5a5c563c2691eef0eb9ccced6083d8022a81569e SHA1 cc4b3966963c19204c12e3cdbcfb117d5c1da42b SHA256 3c84212e2f5d715fa61b52d4c35152684d6cd62ffc8e6c545c04a93ff40cbca1
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgdPKsACgkQt2vP6XvVdOc0BwCbBnD+cd+qehOS1XG+FEWmLHDX
+pt4AoL9WbqCnZHRhKvCC6Ia1mv5SNI65
+=GCsB
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch
new file mode 100644
index 000000000000..8f9ea6b76d6e
--- /dev/null
+++ b/media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch
@@ -0,0 +1,20 @@
+--- libdvb-0.5.5.1.orig/sample_progs/cam_menu.hh    2008-01-28 10:23:53.000000000 +0100
++++ libdvb-0.5.5.1/sample_progs/cam_menu.hh         2008-01-28 10:22:55.000000000 +0100
+@@ -2,6 +2,7 @@
+  * cam_menu.hh
+  *
+  */
++#include <cstring>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+
+--- libdvb-0.5.5.1.orig/libdvbmpeg/ringbuffy.c	2007-03-16 17:53:31.000000000 +0100
++++ libdvb-0.5.5.1/libdvbmpeg/ringbuffy.c	2007-03-16 17:54:10.000000000 +0100
+@@ -19,6 +19,7 @@
+ */
+ 
+ #include "ringbuffy.h"
++#include <string.h>
+ 
+ int ring_init (ringbuffy *rbuf, int size)
+ {
diff --git a/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild b/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild
index 018c02f0d51d..e4979c414144 100644
--- a/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild,v 1.8 2007/06/29 07:18:14 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild,v 1.9 2008/05/04 04:33:41 zzam Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -24,6 +24,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-autotools.patch"
 	epatch "${FILESDIR}/${P}-rename-analyze.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 
 	eautoreconf
 }
@@ -33,10 +34,10 @@ src_install() {
 	insinto /usr/$(get_libdir)
 	make DESTDIR="${D}" PREFIX=/usr LIBDIR=$(get_libdir) install || die "Problem at make install"
 
-	cd ${D}/usr/bin
+	cd "${D}"/usr/bin
 	mv dia dia_dvb
 
-	cd ${S}
+	cd "${S}"
 	if use doc; then
 		insinto "/usr/share/doc/${PF}/sample_progs"
 		doins sample_progs/*