gcc-4.7 compile fixed, bug 423623

Package-Manager: portage-2.1.10.11/cvs/Linux i686

6 files changed, 39 insertions, 55 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index d62abd060059..de2a2706e4f9 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.51 2012/05/16 09:33:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.52 2012/06/27 18:34:25 hd_brummy Exp $
+
+  27 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/patches-0.7.x/noad-0.7.2-cflags.patch,
+  -files/patches-0.7.x/noad-0.7.2-hangcheck.diff,
+  +files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff, noad-0.7.3.ebuild:
+  gcc-4.7 compile fixed, bug 423623
 
   16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/0.6.0-r7/confd_vdraddon.noad, -noad-0.6.0-r9.ebuild,
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 98d7c51be57e..bbbb61fafb96 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX patches-0.7.x/noad-0.7.2-cflags.patch 504 RMD160 1687a8e9ea8809f40580b82d26813889d8fe3b12 SHA1 686d438e68753ea45a4d30b8dfe3aea872d2fc26 SHA256 b0ac44bc934c79d8198e16eca784889082818e6470191fad13a137ab9fd138c6
-AUX patches-0.7.x/noad-0.7.2-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
 AUX patches-0.7.x/noad-0.7.3-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
+AUX patches-0.7.x/noad-0.7.3_gcc-4.7.diff 527 RMD160 d2ba41f011c6b5c5c212ed2370878d4fe4c4e559 SHA1 fa841d2e05b940a464eb94d70d826d1b3bf036a5 SHA256 571a5b208370ce1336b6ccb4d60a0b27f216c4682548f1d9097ef05463a2ae3f
 AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 SHA1 052504eea27ea04d10dff671df3929b62a404e15 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2
 DIST noad-0.7.3.tar.bz2 174036 RMD160 a5b4b9ec272b0662c896a32ffbbbb74da088d33c SHA1 317de559d0fb784c70070760c41f06ec6fbcc122 SHA256 6fb597fb0ae0e4c4c954f2feb89dcc88c4852a0f0845aa214606996abb29f6cb
