Fix building with GLIBC 2.10+ wrt #272517.

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

4 files changed, 25 insertions, 7 deletions

diff --git a/media-plugins/vdr-vdrrip/ChangeLog b/media-plugins/vdr-vdrrip/ChangeLog
index 47749e07e1b0..7cc3f7ecf8a4 100644
--- a/media-plugins/vdr-vdrrip/ChangeLog
+++ b/media-plugins/vdr-vdrrip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-vdrrip
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrrip/ChangeLog,v 1.7 2007/09/17 22:56:35 hd_brummy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrrip/ChangeLog,v 1.8 2009/08/08 22:24:39 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  vdr-vdrrip-0.3.0-r7.ebuild, +files/vdr-vdrrip-0.3.0-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #272517.
 
 *vdr-vdrrip-0.3.0-r7 (17 Sep 2007)
 
diff --git a/media-plugins/vdr-vdrrip/Manifest b/media-plugins/vdr-vdrrip/Manifest
index d1f9e1b8a38a..e76e389e6052 100644
--- a/media-plugins/vdr-vdrrip/Manifest
+++ b/media-plugins/vdr-vdrrip/Manifest
@@ -9,6 +9,7 @@ AUX mencoderparam.diff 2775 RMD160 c09d964d37abdffb2158d1fa5bba10132a4ba3db SHA1
 AUX mplayercmd.diff 1475 RMD160 3300ff38946e46ff9644897efe4f2143caf715b0 SHA1 e234f2b79869792dea272de89a168fb5aac4cf9f SHA256 fdf013c4e386646b5b92d838557d67032e6298df5f84ae9fe992baa1d89ccb42
 AUX preserve-queue-owner.diff 544 RMD160 27de8815d1aca721da7783dab4b1cce6087e9efc SHA1 302bca3643705deee593ff4fc41158fbc008f70c SHA256 06973e32b79b3f18a871f63a47fa7107e775e17143ea27885b232dff5580e710
 AUX rc-addon.sh 340 RMD160 efe1ad0eea1fee1d10e6e70f67799165e85b9d10 SHA1 99f2a924384cf35d62bfdcfc7413c307d7d4df2b SHA256 b209266a71e987af38779c8f52c4e0e96398c0fa860654e42d590b1f69fad39f
+AUX vdr-vdrrip-0.3.0-glibc-2.10.patch 330 RMD160 2b9af43682723bac1685cc8cc69474e054bc4859 SHA1 8484bb1853a362068c13915fc53d48f24aa472c2 SHA256 3c64badcd1cb3bf6a194459f56e315ee6132b83e518443216deca4b9ed7e5f01
 AUX vdr-vdrrip-0.3.0-mplayercmd2.diff 1467 RMD160 45777b382e9cf313b577d67a8d4c3e6f9a8a88a1 SHA1 698d829441c0a0287d86fba18abb1dce53dfe581 SHA256 18bb71b9a14f8a5307d2256f0f60e78fe335216648c145add0278192e4b15ce3
 AUX vdrrip-0.3.0-1.3.7.diff 7957 RMD160 d7f597442b2b3d12af640db54650979bf7db1872 SHA1 ac53f4b4cfd8168b9352c72b36a337d9549eca3a SHA256 609d3cb24efa5d310c0aecc90f25b2be58a9e3061ddd035acbcfef4190095f99
 AUX vdrrip-qh 760 RMD160 b2e011cb1f32d3cf237a0d68fac2143fd8b89147 SHA1 1c2139d832ac5b3b111af33e55b5e536946fc7f9 SHA256 b025e8234ee5f855e5a674a41704a9509cf5d01ff7b82d126ab3885a955e32cf
