Depend on readline since we use it #395623 by Maxim Kammerer. Clean up ebuild/patches while we are here.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

6 files changed, 38 insertions, 33 deletions

diff --git a/sys-fs/udftools/ChangeLog b/sys-fs/udftools/ChangeLog
index ecbc10eb96a6..ba0a6360f511 100644
--- a/sys-fs/udftools/ChangeLog
+++ b/sys-fs/udftools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udftools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/ChangeLog,v 1.29 2011/07/29 08:36:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/ChangeLog,v 1.30 2011/12/22 16:27:57 vapier Exp $
+
+  22 Dec 2011; Mike Frysinger <vapier@gentoo.org> udftools-1.0.0b-r9.ebuild,
+  files/udftools-1.0.0b-bigendian.patch, files/udftools-1.0.0b-gcc4.patch,
+  files/udftools-1.0.0b-openflags.patch:
+  Depend on readline since we use it #395623 by Maxim Kammerer. Clean up
+  ebuild/patches while we are here.
 
   29 Jul 2011; Zac Medico <zmedico@gentoo.org> udftools-1.0.0b-r9.ebuild:
   Add ~x86-linux keyword.
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 55cbc72a0189..d96497d33b3f 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX cdrwtool-linux2.6-fix-v2.patch 876 RMD160 5cbc14db22843af35de801757551e0f4a6d5ac55 SHA1 00f98cb0c5552ff7e11b9c0523ed384d7215958d SHA256 887200ca417f60ee87e57cafe583ed3555be59fbec7f6eb4fbee60ed41ee9467
 AUX pktcdvd.init 1412 RMD160 b3f2d373eeb64f322b2d0761ed6fb41b29173298 SHA1 9e60b921ada80f9227f41f00417e0cb2d55f67cc SHA256 2a8314e0f438dda3d8e35cc5844a421ecf7a9ab4fedb4a9048b3104fe9888b2e
-AUX udftools-1.0.0b-bigendian.patch 946 RMD160 e562a456363c34eccb9f13cdc0db04294600a3e2 SHA1 b58d5e2b33aa220d823c66c00762ce9df252b1da SHA256 7325446dc0a2a6c3afe8fd0314c301e86291a4019bcef774b4b3d22ad58d6fde
-AUX udftools-1.0.0b-gcc4.patch 478 RMD160 77b2bd7a6b856ec0ed5e11a3a48fd92d884fb517 SHA1 fecea46c5795bc48b789a2e19ccea03a018aec16 SHA256 ac4b8e62b1d726b93086c2e41607c8a1966a473ad56938a8a988a0313f546fc7
+AUX udftools-1.0.0b-bigendian.patch 985 RMD160 edebc1a50c8a96ee76b51d1877e37bb8c38f90ee SHA1 37af9206441c89f91286e416707be0748da9743b SHA256 b0a6c15b2cce7f19b91cacf08e9c5c24b70c16bee2b2e36b635739a6fd76b4c3
+AUX udftools-1.0.0b-gcc4.patch 354 RMD160 8bb6a5c078d5c079acac1532c67ddefb5204706b SHA1 7cecd9059771ff733013f1e2211cf4a759418d9e SHA256 4359a9089eae2ea20cdf78696aefc8a7a8097512ff56b12c7b59ecad7e75f2bd
 AUX udftools-1.0.0b-limits_h.patch 417 RMD160 37a712b24a3bc86fd4472f249ff7dc87ff37532b SHA1 9a1a71a095ee7024bfbe1a778fccbbd5e3a27416 SHA256 9e66903b779617097252516ed64e9d80b2a65866404e3c0d60ac250cf535ab4e
-AUX udftools-1.0.0b-openflags.patch 595 RMD160 cce26266e16bcb5964362cbde17ea0f30d74f543 SHA1 2df184aba5c608ab4269fdb5b50686f009323de4 SHA256 5ab15e86c4c5bbca6a82cb0a6fcb80cbac5f8bda0af343d397fa38821ccf54b4
+AUX udftools-1.0.0b-openflags.patch 432 RMD160 fa5edfb873bf403a35e0968db993156a23d44333 SHA1 07730121ba320fc3480ba8bb236502649d50b5bf SHA256 7c578dc4e448b9f1019afd12cd258931c187a540e0117d2293f47cbaff7b164d
 DIST udftools-1.0.0b3.patch.bz2 3372 RMD160 f7773f0c46e4d6eeb3883eb0fd85aa121e3fce5f SHA1 54d06dd2d1b3d3197c2e9461fe9d45c7fef8e007 SHA256 4c35eb06da92677203137ee407ba29bdf0bec574550567cc6cecb63158099dbb
 DIST udftools-1.0.0b3.tar.gz 293257 RMD160 81cefe71f64611c1c5aca920bddacd9b18400fa7 SHA1 f1ceaff8dad3ddd5fe55c0b8db804fe7ca3b4308 SHA256 c5079e878d4d8e03de0fd75bfecf485a299689b8289a5288f18b2e793e0904a0
