Fix by Dmitry Derevyanko for building w/glibc-2.20 #524048 by Dale Lukas Peterson.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

4 files changed, 31 insertions, 6 deletions

diff --git a/media-gfx/sam2p/ChangeLog b/media-gfx/sam2p/ChangeLog
index 10e2a5963991..07ee4110804a 100644
--- a/media-gfx/sam2p/ChangeLog
+++ b/media-gfx/sam2p/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/sam2p
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.58 2014/11/02 11:39:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.59 2014/11/08 18:31:08 vapier Exp $
+
+  08 Nov 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/sam2p-0.49-glibc-2.20.patch, sam2p-0.49.1.ebuild, sam2p-0.49.2.ebuild:
+  Fix by Dmitry Derevyanko for building w/glibc-2.20 #524048 by Dale Lukas
+  Peterson.
 
 *sam2p-0.49.2 (02 Nov 2014)
 
diff --git a/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch b/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch
new file mode 100644
index 000000000000..f96a97969390
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/524048
+
+ignore warnings w/newer glibc-2.20
+
+patch by Dmitry Derevyanko
+
+--- a/ccdep.pl
++++ b/ccdep.pl
+@@ -233,6 +233,9 @@
+   } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: this is the location of /) {
+     # ^^^ gcc-3.1
+     undef $included_from;
++  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: .*\bdeprecated\b/) {
++    # Example: /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
++    undef $included_from;
+   } elsif ($S=~/: No such file or directory$/) {  # Depends on $ENV{LC_ALL}.
+     # ^^^ gcc-3.3
+     undef $included_from;
diff --git a/media-gfx/sam2p/sam2p-0.49.1.ebuild b/media-gfx/sam2p/sam2p-0.49.1.ebuild
index ef9f32224e1c..7ff008ae8d1d 100644
--- a/media-gfx/sam2p/sam2p-0.49.1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.49.1.ebuild,v 1.10 2013/08/27 21:00:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.49.1.ebuild,v 1.11 2014/11/08 18:31:08 vapier Exp $
 
 EAPI=4
 inherit autotools eutils toolchain-funcs
@@ -23,7 +23,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.45-fbsd.patch \
 		"${FILESDIR}"/${PN}-0.49.1-build.patch \
-		"${FILESDIR}"/${PN}-0.49.1-gcc48.patch
+		"${FILESDIR}"/${PN}-0.49.1-gcc48.patch \
+		"${FILESDIR}"/${PN}-0.49-glibc-2.20.patch
 	eautoreconf
 	tc-export CXX
 }
diff --git a/media-gfx/sam2p/sam2p-0.49.2.ebuild b/media-gfx/sam2p/sam2p-0.49.2.ebuild
index 87e6fd0a6700..edf9559d4957 100644
--- a/media-gfx/sam2p/sam2p-0.49.2.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.49.2.ebuild,v 1.1 2014/11/02 11:39:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.49.2.ebuild,v 1.2 2014/11/08 18:31:08 vapier Exp $
 
 EAPI=4
 inherit autotools eutils toolchain-funcs
@@ -22,7 +22,8 @@ RESTRICT="test"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.45-fbsd.patch \
-		"${FILESDIR}"/${PN}-0.49.1-build.patch
+		"${FILESDIR}"/${PN}-0.49.1-build.patch \
+		"${FILESDIR}"/${PN}-0.49-glibc-2.20.patch
 	eautoreconf
 	tc-export CXX
 }