From 7a90ca0549c7d67b4868b29103c65a4acc3aac4b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 26 Oct 2008 07:16:13 +0000 Subject: Fix by Anders Aagaard for -p (preen) operation #237393. (Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64) --- sys-fs/reiser4progs/ChangeLog | 9 +++- .../files/reiser4progs-1.0.6-preen.patch | 17 +++--- sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild | 62 ---------------------- sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild | 62 ++++++++++++++++++++++ 4 files changed, 78 insertions(+), 72 deletions(-) delete mode 100644 sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild create mode 100644 sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog index 52211bed1d13..d81a5a64ef59 100644 --- a/sys-fs/reiser4progs/ChangeLog +++ b/sys-fs/reiser4progs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/reiser4progs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.34 2008/05/31 17:48:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.35 2008/10/26 07:16:13 vapier Exp $ + +*reiser4progs-1.0.6-r2 (26 Oct 2008) + + 26 Oct 2008; Mike Frysinger + files/reiser4progs-1.0.6-preen.patch, -reiser4progs-1.0.6-r1.ebuild, + +reiser4progs-1.0.6-r2.ebuild: + Fix by Anders Aagaard for -p (preen) operation #237393. *reiser4progs-1.0.6-r1 (31 May 2008) diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch index d6b8374108a9..c48eb0d54169 100644 --- a/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch +++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch @@ -1,4 +1,4 @@ -make -p mean "preen" like all other checkers +Alias -p "preen" to -a "auto". http://bugs.gentoo.org/195988 @@ -50,17 +50,16 @@ http://bugs.gentoo.org/195988 {"cache", required_argument, 0, 'c'}, {"override", required_argument, NULL, 'o'}, /* Fsck hidden options. */ -@@ -203,6 +205,9 @@ - case 'q': - aux_gauge_set_handler(NULL, GT_PROGRESS); +@@ -190,6 +192,8 @@ + case 'f': + aal_set_bit(&data->options, FSCK_OPT_FORCE); break; + case 'p': -+ /* Fall through as preen should fix errors */ -+ mode = RM_FIX; - case 'y': - aal_set_bit(&data->options, FSCK_OPT_YES); ++ /* Fall through to auto, as preen is an alias for -a */ + case 'a': + aal_set_bit(&data->options, FSCK_OPT_AUTO); break; -@@ -226,9 +231,6 @@ +@@ -226,9 +230,6 @@ case 'l': mode = RM_SHOW_PLUG; break; diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild deleted file mode 100644 index b35c9cfd97fa..000000000000 --- a/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.6-r1.ebuild,v 1.2 2008/10/26 06:54:38 vapier Exp $ - -inherit toolchain-funcs autotools - -MY_P=${PN}-${PV/_p/-} -DESCRIPTION="reiser4progs: mkfs, fsck, etc..." -HOMEPAGE="http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/" -SRC_URI="mirror://kernel/linux/utils/fs/reiser4/reiser4progs/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86" -IUSE="static debug readline" - -DEPEND="~sys-libs/libaal-1.0.5 - readline? ( sys-libs/readline )" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-preen.patch #195988 - eautoreconf - - cat <<-EOF > run-ldconfig - #!/bin/sh - true - EOF -} - -src_compile() { - econf \ - $(use_enable static full-static) \ - $(use_enable static mkfs-static) \ - $(use_enable static fsck-static) \ - $(use_enable static debugfs-static) \ - $(use_enable static measurefs-static) \ - $(use_enable static cpfs-static) \ - $(use_enable static resizefs-static) \ - $(use_enable debug) \ - $(use_with readline) \ - --enable-libminimal \ - --sbindir=/sbin \ - || die "configure failed" - emake || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO - #resizefs binary doesnt exist in this release - rm -f "${D}"/usr/share/man/man8/resizefs* - - # move shared libs to / - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die - gen_usr_ldscript libreiser4-minimal.so libreiser4.so librepair.so -} diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild new file mode 100644 index 000000000000..87fa534a09fe --- /dev/null +++ b/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild,v 1.1 2008/10/26 07:16:13 vapier Exp $ + +inherit toolchain-funcs autotools + +MY_P=${PN}-${PV/_p/-} +DESCRIPTION="reiser4progs: mkfs, fsck, etc..." +HOMEPAGE="http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/" +SRC_URI="mirror://kernel/linux/utils/fs/reiser4/reiser4progs/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86" +IUSE="static debug readline" + +DEPEND="~sys-libs/libaal-1.0.5 + readline? ( sys-libs/readline )" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-preen.patch #195988 + eautoreconf + + cat <<-EOF > run-ldconfig + #!/bin/sh + true + EOF +} + +src_compile() { + econf \ + $(use_enable static full-static) \ + $(use_enable static mkfs-static) \ + $(use_enable static fsck-static) \ + $(use_enable static debugfs-static) \ + $(use_enable static measurefs-static) \ + $(use_enable static cpfs-static) \ + $(use_enable static resizefs-static) \ + $(use_enable debug) \ + $(use_with readline) \ + --enable-libminimal \ + --sbindir=/sbin \ + || die "configure failed" + emake || die "make failed" +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO + #resizefs binary doesnt exist in this release + rm -f "${D}"/usr/share/man/man8/resizefs* + + # move shared libs to / + dodir /$(get_libdir) + mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die + gen_usr_ldscript libreiser4-minimal.so libreiser4.so librepair.so +} -- cgit v1.2.3-65-gdbad