-EBUILD udftools-1.0.0b-r9.ebuild 1228 RMD160 46a2bc0ab4cf6f53d95b513881da8caaf9992cc0 SHA1 9a08643bfcec45c3ca472fddff1a29a85de73154 SHA256 c6e6755e1d175db4f6e512b978e6422ad6f56c3f56db6912d707aa1125db4be0
-MISC ChangeLog 4619 RMD160 061a5bcf83d08c5143aa3864003ba6257fb8f080 SHA1 01a685b20a495b054f6603c4966ac8e705a691bc SHA256 483f26b931532007baa454e69c930826c7ca30e478f509a2694bb750023817ee
+EBUILD udftools-1.0.0b-r9.ebuild 1163 RMD160 1f50fef3f6e9bb71ceb7d26b4eb591114d37beee SHA1 54434369d7246b99cf56e3a0c4fd19585ab174f5 SHA256 412d6ab555fafe45d3cc264604ea24abc40813eed397679daf10ec626b765bcc
+MISC ChangeLog 4921 RMD160 c1b15b66ebf54e6b419d39d232b821f7cb39da93 SHA1 0f9eca25fe156b7b8b730c8363d2bffb70f84eda SHA256 cfad074b3bf7fc078a3fc2c290563736bda119557e8d26d788d27e8ef5d4acab
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4ycSAACgkQ/ejvha5XGaPlmgCglXfHrBNgSQOIYw1SK0zOSbYo
-zEYAoLKVI+E/NbCeJgiL1MO855228yVz
-=IqX3
+iF4EAREIAAYFAk7zWpcACgkQaC/OocHi7JamBgD/X49sIMOU6GZ4fnnJq8fiQBJ6
+pp+U6s3K2QMBrpU3wLAA/1Ib86MTEn/az5s3WL4lstjRrjbmvHgJwC8pt868vgS5
+=oApV
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch b/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch
index 252fd06c193a..d49b2561e4e9 100644
--- a/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch
+++ b/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch
@@ -1,3 +1,7 @@
+http://bugs.gentoo.org/120245
+
+BE fix
+
 ===================================================================
 RCS file: /cvsroot/linux-udf/udftools/mkudffs/mkudffs.c,v
 retrieving revision 1.3
diff --git a/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch b/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch
index 4ffa51826490..3b58f20f0173 100644
--- a/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch
+++ b/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch
@@ -1,6 +1,9 @@
-diff -urN ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c ./wrudf/wrudf.c
---- ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c	2002-11-26 08:18:51.000000000 +0100
-+++ ./wrudf/wrudf.c	2005-01-04 16:56:49.394078200 +0100
+http://bugs.gentoo.org/112122
+
+gcc4 compat
+
+--- a/wrudf/wrudf.c
++++ b/wrudf/wrudf.c
 @@ -245,7 +245,7 @@
  	    } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 )
  		virtualPartitionNum = i;
diff --git a/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch b/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch
index a1408746b699..88803e43d6fb 100644
--- a/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch
+++ b/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch
@@ -1,8 +1,7 @@
 From: Magnus Granberg <zorry@ume.nu>
-https://bugs.gentoo.org/show_bug.cgi?id=232100
+https://bugs.gentoo.org/232100
 Remove nonsense O_CREAT flag
 
-diff -Nur /var/tmp/portage/sys-fs/udftools-1.0.0b-r7/work/udftools-1.0.0b3/pktsetup/pktsetup.c /root/hardened/udftools-1.0.0b3/pktsetup/pktsetup.c
 --- pktsetup/pktsetup.c	2008-06-19 00:27:08.000000000 +0200
 +++ pktsetup/pktsetup.c	2008-06-19 00:20:31.000000000 +0200
 @@ -85,7 +85,7 @@
diff --git a/sys-fs/udftools/udftools-1.0.0b-r9.ebuild b/sys-fs/udftools/udftools-1.0.0b-r9.ebuild
index 5d94a87af023..b0d295e80c48 100644
--- a/sys-fs/udftools/udftools-1.0.0b-r9.ebuild
+++ b/sys-fs/udftools/udftools-1.0.0b-r9.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/udftools-1.0.0b-r9.ebuild,v 1.5 2011/07/29 08:36:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/udftools-1.0.0b-r9.ebuild,v 1.6 2011/12/22 16:27:57 vapier Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -16,27 +18,18 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86 ~x86-linux"
 IUSE=""
 
-S=${WORKDIR}/${MY_P}
+RDEPEND="sys-libs/readline"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S=${WORKDIR}/${MY_P}
 
+src_prepare() {
 	# For new kernel packet writing driver
 	epatch "${WORKDIR}"/${MY_P}.patch
-
-	# Fix CD blanking for 2.6.8 and newer
 	epatch "${FILESDIR}"/cdrwtool-linux2.6-fix-v2.patch
-
-	# gcc4 compat, bug #112122
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-
-	# BE fix, bug #120245
-	epatch "${FILESDIR}"/${P}-bigendian.patch
-
-	# gcc 4.3 fix, bug #232100
-	epatch "${FILESDIR}"/${P}-openflags.patch
-
+	epatch "${FILESDIR}"/${P}-gcc4.patch #112122
+	epatch "${FILESDIR}"/${P}-bigendian.patch #120245
+	epatch "${FILESDIR}"/${P}-openflags.patch #232100
 	epatch "${FILESDIR}"/${P}-limits_h.patch
 }