misc fixes

4 files changed, 134 insertions, 1 deletions

diff --git a/sys-apps/e2fsprogs/ChangeLog b/sys-apps/e2fsprogs/ChangeLog
index 9db538f55b17..deae480317e7 100644
--- a/sys-apps/e2fsprogs/ChangeLog
+++ b/sys-apps/e2fsprogs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/e2fsprogs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/ChangeLog,v 1.11 2002/12/09 22:56:32 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/ChangeLog,v 1.12 2002/12/26 18:43:35 azarah Exp $
+
+*e2fsprogs-1.32-r1 (26 Dec 2002)
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> e2fsprogs-1.32-r1.ebuild :
+
+  Fix trying to move lsattr, chattr and uuidgen to non existing directory
+  in src_install().  Move compile_et and mk_cmds to /usr/bin. Fix a cosmetic
+  error in mk_cmds help output.
 
   10 Dec 2002; Martin Schlemmer <azarah@gentoo.org> e2fsprogs-1.32.ebuild :
 
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild
new file mode 100644
index 000000000000..8789c9796225
--- /dev/null
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.32-r1.ebuild,v 1.1 2002/12/26 18:43:35 azarah Exp $
+
+IUSE="nls"
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+SLOT="0"
+LICENSE="GPL-2"
+
+#debianutils is for 'readlink'
+DEPEND="virtual/glibc
+	nls? ( sys-devel/gettext )
+	sys-apps/debianutils
+	sys-apps/texinfo"
+	
+RDEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix a cosmetic error in mk_cmds's help output.
+	cd ${S}; epatch ${FILESDIR}/${P}-mk_cmds-cosmetic.patch
+}
+
+src_compile() {
+	local myconf=""
+	
+	use nls \
+		&& myconf="--enable-nls" \
+		|| myconf="--disable-nls"
+	
+	econf	--enable-dynamic-e2fsck \
+		--enable-elf-shlibs \
+		${myconf} || die
+		
+	# Parallel make sometimes fails
+	MAKEOPTS="-j1" emake || die
+}
+
+src_install() {
+	einstall libdir=zapme || die
+	#evil e2fsprogs makefile -- I'll get you!
+	rm -rf ${D}/zapme
+	
+	make DESTDIR=${D} install-libs || die
+	
+	if [ "`use nls`" ]
+	then
+		( cd po; make 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
+
+	# 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-apps/e2fsprogs/files/digest-e2fsprogs-1.32-r1 b/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.32-r1
new file mode 100644
index 000000000000..36577bde405a
--- /dev/null
+++ b/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.32-r1
@@ -0,0 +1 @@
+MD5 a7ced9d6edaba3a000ccc5200e09b90d e2fsprogs-1.32.tar.gz 2894603
diff --git a/sys-apps/e2fsprogs/files/e2fsprogs-1.32-mk_cmds-cosmetic.patch b/sys-apps/e2fsprogs/files/e2fsprogs-1.32-mk_cmds-cosmetic.patch
new file mode 100644
index 000000000000..52b6d75b6c9f
--- /dev/null
+++ b/sys-apps/e2fsprogs/files/e2fsprogs-1.32-mk_cmds-cosmetic.patch
@@ -0,0 +1,11 @@
+--- e2fsprogs-1.32/lib/ss/mk_cmds.sh.in.orig	2002-12-26 18:44:42.000000000 +0200
++++ e2fsprogs-1.32/lib/ss/mk_cmds.sh.in	2002-12-26 18:45:33.000000000 +0200
+@@ -31,7 +31,7 @@
+ TMP="ct$$.c"
+ 
+ if test ! -f "$FILE" ; then
+-    echo "$FILE: File not found"
++    echo "mk_cmds: $FILE: File not found"
+     exit 1;
+ fi
+