-EBUILD noad-0.7.3.ebuild 2129 RMD160 535fc38cc2caa52c1aaad6b04b8374443f867e18 SHA1 ae95cf4af83981e007d5b193335215a43b6d6070 SHA256 2ef55926eae479fe5a0bf8ffc1f8078ec0abfb39ae0206fa58e39101b50a81d0
-MISC ChangeLog 11284 RMD160 d08fe1194f27d915a370defe9df7e02d1d7b0254 SHA1 00caaec66d765a1c8f93c1a0a7b30b7d767c7320 SHA256 7eeb964318f53782501cf125df8b888b27a0ac92c0469276ef9ebe5c5937eb98
+EBUILD noad-0.7.3.ebuild 2186 RMD160 e784e5338ecaeeec754768df43897e48fde9dd2a SHA1 b4fc58b602f7c03f47b06e53a2412e9e2c9ab254 SHA256 17a188a896c2e88a75ad002a5ae7ec15100cd7a6980a61e778baa12adfd33866
+MISC ChangeLog 11541 RMD160 0e41ddf97f3c66c7b3d183858b0bc1b5e1acd17f SHA1 2a62507ab9da2a96990c927a460f9d730f2609fe SHA256 742df78a5eb9e669a378798eb5d88e515b1180b40460678cece1e0abab56187e
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iQIcBAEBAgAGBQJPs3SLAAoJEOSiRoyO7jvo96EP/1jRPrdV51vbYAX2tVia4Kor
-LHcgLDJf9HTU/QU3PcxBuk5ZubJX/IrpzFAXJuskK09XExNqg0um/1EB9epYT351
-PgNeK1X0T82VUAooh5LrTksQSdxM4JuqzyxHTo5xTeqEkhAN4v4dmu/d0Pv2O7FJ
-fi/UvOrRvhKhsmBZFHodGw+Hn4DDuw+cnxjRnorOW1JCRj0FhXj2GLnfDn6UEhUQ
-dTVLfkeUSjom0ApaUIzJeE6FxEoNdiGxpjXn4tE/5xeqARrs36A4TloS34wnN2Jh
-kf9hezQ2BKKCMF+zJsBgz7lsswvd2AgVgKfjWmo9hPbUdGeooUro71R0Tep5bi6X
-NVmYfcTAfHU8LYYXUqgZW2BEU5PFWUhN+f/oLIZR9s7opbylS7VR2rF2uxSY7/14
-w7FovrB1tbfV166Sz5kPVrYA5xrqc6kAqoaIdSBQ4Tt06WRr7U9MZNyb5WoKUW7t
-Z2Lk3EjijLcZFLlafIRcVYzZl8myt0+o5cVIQCWLmeYNnDnAo31oY7waDr9xO0B6
-yRkUSX0tqVx8/Mgo73y15ryjwnjomnVUSsofy5Ius4w5okUYFxrz3TDTQk4jIQXk
-CPLKj5WHM4SlWoke5k9/V2fFrGcLv9WD0Sv0xPFZxby6iVaCRzkMTmf+9hDeMQxh
-l//6Zl8hWSpCUk53zvid
-=2QH5
+iD8DBQFP61I7dn07HTTCgIoRAncQAJ9yavYYw/SLjuUqaCBJqt7UC76jHACglHic
+Ag0ZJKPjXmZ4TADJL40N7VQ=
+=6Uqx
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.2-cflags.patch b/media-video/noad/files/patches-0.7.x/noad-0.7.2-cflags.patch
deleted file mode 100644
index 5e67e6814542..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.2-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: noad-0.7.2/configure.ac
-===================================================================
---- noad-0.7.2.orig/configure.ac
-+++ noad-0.7.2/configure.ac
-@@ -267,7 +267,6 @@ AC_FUNC_STRFTIME
- AC_CHECK_FUNCS([gettimeofday localtime_r memmove memset mkdir select socket strchr strdup strerror strrchr strstr])
- AC_CHECK_FUNCS([strsignal])
- #CXXFLAGS='-g -O3 -pg'
--CXXFLAGS='-g -O3'
- 
- dnl ---------------------------------------------------------------------------
- dnl check for a usable avcodec.h 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff
deleted file mode 100644
index 37788a197fd7..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp
---- noad-0.6.0-orig/main.cpp	2007-05-12 17:28:01.000000000 +0200
-+++ noad-0.6.0/main.cpp	2007-05-12 18:20:30.000000000 +0200
-@@ -566,10 +566,17 @@
-     signal(SIGABRT, signal_handler);
-     signal(SIGSEGV, signal_handler);
-     signal(SIGUSR1, signal_handler);
-+    signal(SIGALRM, signal_handler);
-     
-     // do cleanup at exit...
-     atexit(cleanUp);
-     
-+   
-+    if (!bOnline) {
-+       // now start alarm timer to kill hanging noad (hardcoded 30min timeout)
-+       alarm(30*60);
-+    }
-+    
-     // now do the work..,
-     doNoad(bBefore, recDir);
- 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff
new file mode 100644
index 000000000000..ca37f8e22a87
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=423623
+compilefix gcc-4.7.x
+
+signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/06/27)
+
+diff -Naur noad-0.7.3.orig/vdr_cl.h noad-0.7.3/vdr_cl.h
+--- noad-0.7.3.orig/vdr_cl.h	2012-06-27 20:27:57.000000000 +0200
++++ noad-0.7.3/vdr_cl.h	2012-06-27 20:30:56.000000000 +0200
+@@ -287,7 +287,7 @@
+ 				{
+ 					T *l = new T;
+                if (l->Parse(s))
+-						Add(l);
++						this->Add(l);
+                else 
+ 					{
+ 						esyslog("ERROR: error in %s, line %d", fileName, line);
diff --git a/media-video/noad/noad-0.7.3.ebuild b/media-video/noad/noad-0.7.3.ebuild
index 745b2dbe9b9c..bd2e8f119959 100644
--- a/media-video/noad/noad-0.7.3.ebuild
+++ b/media-video/noad/noad-0.7.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3.ebuild,v 1.2 2012/05/16 09:33:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3.ebuild,v 1.3 2012/06/27 18:34:25 hd_brummy Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils flag-o-matic autotools
 
@@ -24,13 +24,17 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 
 	epatch "${FILESDIR}"/patches-0.7.x/"${P}"-hangcheck.diff
-	eautoreconf
+
 	# UINT64_C is needed by ffmpeg headers
 	append-flags -D__STDC_CONSTANT_MACROS
 
 	if has_version ">=media-video/vdr-1.7.15"; then
 		sed -e "s:2001:6419:" -i svdrpc.cpp
 	fi
+
+	epatch "${FILESDIR}/patches-0.7.x/${P}_gcc-4.7.diff"
+
+	eautoreconf
 }
 
 src_configure() {