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

Package-Manager: portage-2.1.3.19

4 files changed, 25 insertions, 86 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/Manifest b/app-cdr/dvd+rw-tools/Manifest
index 9331f5490715..32ca0f39246f 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -1,11 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 01_all_samsung-media-fix.patch 701 RMD160 d82e6a4135a67b46e9c0ce61a979e2e5995af4aa SHA1 da17027b0733bb18c3c77784b02a79728af68230 SHA256 a987638e7d83adff588d9445a36d5a59d52bb98f7b50311ff0a0eabe6812b299
 MD5 fce4ae0aea831d5b1f176e8dcff5059f files/01_all_samsung-media-fix.patch 701
 RMD160 d82e6a4135a67b46e9c0ce61a979e2e5995af4aa files/01_all_samsung-media-fix.patch 701
 SHA256 a987638e7d83adff588d9445a36d5a59d52bb98f7b50311ff0a0eabe6812b299 files/01_all_samsung-media-fix.patch 701
-AUX dvd+rw-tools-7.0-limits.patch 2340 RMD160 d2048501798bde6c6fb8532ac8e1611ddd1ad717 SHA1 0b104725d038fe8706271814a94e47714965cc8c SHA256 1ebd1f9cc764794fe1da023bec39d4ff94d16d9791ece7bd1841be7da81f7f29
-MD5 54f183102a16c99eac46c2d7ce8dc82f files/dvd+rw-tools-7.0-limits.patch 2340
-RMD160 d2048501798bde6c6fb8532ac8e1611ddd1ad717 files/dvd+rw-tools-7.0-limits.patch 2340
-SHA256 1ebd1f9cc764794fe1da023bec39d4ff94d16d9791ece7bd1841be7da81f7f29 files/dvd+rw-tools-7.0-limits.patch 2340
 DIST dvd+rw-tools-5.21.4.10.8.tar.gz 107045 RMD160 638f67ddfc24f89a4c2bc2abced652e679f4400f SHA1 319a4529db3748f595aa9dc8f2e54564bb32a0e3 SHA256 6d233df4429583c5a36df3328cd74e71e39aed6bb90586998fe6a8dcd3ba514b
 DIST dvd+rw-tools-6.0.tar.gz 118804 RMD160 f4762e342b910867655f20858be8945ae7054f0b SHA1 964bae317a047cb8a7f311333b3cec5266f417e6 SHA256 17cdb64c5daa0ee553984a397434a8ed63a25fae5807b39613fec8df382e4729
 DIST dvd+rw-tools-6.1.tar.gz 121425 RMD160 d06eb401fc53bf11df39ba89d508b67f3a0b915f SHA1 ff63b6c6ee33cd777164d5ad72ab5c1c12430916 SHA256 43ddf89a5aaafcf4725337c107d0dfa659132541696c8ba1ed74bea19c4e33f1
@@ -26,14 +25,14 @@ EBUILD dvd+rw-tools-6.1.ebuild 1070 RMD160 5ad1503844cf5482b78695eeeb31fbe539fb0
 MD5 dc3bc8c7cd820c22d22d6495a3c5150c dvd+rw-tools-6.1.ebuild 1070
 RMD160 5ad1503844cf5482b78695eeeb31fbe539fb0b7c dvd+rw-tools-6.1.ebuild 1070
 SHA256 01581c0f90e2804794016d99e81c594b98ec1a1b5f97df336bc36b3b7a88a240 dvd+rw-tools-6.1.ebuild 1070
