old

7 files changed, 13 insertions, 300 deletions

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 7ac5fbb29e0a..8cd850619dff 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,14 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 37957ff070794e896cafa685d8a0e0cc ChangeLog 9116
-MD5 2d3f2a306496793ef77c92c91dda2203 e2fsprogs-1.35-r1.ebuild 3465
-MD5 11f6d7ba53227f4104cf0c76fc29d554 e2fsprogs-1.34.ebuild 2768
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 2edb0d073060c192284a71d32d02adcc e2fsprogs-1.34-r1.ebuild 2884
 MD5 3a25e968d4e9df1c0942bbd5ecc54c5a e2fsprogs-1.35.ebuild 2821
-MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34-r1 67
-MD5 b3b97c7ba36458e2842891e96e1ce0de files/e2fsprogs-1.34-swap-symlink.diff 1091
-MD5 d9d69b54c577273521f4b8c2013a7a09 files/e2fsprogs-1.34-kernel-2.6-fix.patch 934
-MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35 67
-MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34 67
-MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
+MD5 2d3f2a306496793ef77c92c91dda2203 e2fsprogs-1.35-r1.ebuild 3465
 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
+MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
+MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35 67
 MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBtk5oroRuSHgZdywRAqs/AKCAriXXK2o8K02lLTOeWqXakFSJHACeOu7K
