Added patch for uclibc. The patch is already included upstream and fixed in

the upcoming cdrkit-1.1.5.
Package-Manager: portage-2.1.2.3

4 files changed, 68 insertions, 13 deletions

diff --git a/app-cdr/cdrkit/ChangeLog b/app-cdr/cdrkit/ChangeLog
index e28f41128622..1d3f6cc2bc64 100644
--- a/app-cdr/cdrkit/ChangeLog
+++ b/app-cdr/cdrkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrkit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/ChangeLog,v 1.30 2007/04/01 21:47:47 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/ChangeLog,v 1.31 2007/04/10 14:10:02 pylon Exp $
+
+  10 Apr 2007; Lars Weiler <pylon@gentoo.org>
+  +files/cdrkit-readom-clone.patch, cdrkit-1.1.4.ebuild:
+  Added patch for uclibc. The patch is already included upstream and fixed in
+  the upcoming cdrkit-1.1.5.
 
 *cdrkit-1.1.4 (01 Apr 2007)
 
diff --git a/app-cdr/cdrkit/Manifest b/app-cdr/cdrkit/Manifest
index 5fba8fd22d8e..034ae45b2ef4 100644
--- a/app-cdr/cdrkit/Manifest
+++ b/app-cdr/cdrkit/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cdrkit-readom-clone.patch 1113 RMD160 c1d0db8d38154639c4539005fc38fbea294d02ec SHA1 6ee2de367a999f524ca87c300ed10e013f0bd535 SHA256 82eda1635cc1b2e4117b1de3a119c6120dff370bd8c5445731edb62b32f5d26c
+MD5 09b201a84f59710d867717e3a2d4a099 files/cdrkit-readom-clone.patch 1113
+RMD160 c1d0db8d38154639c4539005fc38fbea294d02ec files/cdrkit-readom-clone.patch 1113
+SHA256 82eda1635cc1b2e4117b1de3a119c6120dff370bd8c5445731edb62b32f5d26c files/cdrkit-readom-clone.patch 1113
 DIST cdrkit-1.0.tar.gz 1469722 RMD160 f8076505999461f7e7a36451e0291e2d1a15994f SHA1 e4b5cacb9e42fa4f9df52b8067fe44d97e7e2ca3 SHA256 233391d10176f6c1ed12db536b62c9ca3ec009032af360a2b43ef3436470d6a6
 DIST cdrkit-1.1.2.tar.gz 1406821 RMD160 4682c518212a9e3a7a413fb4721a2d4bac013cc4 SHA1 b8d8b654d93362ef00574d0585cb8d4467e6c4c7 SHA256 03a4e80718704e79b50a285b0aac928a3820c5b3c1df028478aa68fe884b7d0d
 DIST cdrkit-1.1.4.tgz 1431472 RMD160 291142a9d0e97489c1fc4b3708352795f05d6ff1 SHA1 787d93a147195fdff64b1e625818904c25aab8a4 SHA256 4f79f66e9957182acdbb13b2e654c546e6b54342207d019902c5357007a5b25b
@@ -12,14 +16,14 @@ EBUILD cdrkit-1.1.2.ebuild 1796 RMD160 76714c0d9c7b804810e52a9a5fedfa872e2573b9
 MD5 6cd2c8f0e9b16b2550eaee661539e9ff cdrkit-1.1.2.ebuild 1796
 RMD160 76714c0d9c7b804810e52a9a5fedfa872e2573b9 cdrkit-1.1.2.ebuild 1796
 SHA256 93432c02230c8ba1e3eea66313412f6d198d665ee41614b6e60955f78b20f375 cdrkit-1.1.2.ebuild 1796
-EBUILD cdrkit-1.1.4.ebuild 2012 RMD160 d002acd653ce3a257d2ea2d58445da4801527bfd SHA1 e76d75a8089b1eade92743c1170416d6c4dc833b SHA256 6eeae82db4e70b96200db6af87f4979d8c64a03701b38e211c63ec70258a2992
-MD5 d48b7ccf0980928865a104d5b6b9434b cdrkit-1.1.4.ebuild 2012
-RMD160 d002acd653ce3a257d2ea2d58445da4801527bfd cdrkit-1.1.4.ebuild 2012
-SHA256 6eeae82db4e70b96200db6af87f4979d8c64a03701b38e211c63ec70258a2992 cdrkit-1.1.4.ebuild 2012
-MISC ChangeLog 4368 RMD160 bd2a379e4e0fa5bf77f6ae0ed462a74d45cd0f72 SHA1 385b5e345482229106292761265d793d27fbcfea SHA256 6873a2b93882c8c883d83007924b81e417a0668f7c5fa89f52e13c9559414844
-MD5 a168b56b28d0be1ab07953da2f6d8509 ChangeLog 4368
-RMD160 bd2a379e4e0fa5bf77f6ae0ed462a74d45cd0f72 ChangeLog 4368
-SHA256 6873a2b93882c8c883d83007924b81e417a0668f7c5fa89f52e13c9559414844 ChangeLog 4368
+EBUILD cdrkit-1.1.4.ebuild 2103 RMD160 1680d197def743ada6dc0aac203c9b8b35b753a7 SHA1 b98814ec39cb043fb159f755f878a31f34930f41 SHA256 0ee92dc777d561e2e601e4f35d7c5c3e3e65f13233b642366e5bd3d67f58b9ca
+MD5 6f168f7e9b4fd1f28fdbc287811151fa cdrkit-1.1.4.ebuild 2103
+RMD160 1680d197def743ada6dc0aac203c9b8b35b753a7 cdrkit-1.1.4.ebuild 2103
+SHA256 0ee92dc777d561e2e601e4f35d7c5c3e3e65f13233b642366e5bd3d67f58b9ca cdrkit-1.1.4.ebuild 2103
+MISC ChangeLog 4579 RMD160 5c0d4c793eb58e08597100eb55443bd30837e80f SHA1 1cd996100f8ab8f0a66913fb5fe3849253543e24 SHA256 b2fecfa5a27cbe729d4bc902fb0c685bcb1e44612ead3f4ab4678bb41434ec5b
+MD5 9302873dc8d58d7084d7cd5188f0bde8 ChangeLog 4579
+RMD160 5c0d4c793eb58e08597100eb55443bd30837e80f ChangeLog 4579
+SHA256 b2fecfa5a27cbe729d4bc902fb0c685bcb1e44612ead3f4ab4678bb41434ec5b ChangeLog 4579
 MISC metadata.xml 214 RMD160 4120d9f1b831e1e14b793d69fcac8404e240747f SHA1 3852ff2530e5f89eaa57f1e316ba6684fadc2579 SHA256 f246585065033926d43d6fb617cf1c19cca0dd470c7efa44cbf957a9fa9e07b7
 MD5 4ce63071510202110ebc72dd9ee3924e metadata.xml 214
 RMD160 4120d9f1b831e1e14b793d69fcac8404e240747f metadata.xml 214
