added a new e2fsprogs ebuild with the dietlibc changes, masked -*

4 files changed, 134 insertions, 4 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 1377c88cb740..7d0ae06a5cf5 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.35 2004/10/03 15:57:15 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.36 2004/10/05 01:59:52 lv Exp $
+
+*e2fsprogs-1.35-r2 (04 Oct 2004)
+
+  04 Oct 2004; Travis Tilley <lv@gentoo.org> +e2fsprogs-1.35-r2.ebuild:
+  added a new e2fsprogs ebuild with the dietlibc changes, masked -*
 
   03 Oct 2004; Travis Tilley <lv@gentoo.org> e2fsprogs-1.35-r1.ebuild:
-  revert dietlibc changes so that the amd64 stable version of e2fsprogs actually
-  compiles again
+  reverted the dietlibc changes. they cause compile problems here.
 
   03 Oct 2004; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.35-r1.ebuild:
   Support dietlibc #36306 by Adam.
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 403ab58c3bf1..a5f1ce1d64b5 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,4 +1,3 @@
-MD5 35102ddcc121f87b91a5c1fde07653ba ChangeLog 8530
 MD5 7295f3452399877281fc761d36c48eba e2fsprogs-1.32-r2.ebuild 2276
 MD5 5854a4ebf286618336853006fb70fa44 e2fsprogs-1.33.ebuild 2471
 MD5 2edb0d073060c192284a71d32d02adcc e2fsprogs-1.34-r1.ebuild 2884
@@ -6,6 +5,8 @@ MD5 11f6d7ba53227f4104cf0c76fc29d554 e2fsprogs-1.34.ebuild 2768
 MD5 aa948c065bfdd5397dd1e4edf8d4cf9d e2fsprogs-1.35-r1.ebuild 3080
 MD5 2ee511ac5e5941604b071c9a3ff3c916 e2fsprogs-1.35.ebuild 2794
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 b01b85ff707aa73241e177a1219b058b ChangeLog 8499
+MD5 7b4d6c8aac98aa2a1c172fc552a6df87 e2fsprogs-1.35-r2.ebuild 3174
 MD5 db361eb5cdf39ddae07e9f794d308b42 files/digest-e2fsprogs-1.32-r2 67
 MD5 3307c0c209b26bf447ff2840b7118862 files/digest-e2fsprogs-1.33 67
 MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34 67
@@ -17,3 +18,4 @@ MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch
 MD5 d9d69b54c577273521f4b8c2013a7a09 files/e2fsprogs-1.34-kernel-2.6-fix.patch 934
 MD5 b3b97c7ba36458e2842891e96e1ce0de files/e2fsprogs-1.34-swap-symlink.diff 1091
 MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
+MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r2 67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35-r2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35-r2.ebuild
new file mode 100644
index 000000000000..ade2919d1d27
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.35-r2.ebuild
@@ -0,0 +1,123 @@
+# 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.35-r2.ebuild,v 1.1 2004/10/05 01:59:52 lv Exp $
+
+inherit eutils flag-o-matic gnuconfig
+
+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="-*"
+#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm hppa amd64 ~ia64 ~ppc64 ~s390"
+IUSE="nls static diet"
+
+RDEPEND="!diet? ( virtual/libc )
+	diet? ( dev-libs/dietlibc )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	sys-apps/texinfo"
+
+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
+	# 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
+
+	gnuconfig_update
+
+	# Use -fPIC compiled shared files in .a files. Fix kdelibs-3.3.0 compilation on hppa.
+	use static || sed -e '/ARUPD/s:$(OBJS):elfshared/*.o:' -i ${S}/lib/Makefile.library
+}
+
+src_compile() {
+	local myconf
+
+	# building e2fsprogs on sparc results in silo breaking
+	[ "${ARCH}" = "sparc" ] && filter-flags "-fstack-protector"
+
+	use static \
+		&& myconf="${myconf} --with-ldopts=-static" \
+		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
+
+	econf \
+		$(use_enable nls) \
+		$(use_with diet diet-libc) \
+		${myconf} || die
+
+	# Parallel make sometimes fails
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR=${D} libdir=/zapme install || 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 ChangeLog README RELEASE-NOTES SHLIBS
+	docinto e2fsck
+	dodoc e2fsck/ChangeLog e2fsck/CHANGES
+
+	dodir /$(get_libdir) /bin /sbin
+	cd ${D}/usr/$(get_libdir)
+	mv * ../../$(get_libdir)
+	cd ${D}/$(get_libdir)
+	mv *.a ../usr/$(get_libdir)
+	local mylib=""
+	local x=""
+	#install ldscripts to fix bug #4411
+	cd ${D}/usr/$(get_libdir)
+	for x in *.a
+	do
+		[ ! -f ${x} ] && continue
+		gen_usr_ldscript ${x/a}so
+	done
+	#normalize evil symlinks
+	cd ${D}/$(get_libdir)
+	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}/$(get_libdir)/et
+	insinto /usr/share/et
+	doins et_c.awk et_h.awk
+	cd ${S}/$(get_libdir)/ss
+	insinto /usr/share/ss
+	doins ct_c.awk
+}
diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.35-r2 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.35-r2
new file mode 100644
index 000000000000..38322e76f0f4
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.35-r2
@@ -0,0 +1 @@
+MD5 8d25ffd60d405ef32d341704a2323807 e2fsprogs-1.35.tar.gz 3152299