Do not patch sources to use limits.h, fix linux-headers instead.

(Portage version: 2.1.3.19)

3 files changed, 7 insertions, 74 deletions

diff --git a/app-cdr/dvd+rw-tools/ChangeLog b/app-cdr/dvd+rw-tools/ChangeLog
index 6089de992c9c..46e83305d8c8 100644
--- a/app-cdr/dvd+rw-tools/ChangeLog
+++ b/app-cdr/dvd+rw-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/dvd+rw-tools
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/ChangeLog,v 1.53 2007/10/26 09:32:13 uberlord Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/ChangeLog,v 1.54 2007/11/12 06:52:07 vapier Exp $
+
+  12 Nov 2007; Mike Frysinger <vapier@gentoo.org>
+  -files/dvd+rw-tools-7.0-limits.patch, dvd+rw-tools-7.0.ebuild:
+  Do not patch sources to use limits.h, fix linux-headers instead.
 
   26 Oct 2007; Roy Marples <uberlord@gentoo.org>
   +files/dvd+rw-tools-7.0-limits.patch, dvd+rw-tools-7.0.ebuild:
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild
index e3b00ed23bce..b032cd44760a 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild,v 1.12 2007/10/26 09:32:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/dvd+rw-tools-7.0.ebuild,v 1.13 2007/11/12 06:52:07 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,8 +19,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}"-limits.patch
-
 	sed -i \
 		-e "s:^CFLAGS=\$(WARN).*:CFLAGS=${CFLAGS}:" \
 		-e "s:^CXXFLAGS=\$(WARN).*:CXXFLAGS=${CXXFLAGS} -fno-exceptions:" \
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-limits.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-limits.patch
deleted file mode 100644
index 9657b2e3d465..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-limits.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urNd dvd+rw-tools-7.0/dvd+rw-booktype.cpp dvd+rw-tools-7.0-changed/dvd+rw-booktype.cpp
---- dvd+rw-tools-7.0/dvd+rw-booktype.cpp	2006-06-24 05:21:48.000000000 -0400
-+++ dvd+rw-tools-7.0-changed/dvd+rw-booktype.cpp	2007-10-19 23:40:25.000000000 -0400
-@@ -27,7 +27,7 @@
- EOS
- exit
- #endif
--
-+#include <limits.h>
- #include <stdio.h>
- #include <stddef.h>
- #include <stdlib.h>
-diff -urNd dvd+rw-tools-7.0/dvd+rw-format.cpp dvd+rw-tools-7.0-changed/dvd+rw-format.cpp
---- dvd+rw-tools-7.0/dvd+rw-format.cpp	2006-09-18 07:41:13.000000000 -0400
-+++ dvd+rw-tools-7.0-changed/dvd+rw-format.cpp	2007-10-19 23:40:50.000000000 -0400
-@@ -70,7 +70,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--
-+#include <limits.h>
- #if defined(__unix) || defined(__unix__)
- #include <sys/types.h>
- #include <sys/stat.h>
-diff -urNd dvd+rw-tools-7.0/dvd+rw-mediainfo.cpp dvd+rw-tools-7.0-changed/dvd+rw-mediainfo.cpp
---- dvd+rw-tools-7.0/dvd+rw-mediainfo.cpp	2006-09-23 13:46:57.000000000 -0400
-+++ dvd+rw-tools-7.0-changed/dvd+rw-mediainfo.cpp	2007-10-19 23:40:58.000000000 -0400
-@@ -3,7 +3,7 @@
-  *
-  * This code is in public domain.
-  */
--
-+#include <limits.h>
- #include <stdio.h>
- #include <stddef.h>
- #include <stdlib.h>
-diff -urNd dvd+rw-tools-7.0/dvd-ram-control.cpp dvd+rw-tools-7.0-changed/dvd-ram-control.cpp
---- dvd+rw-tools-7.0/dvd-ram-control.cpp	2004-07-08 07:05:56.000000000 -0400
-+++ dvd+rw-tools-7.0-changed/dvd-ram-control.cpp	2007-10-19 23:42:01.000000000 -0400
-@@ -1,3 +1,4 @@
-+#include <limits.h>
- #include "transport.hxx"
- 
- int main (int argc,char *argv[])
-diff -urNd dvd+rw-tools-7.0/growisofs.c dvd+rw-tools-7.0-changed/growisofs.c
---- dvd+rw-tools-7.0/growisofs.c	2006-09-24 13:28:53.000000000 -0400
-+++ dvd+rw-tools-7.0-changed/growisofs.c	2007-10-19 23:41:28.000000000 -0400
-@@ -558,8 +558,8 @@
- 
- 
- #if defined(__linux)
--
- #include <linux/types.h>
-+#include <limits.h>
- #include <linux/cdrom.h>
- #include <sys/ioctl.h>
- #include <sys/prctl.h>
-diff -urNd dvd+rw-tools-7.0/growisofs_mmc.cpp dvd+rw-tools-7.0-changed/growisofs_mmc.cpp
---- dvd+rw-tools-7.0/growisofs_mmc.cpp	2006-09-23 08:45:49.000000000 -0400
-+++ dvd+rw-tools-7.0-changed/growisofs_mmc.cpp	2007-10-19 23:41:39.000000000 -0400
-@@ -13,7 +13,7 @@
- #define _GNU_SOURCE
- #endif
- #endif
--
-+#include <limits.h>
- #include "transport.hxx"
- 
- #include <time.h>