-EBUILD dvd+rw-tools-7.0.ebuild 1123 RMD160 49e7184fbd69ce03fd877fa791dc3788ef483b27 SHA1 6078fa1674fe3e5d9f19dc19b3dd4cace2313f82 SHA256 40fcb82731582a28adcb0b98d45126abf1732f32f7225e255e558a7d4359e21f
-MD5 fece53f1b8b7ebedc4f69a95a7188b56 dvd+rw-tools-7.0.ebuild 1123
-RMD160 49e7184fbd69ce03fd877fa791dc3788ef483b27 dvd+rw-tools-7.0.ebuild 1123
-SHA256 40fcb82731582a28adcb0b98d45126abf1732f32f7225e255e558a7d4359e21f dvd+rw-tools-7.0.ebuild 1123
-MISC ChangeLog 6980 RMD160 809d5c40a383a489aaefb5cebca17cdd2769cdbf SHA1 7b47c00e1ae6725f33665a7d9492156cad7de2b4 SHA256 f4cf3cb28f48909e0b7295798f855f2d2c6a6cb359268fb50ead25e8891bb351
-MD5 d2c13a89ca80b1ad1c6d4338f284956e ChangeLog 6980
-RMD160 809d5c40a383a489aaefb5cebca17cdd2769cdbf ChangeLog 6980
-SHA256 f4cf3cb28f48909e0b7295798f855f2d2c6a6cb359268fb50ead25e8891bb351 ChangeLog 6980
+EBUILD dvd+rw-tools-7.0.ebuild 1080 RMD160 2b24d6641d10f450d179cba9f924bcede1b4a503 SHA1 b9ac89baba0cda52b15441042c37f65038a998ad SHA256 3f3fe225a5384943ce52727ca2aebbea15cc8eaa9817db3626767c028205c22c
+MD5 50e3dac30428997a2197d25901f39f9d dvd+rw-tools-7.0.ebuild 1080
+RMD160 2b24d6641d10f450d179cba9f924bcede1b4a503 dvd+rw-tools-7.0.ebuild 1080
+SHA256 3f3fe225a5384943ce52727ca2aebbea15cc8eaa9817db3626767c028205c22c dvd+rw-tools-7.0.ebuild 1080
+MISC ChangeLog 7161 RMD160 54fdce9f04314a9696dfb106924cd610f7c79586 SHA1 7745f14f110e33528fdda432676bb2d040465c1f SHA256 efa13a5e1b1e3da5acbae848f5173a3b10f539a3c017b360f7c0e436e8f2fe55
+MD5 c60f261672cfb53623f64ab5a82acabf ChangeLog 7161
+RMD160 54fdce9f04314a9696dfb106924cd610f7c79586 ChangeLog 7161
+SHA256 efa13a5e1b1e3da5acbae848f5173a3b10f539a3c017b360f7c0e436e8f2fe55 ChangeLog 7161
 MISC metadata.xml 293 RMD160 b97e3360ba18362c52786ba89cd3bc68c2ad78fb SHA1 66f8a2850da3df8f4e9ccda87025711db142dae3 SHA256 38a4d78cd4b1b04f922df758442e6867ba011beb6e9bec7f2fb9993d32c94665
 MD5 96828f8dea30d6c3c534076e3b3eb83e metadata.xml 293
 RMD160 b97e3360ba18362c52786ba89cd3bc68c2ad78fb metadata.xml 293
@@ -53,3 +52,10 @@ SHA256 b4730bc6e5bdd3439275af9ec102e6773043427f748c0f0fff66ba2d933fd794 files/di
 MD5 668604c09e936c248b36cd55e30fc6e8 files/digest-dvd+rw-tools-7.0 250
 RMD160 2eda9cb39f89720fd1e611a93af88ed4938e05d0 files/digest-dvd+rw-tools-7.0 250
 SHA256 9ce921adccd89dbd352dc8ac34dfc8726e7d4384abd8d53a4b3651365520acd8 files/digest-dvd+rw-tools-7.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHN/gcp/wUKkr7RBoRAgv9AJ9GJwsbASiopQ/5LIA+ND4uzMTpvwCg27jU
+Q1pkwfG4MGCd0r7euilUELA=
+=7Tu6
+-----END PGP SIGNATURE-----
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>