Add missing vdr-plugin.eclass call, Bug #277051. Fix compilation with gcc-4.4

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 31 insertions, 5 deletions

diff --git a/media-plugins/vdr-atscepg/ChangeLog b/media-plugins/vdr-atscepg/ChangeLog
index 218298fd4011..04e0eb406d6b 100644
--- a/media-plugins/vdr-atscepg/ChangeLog
+++ b/media-plugins/vdr-atscepg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-atscepg
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-atscepg/ChangeLog,v 1.1 2008/03/24 09:55:01 hd_brummy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-atscepg/ChangeLog,v 1.2 2009/07/08 19:21:05 zzam Exp $
+
+  08 Jul 2009; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-atscepg-0.1.1.ebuild, +files/vdr-atscepg-0.1.1-gcc-4.4.diff:
+  Add missing vdr-plugin.eclass call, Bug #277051. Fix compilation with
+  gcc-4.4
 
 *vdr-atscepg-0.1.1 (24 Mar 2008)
 
diff --git a/media-plugins/vdr-atscepg/files/vdr-atscepg-0.1.1-gcc-4.4.diff b/media-plugins/vdr-atscepg/files/vdr-atscepg-0.1.1-gcc-4.4.diff
new file mode 100644
index 000000000000..01b8cdd1d5fc
--- /dev/null
+++ b/media-plugins/vdr-atscepg/files/vdr-atscepg-0.1.1-gcc-4.4.diff
@@ -0,0 +1,18 @@
+Index: atscepg-0.1.1/structs.cpp
+===================================================================
+--- atscepg-0.1.1.orig/structs.cpp
++++ atscepg-0.1.1/structs.cpp
+@@ -1,4 +1,5 @@
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "structs.h"
+ 
+@@ -159,6 +160,7 @@ const Channel& Channel::operator= (const
+   minorChannelNumber  = arg.minorChannelNumber;
+   free(short_name);
+   short_name          = strdup(arg.short_name);
++  return *this;
+ }
+ 
+ 
diff --git a/media-plugins/vdr-atscepg/vdr-atscepg-0.1.1.ebuild b/media-plugins/vdr-atscepg/vdr-atscepg-0.1.1.ebuild
index 54c09c4c0215..79154c13fd25 100644
--- a/media-plugins/vdr-atscepg/vdr-atscepg-0.1.1.ebuild
+++ b/media-plugins/vdr-atscepg/vdr-atscepg-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-atscepg/vdr-atscepg-0.1.1.ebuild,v 1.1 2008/03/24 09:55:01 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-atscepg/vdr-atscepg-0.1.1.ebuild,v 1.2 2009/07/08 19:21:05 zzam Exp $
 
 inherit vdr-plugin
 
@@ -11,12 +11,14 @@ SRC_URI="http://www.fepg.org/files/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.6"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
+	vdr-plugin_pkg_setup
 
 	if ! built_with_use media-video/vdr atsc; then
 		echo
@@ -29,5 +31,6 @@ pkg_setup() {
 src_unpack() {
 	vdr-plugin_src_unpack
 
+	epatch "${FILESDIR}/${P}-gcc-4.4.diff"
 	fix_vdr_libsi_include tables.cpp
 }