bug #4411

3 files changed, 120 insertions, 1 deletions

diff --git a/sys-apps/e2fsprogs/ChangeLog b/sys-apps/e2fsprogs/ChangeLog
index a0c1ecf36676..7a8f67bb4e78 100644
--- a/sys-apps/e2fsprogs/ChangeLog
+++ b/sys-apps/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.6 2002/09/25 11:49:17 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/ChangeLog,v 1.7 2002/10/26 10:29:20 azarah Exp $
+
+*e2fsprogs-1.29-r1 (26 Oct 2002)
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Install linker scripts to fix bug #4411.
 
 *e2fsprogs-1.29 (25 Sep 2002)
 
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.29-r1.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.29-r1.ebuild
new file mode 100644
index 000000000000..a24b24a07ecd
--- /dev/null
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.29-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.29-r1.ebuild,v 1.1 2002/10/26 10:29:20 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 sparc64 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_compile() {
+	local myconf=""
+	
+	use nls \
+		&& myconf="--enable-nls" \
+		|| myconf="--disable-nls"
+	
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--enable-dynamic-e2fsck \
+		--enable-elf-shlibs \
+		${myconf} || die
+		
+	# Parallel make sometimes fails
+	make || 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
+	
+	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/bin/* ${D}/bin
+	mv ${D}/usr/sbin/* ${D}/sbin
+	cd ${D}/usr/bin
+	mv lsattr chattr uuidgen ../usr/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.29-r1 b/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.29-r1
new file mode 100644
index 000000000000..c82fd38c3c67
--- /dev/null
+++ b/sys-apps/e2fsprogs/files/digest-e2fsprogs-1.29-r1
@@ -0,0 +1 @@
+MD5 7a468aaa995202e2a365c7e7be462bc9 e2fsprogs-1.29.tar.gz 2279693