+eortxkBdFArZIZtbzqqJob8=
+=Uy4O
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.34-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.34-r1.ebuild
deleted file mode 100644
index 0b610cfbd973..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.34-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.34-r1.ebuild,v 1.7 2004/06/30 17:08:26 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~sparc ~mips ~hppa ~amd64 ia64 ~ppc64 s390"
-IUSE="nls static"
-
-#debianutils is for 'readlink'
-DEPEND="${DEPEND}
-	virtual/libc
-	nls? ( sys-devel/gettext )
-	sys-apps/debianutils
-	sys-apps/texinfo"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	# Fix a cosmetic error in mk_cmds's help output.
-	cd ${S}; epatch ${FILESDIR}/e2fsprogs-1.32-mk_cmds-cosmetic.patch
-	# Needed for 2.6 support:
-	epatch ${FILESDIR}/${P}-kernel-2.6-fix.patch
-	# Big endian fix for symlinks with extended attributes
-	epatch ${FILESDIR}/e2fsprogs-1.34-swap-symlink.diff
-	# Userpriv fix. Closes #27348
-	chmod u+w po/*.po
-	# Patch to make the configure and sed scripts more friendly to, 
-	# for example, the Estonian locale
-	epatch ${FILESDIR}/${PN}-sed-locale.patch
-}
-
-src_compile() {
-	local myconf
-
-	use static \
-		&& myconf="${myconf} --with-ldopts=-static" \
-		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
-
-	econf \
-		`use_enable nls` \
-		${myconf} || die
-
-	# Parallel make sometimes fails
-	emake -j1 || die
-}
-
-src_install() {
-	einstall libdir=zapme || die
-	#evil e2fsprogs makefile -- I'll get you!
-	rm -rf ${D}/zapme
-
-	make DESTDIR=${D} install-libs || die
-
-	#There is .po file b0rkage with 1.33; commenting this out (drobbins, 21 Apr 2003)
-	#if use nls; then
-	#	make -C po DESTDIR=${D} install || die
-	#fi
-
-	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
-	docinto e2fsck
-	dodoc e2fsck/ChangeLog e2fsck/CHANGES
-
-	dodir /lib /bin /sbin
-	cd ${D}/usr/lib
-	mv * ../../lib
-	cd ${D}/lib
-	mv *.a ../usr/lib
-	local mylib=""
-	local x=""
-	#install ldscripts to fix bug #4411
-	cd ${D}/usr/lib
-	for x in *.a
-	do
-		[ ! -f ${x} ] && continue
-		gen_usr_ldscript ${x/a}so
-	done
-	#normalize evil symlinks
-	cd ${D}/lib
-	for x in *
-	do
-		[ ! -L ${x} ] && continue
-		mylib="`readlink ${x}`"
-		mylib="`basename ${mylib}`"
-		ln -sf ${mylib} ${x}
-	done
-
-	mv ${D}/usr/sbin/* ${D}/sbin
-	cd ${D}/usr/bin
-	mv lsattr chattr uuidgen ../../bin
-	cd ${D}/sbin
-	mv mklost+found ../usr/sbin
-	#time to convert hard links/duplicates to symbolic links
-	cd ${D}/sbin
-	rm fsck.*
-	ln -sf e2fsck fsck.ext2
-	ln -sf e2fsck fsck.ext3
-	rm mkfs.*
-	ln -sf mke2fs mkfs.ext2
-	ln -sf mke2fs mkfs.ext3
-
-	# 03 Aug 2002 <raker@gentoo.org>
-	# There are awk files that don't get installed when doing
-	# a 'make install'.  They are the template files for
-	# /bin/compile_et.
-
-	cd ${S}/lib/et
-	insinto /usr/share/et
-	doins et_c.awk et_h.awk
-	cd ${S}/lib/ss
-	insinto /usr/share/ss
-	doins ct_c.awk
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
deleted file mode 100644
index 7cd0e0d3951c..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild,v 1.20 2004/06/30 17:08:26 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64 ppc64"
-IUSE="nls static"
-
-#debianutils is for 'readlink'
-DEPEND="${DEPEND}
-	virtual/libc
-	nls? ( sys-devel/gettext )
-	sys-apps/debianutils
-	sys-apps/texinfo"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	# Fix a cosmetic error in mk_cmds's help output.
-	cd ${S}; epatch ${FILESDIR}/e2fsprogs-1.32-mk_cmds-cosmetic.patch
-	# Needed for 2.6 support:
-	epatch ${FILESDIR}/${P}-kernel-2.6-fix.patch
-	# Userpriv fix. Closes #27348
-	chmod u+w po/*.po
-	# Patch to make the configure and sed scripts more friendly to, 
-	# for example, the Estonian locale
-	epatch ${FILESDIR}/${PN}-sed-locale.patch
-}
-
-src_compile() {
-	local myconf
-
-	use static \
-		&& myconf="${myconf} --with-ldopts=-static" \
-		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
-
-	econf \
-		`use_enable nls` \
-		${myconf} || die
-
-	# Parallel make sometimes fails
-	emake -j1 || die
-}
-
-src_install() {
-	einstall libdir=zapme || die
-	#evil e2fsprogs makefile -- I'll get you!
-	rm -rf ${D}/zapme
-
-	make DESTDIR=${D} install-libs || die
-
-	#There is .po file b0rkage with 1.33; commenting this out (drobbins, 21 Apr 2003)
-	#if use nls; then
-	#	make -C po DESTDIR=${D} install || die
-	#fi
-
-	dodoc COPYING ChangeLog README RELEASE-NOTES SHLIBS
-	docinto e2fsck
-	dodoc e2fsck/ChangeLog e2fsck/CHANGES
-
-	dodir /lib /bin /sbin
-	cd ${D}/usr/lib
-	mv * ../../lib
-	cd ${D}/lib
-	mv *.a ../usr/lib
-	local mylib=""
-	local x=""
-	#install ldscripts to fix bug #4411
-	cd ${D}/usr/lib
-	for x in *.a
-	do
-		[ ! -f ${x} ] && continue
-		gen_usr_ldscript ${x/a}so
-	done
-	#normalize evil symlinks
-	cd ${D}/lib
-	for x in *
-	do
-		[ ! -L ${x} ] && continue
-		mylib="`readlink ${x}`"
-		mylib="`basename ${mylib}`"
-		ln -sf ${mylib} ${x}
-	done
-
-	mv ${D}/usr/sbin/* ${D}/sbin
-	cd ${D}/usr/bin
-	mv lsattr chattr uuidgen ../../bin
-	cd ${D}/sbin
-	mv mklost+found ../usr/sbin
-	#time to convert hard links/duplicates to symbolic links
-	cd ${D}/sbin
-	rm fsck.*
-	ln -sf e2fsck fsck.ext2
-	ln -sf e2fsck fsck.ext3
-	rm mkfs.*
-	ln -sf mke2fs mkfs.ext2
-	ln -sf mke2fs mkfs.ext3
-
-	# 03 Aug 2002 <raker@gentoo.org>
-	# There are awk files that don't get installed when doing
-	# a 'make install'.  They are the template files for
-	# /bin/compile_et.
-
-	cd ${S}/lib/et
-	insinto /usr/share/et
-	doins et_c.awk et_h.awk
-	cd ${S}/lib/ss
-	insinto /usr/share/ss
-	doins ct_c.awk
-}
diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.34 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.34
deleted file mode 100644
index a0afabeaa2cf..000000000000
--- a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.34
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9be9375224f0970a55e39ebebf2a0ce5 e2fsprogs-1.34.tar.gz 3074827
diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.34-r1 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.34-r1
deleted file mode 100644
index a0afabeaa2cf..000000000000
--- a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.34-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9be9375224f0970a55e39ebebf2a0ce5 e2fsprogs-1.34.tar.gz 3074827
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch
deleted file mode 100644
index 2265db400c8b..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ruN e2fsprogs-1.33.orig/misc/util.c e2fsprogs-1.33/misc/util.c
---- e2fsprogs-1.33.orig/misc/util.c	2003-03-02 01:29:00.000000000 +0100
-+++ e2fsprogs-1.33/misc/util.c	2003-10-18 20:06:46.866581288 +0200
-@@ -108,8 +108,20 @@
- #define MAJOR(dev)	((dev)>>8)
- #define MINOR(dev)	((dev) & 0xff)
- #endif
-+
-+#ifndef SCSI_DISK_MAJOR
-+#ifdef SCSI_DISK8_MAJOR
-+#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
-+	((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \
-+	((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR))
-+#else
-+#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
-+	((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR))
-+#endif
-+#endif
-+
- #ifndef SCSI_BLK_MAJOR
--#define SCSI_BLK_MAJOR(M)  ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR)
-+#define SCSI_BLK_MAJOR(M)  (SCSI_DISK_MAJOR(M) || (M) == SCSI_CDROM_MAJOR)
- #endif
- 	if (((MAJOR(s.st_rdev) == HD_MAJOR &&
- 	      MINOR(s.st_rdev)%64 == 0) ||
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.34-swap-symlink.diff b/sys-fs/e2fsprogs/files/e2fsprogs-1.34-swap-symlink.diff
deleted file mode 100644
index 27d5956f3786..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.34-swap-symlink.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-ext2fs_swap_inode assumes that symlinks with i_blocks > 0 are slow. If a
-fast symlink has extended attributes, these are accounted for in
-i_blocks too, so on big endian machines, ext2fs_swap_inode swaps the
-i_block array of fast symlinks.
-
-  Andreas Gruenbacher <agruen@suse.de>, SuSE Labs
-
---- e2fsprogs-1.34/lib/ext2fs/swapfs.c.orig	2003-08-30 11:33:42.000000000 +0000
-+++ e2fsprogs-1.34/lib/ext2fs/swapfs.c	2003-08-30 11:47:57.000000000 +0000
-@@ -75,7 +75,7 @@
- void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
- 		       struct ext2_inode *f, int hostorder)
- {
--	unsigned i;
-+	unsigned i, xattr_blocks;
- 	int islnk = 0;
- 	
- 	if (hostorder && LINUX_S_ISLNK(f->i_mode))
-@@ -93,7 +93,8 @@
- 	t->i_links_count = ext2fs_swab16(f->i_links_count);
- 	t->i_blocks = ext2fs_swab32(f->i_blocks);
- 	t->i_flags = ext2fs_swab32(f->i_flags);
--	if (!islnk || f->i_blocks) {
-+	xattr_blocks = (t->i_file_acl) ? (fs->blocksize >> 9) : 0;
-+	if (!islnk || t->i_blocks - xattr_blocks) {
- 		for (i = 0; i < EXT2_N_BLOCKS; i++)
- 			t->i_block[i] = ext2fs_swab32(f->i_block[i]);
- 	} else if (t != f) {