@@ -18,6 +19,6 @@ DIST vdr-vdrrip-0.3.0.tgz 94937 RMD160 9a3d418e715e3fbcf5d010a21c671b13fd269b99
 EBUILD vdr-vdrrip-0.3.0-r4.ebuild 2565 RMD160 f4eee8c99faf41000733004f2aaf7216941a1317 SHA1 a0dc053307bbacfd8e21879030f9ee1fc5fe735d SHA256 6c34d3d564414d6dc0d657536051fd91843ad072e4ae594316d2aa687aaeadb9
 EBUILD vdr-vdrrip-0.3.0-r5.ebuild 2583 RMD160 8eae41246ad693f1606c79771cf8a8fe09f49eca SHA1 2f4ce49a79b3cc8cb9625d86bd03a537ffe397e6 SHA256 3f2395231336751133745f6b4ec05eb7e85ba1bbc7ae086c2f357daf9dfff86c
 EBUILD vdr-vdrrip-0.3.0-r6.ebuild 2585 RMD160 757bdeb9218a8f1d83ea62ebfeb60be44a98247e SHA1 8fba1ef9eb6ea536019dd0cdf097dfa1bccdaa4c SHA256 5298b4346f2bbdac5f3b8c233a7177959a27fdc2c96ecc683b8205eec3fc1ccb
-EBUILD vdr-vdrrip-0.3.0-r7.ebuild 2734 RMD160 24248b04ab1b2c31c2615fd7a06339de5cbb9e01 SHA1 38036b5c1234e878f961d526c3b60eb1c1635fa6 SHA256 8709d10f3dd707ff4e3a52c9f0732bd5e90707475693d3f664537c3e89e65931
-MISC ChangeLog 2017 RMD160 cbc77f45699652d02ba6297a602e32b07150ad2f SHA1 572ee2fc3bfc17c0c05b4d9bbdccdc6963cc462d SHA256 0e711f699489ea51f0348ee50caa98699e9e29427203813495218061d9de6fac
+EBUILD vdr-vdrrip-0.3.0-r7.ebuild 2785 RMD160 7af631751be1672cf64be5526b8692a60d9eedce SHA1 cdcf3892fe548be1bd52e0d5d772fa65039c208d SHA256 cab0c09af14f187860a48f42b88998999da25c018e4625e6935dab906ed5b664
+MISC ChangeLog 2189 RMD160 8b57c1730559b45e8a1a69498438c43703857b23 SHA1 38f9882e450aa75caa34f4a4fcf0d35bbd091f4a SHA256 71d5399425d532b9b8d5b25fce58fe9351cef460f1287677cb7d5206a20009f8
 MISC metadata.xml 476 RMD160 5c9733d322eada28772a23461230653a139707c7 SHA1 ac24c24db87738936b1085a9927771c84fb78a6b SHA256 92c836e4501cff0cd77cf30d6dcb0147dbf8e15224c702ed42474b1761dd2f2e
diff --git a/media-plugins/vdr-vdrrip/files/vdr-vdrrip-0.3.0-glibc-2.10.patch b/media-plugins/vdr-vdrrip/files/vdr-vdrrip-0.3.0-glibc-2.10.patch
new file mode 100644
index 000000000000..60001e0db678
--- /dev/null
+++ b/media-plugins/vdr-vdrrip/files/vdr-vdrrip-0.3.0-glibc-2.10.patch
@@ -0,0 +1,12 @@
+diff -ur vdrrip-0.3.0.orig/a-tools.c vdrrip-0.3.0/a-tools.c
+--- vdrrip-0.3.0.orig/a-tools.c	2004-02-04 20:15:28.000000000 +0200
++++ vdrrip-0.3.0/a-tools.c	2009-08-09 01:25:37.000000000 +0300
+@@ -70,7 +70,7 @@
+ }
+ 
+ int strnumcol(const char *s, char *d) {
+-  char *s1;
++  const char *s1;
+   int i, l;
+ 
+   // let's do some checks:
diff --git a/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r7.ebuild b/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r7.ebuild
index 0bac075df56f..97569a479e13 100644
--- a/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r7.ebuild
+++ b/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 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-vdrrip/vdr-vdrrip-0.3.0-r7.ebuild,v 1.1 2007/09/17 22:56:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r7.ebuild,v 1.2 2009/08/08 22:24:39 ssuominen Exp $
 
 inherit vdr-plugin eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.a-land.de/${P}.tgz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.0"
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	vdr-plugin_src_unpack
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 	cp ${DISTDIR}/queuehandler-fixed-0.3.0.sh ${S}/scripts/queuehandler.sh
 
 	if