old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index 30076325f6c59c9dbc35e005eaff88281d1fad5b..29f8375244a45daeb2c7434c614c0d08e845a2e3 100644 (file)
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,9 +1,5 @@
-AUX reiser4progs-1.0.6-preen.patch 2401 RMD160 4c6819f04a791e006d8cc29ccb319aba9dd2dce4 SHA1 c7aaedbaa069fe668e2b1f33211b5bc0741b19a2 SHA256 65cfe93fb1aaa4fdd05f01b36e1213a0c21b7267ebc87a8c42000495072b34f4
 AUX reiser4progs-1.0.7-gcc-4.4.patch 311 RMD160 c7975242c67610888cd6a694b64b0c90a520bf57 SHA1 6873e21bfddf38bdb0f3dfcb9106444e0daebcd8 SHA256 5d0fc888af703911457f42b16d4da76cfdcb5c38c08387c21f5f5e4e111160bf
-DIST reiser4progs-1.0.6.tar.gz 799613 RMD160 1ed86a37f4f52fe47a5c873cb13d253c69c05ae7 SHA1 9acc4f829c5760ee159cb3f507e58478e578990d SHA256 a0d19b85fec4641d0d4189b756182110577c06719773825126e5c314fa35d574
 DIST reiser4progs-1.0.7.tar.gz 844126 RMD160 6f6a6b5defdcea19f13857768596ff477f0cc877 SHA1 5e29580e6610105346ff88635d48eb37acb3ae67 SHA256 1211996ad3efebc0ca543aea2f67527d33e50fce1b827ad341e207f171d94d96
-EBUILD reiser4progs-1.0.6-r2.ebuild 1668 RMD160 2d3141d139bd16b3e43e868918ae12b99380ed54 SHA1 05310d8345f36697a58ef1982975a8682ff8d20f SHA256 23884507a5c8c3848984bef93c4272ac845d54a2078c1e50d069235ec1cbf9db
-EBUILD reiser4progs-1.0.6.ebuild 1613 RMD160 e0d3f058f43264b09e16af50f8e0ff2ed3ea6388 SHA1 7b4a4ec31403fee40a9aa9caf240068bde26aebf SHA256 4dd4564286f21b948650b9aeaff17d5c497738e68d9d6b0328c1c8d989a50d06
 EBUILD reiser4progs-1.0.7.ebuild 1541 RMD160 ed40f370c15556634c5ecbeeafddb29cabba5b7b SHA1 2e1b2823fc4857389b3bc89248ffb0900a4f3305 SHA256 474f3ccc5cd2bbd151e4f7b95d36445a215631ea0a9bf67b1ce44b497723dbf0
 MISC ChangeLog 5724 RMD160 0bc9178534b16d83135c4941581b55e9a3da751d SHA1 da6e2ba0ffb92ca128d77175f3df07cafa85e4d7 SHA256 71abe190424f1aee3422e53e91bd45332b9908ff503634005ad2f2439b850957
 MISC metadata.xml 267 RMD160 ff256714690dbcb9f54233ec9a4fbe77f11068f6 SHA1 f12cbf59a4688ee6b663b50b6a9a1871f096b71b SHA256 afd6f362214e67e2c73e745c7bb7e78c46c190a9c9ecf0712722850d23515e6b

diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch
deleted file mode 100644 (file)
index c48eb0d..0000000
--- a/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Alias -p "preen" to -a "auto".
-
-http://bugs.gentoo.org/195988
-
---- a/doc/fsck.reiser4.8
-+++ b/doc/fsck.reiser4.8
-@@ -54,7 +54,7 @@
- ignored.
- .SH PLUGIN OPTIONS
- .TP
--.B -p, --print-profile
-+.B --print-profile
- prints the plugin profile. This is the set of default plugins used for all
- parts of a filesystem -- format, nodes, files, directories, hashes, etc. If
- --override is specified, then prints modified plugins.
-@@ -82,6 +82,9 @@
- .B -f, --force
- forces fsck to use whole disk, not block device or mounted partition.
- .TP
-+.B -p, --preen
-+automatically repair minor corruptions on the filesystem.
-+.TP
- .B -c, --cache N
- tunes number of nodes in the libreiser4 tree buffer cache
- .RS
---- a/progs/fsck/fsck.c
-+++ b/progs/fsck/fsck.c
-@@ -28,7 +28,7 @@
-               "  -q, --quiet                   supresses gauges\n"
-               "  -r                            ignored\n"
-               "Plugins options:\n"
--              "  -p, --print-profile           prints the plugin profile.\n"
-+              "  --print-profile               prints the plugin profile.\n"
-               "  -l, --print-plugins           prints all known plugins.\n"
-               "  -o, --override TYPE=PLUGIN    overrides the default plugin of the type\n"
-               "                                \"TYPE\" by the plugin \"PLUGIN\" in the\n"
-@@ -39,6 +39,7 @@
-               "  -y, --yes                     assumes an answer 'yes' to all questions.\n"
-               "  -f, --force                   makes fsck to use whole disk, not block\n"
-               "                                device or mounted partition.\n"
-+              "  -p, --preen                   automatically repair the filesysem.\n"
-               "  -c, --cache N                 number of nodes in tree buffer cache\n");
- }
- 
-@@ -140,6 +141,7 @@
-               {"no-log", no_argument, NULL, 'n'},
-               {"auto", no_argument, NULL, 'a'},
-               {"force", no_argument, NULL, 'f'},
-+              {"preen", no_argument, NULL, 'p'},
-               {"cache", required_argument, 0, 'c'},
-               {"override", required_argument, NULL, 'o'},
-               /* Fsck hidden options. */
-@@ -190,6 +192,8 @@
-               case 'f':
-                       aal_set_bit(&data->options, FSCK_OPT_FORCE);
-                       break;
-+              case 'p':
-+                      /* Fall through to auto, as preen is an alias for -a */
-               case 'a':
-                       aal_set_bit(&data->options, FSCK_OPT_AUTO);
-                       break;
-@@ -226,9 +230,6 @@
-               case 'l':
-                       mode = RM_SHOW_PLUG;
-                       break;
--              case 'p':
--                      mode = RM_SHOW_PARM;
--                      break;
-               case 'o':
-                       aal_strncat(override, optarg, aal_strlen(optarg));
-                       aal_strncat(override, ",", 1);

diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.ebuild
deleted file mode 100644 (file)
index 87fa534..0000000
--- a/sys-fs/reiser4progs/reiser4progs-1.0.6-r2.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-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
-}

diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.6.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.6.ebuild
deleted file mode 100644 (file)
index 3b93d20..0000000
--- a/sys-fs/reiser4progs/reiser4progs-1.0.6.ebuild
+++ /dev/null
@@ -1,61 +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.ebuild,v 1.7 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}"
-
-       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
-}