From ffa4a7bd9fcdb3191717532f55b5cc903cbacc81 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 22 Dec 2011 16:27:57 +0000 Subject: Depend on readline since we use it #395623 by Maxim Kammerer. Clean up ebuild/patches while we are here. (Portage version: 2.2.0_alpha81/cvs/Linux x86_64) --- sys-fs/udftools/ChangeLog | 8 ++++++- .../udftools/files/udftools-1.0.0b-bigendian.patch | 4 ++++ sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch | 9 +++++--- .../udftools/files/udftools-1.0.0b-openflags.patch | 3 +-- sys-fs/udftools/udftools-1.0.0b-r9.ebuild | 27 ++++++++-------------- 5 files changed, 28 insertions(+), 23 deletions(-) (limited to 'sys-fs') 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 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 udftools-1.0.0b-r9.ebuild: Add ~x86-linux keyword. 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 -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 } -- cgit v1.2.3-65-gdbad