@@ -36,7 +40,7 @@ SHA256 d5235cdd9fa8abf6f83cfff61d9e260bb439c028d87c1948ab110797fe54e1bf files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGECiL6IPkARlRZfQRAvjzAJ9HlLCBwpbGzDCLmuMvvmwUKEnzNwCgqPXD
-QDe1Tadu+QiCfRDg6ma3mSU=
-=V+wD
+iD8DBQFGG5rC6IPkARlRZfQRAsmoAJ9jnGTF00oF6SSQB3AuqhuL4AGPRwCfQ5RZ
+9xdsvDnca52VasiS+MXLGOY=
+=/Khs
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrkit/cdrkit-1.1.4.ebuild b/app-cdr/cdrkit/cdrkit-1.1.4.ebuild
index 68ba98cf916e..88b13c852525 100644
--- a/app-cdr/cdrkit/cdrkit-1.1.4.ebuild
+++ b/app-cdr/cdrkit/cdrkit-1.1.4.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/cdrkit/cdrkit-1.1.4.ebuild,v 1.1 2007/04/01 21:47:47 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.4.ebuild,v 1.2 2007/04/10 14:10:02 pylon Exp $
 
 inherit eutils toolchain-funcs
 
@@ -22,6 +22,13 @@ RDEPEND="unicode? ( virtual/libiconv )"
 
 PROVIDE="virtual/cdrtools"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/cdrkit-readom-clone.patch
+}
+
 src_compile() {
 	cmake \
 		-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
diff --git a/app-cdr/cdrkit/files/cdrkit-readom-clone.patch b/app-cdr/cdrkit/files/cdrkit-readom-clone.patch
new file mode 100644
index 000000000000..7bd3272a936b
--- /dev/null
+++ b/app-cdr/cdrkit/files/cdrkit-readom-clone.patch
@@ -0,0 +1,39 @@
+--- cdrkit-1.1.4/readom/readom.c.orig	2007-04-02 07:09:55 +0000
++++ cdrkit-1.1.4/readom/readom.c	2007-04-02 07:16:16 +0000
+@@ -203,7 +203,7 @@
+ BOOL	do_write;
+ BOOL	c2scan;
+ BOOL	fulltoc;
+-BOOL	clone;
++BOOL	clonemode;
+ BOOL	noerror;
+ BOOL	nocorr;
+ BOOL	notrunc;
+@@ -300,7 +300,7 @@
+ 			&help, &help, &pversion,
+ 			&scanbus, &dev, &sectors, &do_write,
+ 			&c2scan,
+-			&fulltoc, &clone,
++			&fulltoc, &clonemode,
+ 			&noerror, &nocorr,
+ 			&notrunc, &retries, &do_factor, &filename,
+ 			&speed, getnum, &Sbufsize,
+@@ -535,7 +535,7 @@
+ 			comerrno(EX_BAD, "Not root. Will only work on CD-ROM in suid/priv mode\n");
+ 	}
+ 
+-	if (filename || sectors || c2scan || meshpoints || fulltoc || clone) {
++	if (filename || sectors || c2scan || meshpoints || fulltoc || clonemode) {
+ 		dorw(usalp, filename, sectors);
+ 	} else {
+ 		doit(usalp);
+@@ -687,7 +687,7 @@
+ 		if (params.name == NULL)
+ 			params.name = "/dev/null";
+ 		read_ftoc(usalp, &params, FALSE);
+-	} else if (clone) {
++	} else if (clonemode) {
+ 		if (!is_mmc(usalp, NULL, NULL))
+ 			comerrno(EX_BAD, "Unsupported device for clone mode.\n");
+ 		noerror = TRUE;
+