Fix building with GLIBC 2.12 wrt #332237 by Diego E. Pettenò.

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

4 files changed, 26 insertions, 4 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 935f546b95d5..afbcd74bb814 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.153 2010/08/09 23:12:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.154 2010/08/11 13:57:04 ssuominen Exp $
+
+  11 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  cdrdao-1.2.3-r1.ebuild, +files/cdrdao-1.2.3-glibc212.patch:
+  Fix building with GLIBC 2.12 wrt #332237 by Diego E. Pettenò.
 
   09 Aug 2010; Jeroen Roovers <jer@gentoo.org> cdrdao-1.2.3.ebuild:
   Stable for HPPA (bug #317529).
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 05a1176e30da..59b5dd243a35 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,13 +1,14 @@
 AUX cdrdao-1.2.3-autoconf-update.patch 1988 RMD160 69dcb4f730fa6bd11e9558d41a79e023742f7274 SHA1 00e9b111c50e381f8cb4fcbc837cc4293dc21648 SHA256 2f4f54ed23b4f3b22fd64a2a3d4fa67ff186b3865213cba3fbe81ed9f6c42c74
 AUX cdrdao-1.2.3-gcc44.patch 726 RMD160 7499c6b1f9549b2143744cefd0aa943b815e7be4 SHA1 da12a8a436d46ddd8c962e3954cca4ac25ed8b10 SHA256 cb98595d20dbd41ed8f9c71e02914fa5f94529e289b71433b126c36828b1411f
+AUX cdrdao-1.2.3-glibc212.patch 234 RMD160 3d76ae2eda361e1de3d8435c7d69ac34f3f6ed72 SHA1 9ec14f2e4f00bb713241ab0fc2c2686c20ba79c9 SHA256 c880ea94044c0f8f1ea65b7bf26960d261102d1df0c35b44a8f4538d6bfaca4a
 AUX cdrdao-1.2.3-k3b.patch 380 RMD160 81115cf91fc8b9f63b0cdbc463329a350ba83c33 SHA1 e4f9fc95df1e1084791146e1dc0c040f6cdf873e SHA256 6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0
 AUX cdrdao-1.2.3-pkg-config.patch 488 RMD160 8e01ba0009de4ff1a7509ea2529116cb68764e51 SHA1 3ba7170c1959086fa83280571eb92c1bb4ad0c19 SHA256 8627b0ada00732cac93dfad873890184ebc9df11794018b231e3641b428b541a
 AUX cdrdao-1.2.3-toc2cue.patch 633 RMD160 76a77e7bd24fdfa3f474ce0c9982702390d98cb9 SHA1 a323fac33deffb493d3b7f1b7dd2a63836f64de8 SHA256 b19a88b3c0e25d0fb8b3aa9ef71c5c0d7fb9482b70dd91639e712f3493b49965
 AUX cdrdao-1.2.3-tocparser.patch 566 RMD160 66e1a273dfb59c0d2900cd6b4ac0a6cb0eae5fc6 SHA1 12f5104362bcf83104cdd64b240e15ce4c098cf5 SHA256 ffdbb7e8c122caf0b571642716a8d62a35a09973ee4ca9b9015c4ced4163877f
 DIST cdrdao-1.2.3.tar.bz2 1428695 RMD160 a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523 SHA1 70d6547795a1342631c7ab56709fd1940c2aff9f SHA256 8193cb8fa6998ac362c55807e89ad0b3c63edc6b01afaeb3d5042519527fb75e
 DIST cdrdao-1.2.3rc2.tar.bz2 1435808 RMD160 60410652940fd271b272b74d4554986c86115787 SHA1 d23c756400f728cecbcc901ecadb1eea44c70e97 SHA256 2cd174111ed3de68d3b93333ae85cd376455598d6d355bcef94771bf047a5e08
-EBUILD cdrdao-1.2.3-r1.ebuild 1325 RMD160 9f2ac3ca32d772fe193e15a70c79c287d63ebfe4 SHA1 265cd1af8b17e2965eab0cfc3dc0a4dea8ab9fbe SHA256 1baddc262d0f883637e94711340ff1285859eae9fd88f56c14243e9657d7c489
+EBUILD cdrdao-1.2.3-r1.ebuild 1401 RMD160 685036c762bbfe55a8db631e75a8a7798d19a969 SHA1 cd3727357ab51625e77634c8c0e3ea10fe597e40 SHA256 0d9472e07fba62e35c81c31c30f81cadf031060a3c0c0c3f81f4de982a1154e3
 EBUILD cdrdao-1.2.3.ebuild 1384 RMD160 6cdd067df5c86c705027299a417313f5cbac5a95 SHA1 d15d766b2e629da4f297e4d0c9d019111a1ee57e SHA256 cfdc7ddd4b40b17e8316d4e63ad8b8db81c713e7abca13fa20651ce1ca5065a8
 EBUILD cdrdao-1.2.3_rc2.ebuild 2008 RMD160 4cfb33a17a4373a797012a7fe3d8bf45b5da6549 SHA1 7a39e3c78fe089ee7b6ff7a2725b0cb176e382c4 SHA256 a27d5a330eecfebda9cabd75451a753a0a01744481d84543754bab7db9b6f4e2
-MISC ChangeLog 20941 RMD160 28587f421a4dfac07faae25a4546b8c12bbe0684 SHA1 b0e080c39a8febc1a0c0a9e6ee9a11137510842f SHA256 47950f59850cf6458c8148363e8f090dcc4511d764417f3b615a1982fd67c77c
+MISC ChangeLog 21129 RMD160 ef300ae9fe4f953f65e9564437f038bb995b0977 SHA1 cc0e67c6230e80280ef13f356db66ce1a27c5dc8 SHA256 834a170ea6c3d68fbde4bf1df732864baee5d65aef81f522e6934d6b1fda8d14
 MISC metadata.xml 500 RMD160 79fdf7f14c4f6005c79b4f676e2f48490d7a7b1c SHA1 3f3774af0497ff0d9f6d36047dec11541b9f9f26 SHA256 fe82d0fc06eec0e484da4786b5829d5d17b84e2b7f39cc5d190d86a6e376e935
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
index a2007483d2d4..437ccacf7bdb 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild,v 1.1 2010/07/16 15:50:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild,v 1.2 2010/08/11 13:57:04 ssuominen Exp $
 
 EAPI=2
+inherit eutils
 
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
@@ -35,6 +36,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc212.patch
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
new file mode 100644
index 000000000000..dbfc96cb93bf
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/332237
+
+--- dao/ScsiIf-linux.cc
++++ dao/ScsiIf-linux.cc
+@@ -30,6 +30,7 @@
+ #include <asm/param.h>
+ #include <scsi/scsi.h>
+ #include <scsi/sg.h>
++#include <sys/stat.h>
+ 
+ #include "ScsiIf.h"
+ #include "sg_err.h"