Version bump, resolves bug #80567.

Package-Manager: portage-2.0.51-r15

4 files changed, 134 insertions, 4 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index ab09598a684b..8411effb2d6c 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.45 2005/01/18 13:15:57 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.46 2005/02/06 21:57:56 chainsaw Exp $
+
+*e2fsprogs-1.36 (06 Feb 2005)
+
+  06 Feb 2005; Tony Vroon <chainsaw@gentoo.org> +e2fsprogs-1.36.ebuild:
+  Version bump, resolves bug #80567. Compiles on GCC 4.
 
   18 Jan 2005; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.35-r1.ebuild:
   Marked stable on mips.
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index e42b06d31ab2..ea009d65151e 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,8 +1,10 @@
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 a8d75dbeb833db5e0a88650264fb0076 ChangeLog 9321
-MD5 d44b2892adf62734a7b41cc659791104 e2fsprogs-1.35-r1.ebuild 3376
 MD5 322a89ea7d860b06dd825ee790ccdbb0 e2fsprogs-1.35.ebuild 2822
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d44b2892adf62734a7b41cc659791104 e2fsprogs-1.35-r1.ebuild 3376
+MD5 cedf1cc9fdc0544d15b69f2b24b81366 e2fsprogs-1.36.ebuild 3140
 MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35 67
+MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
+MD5 e86bf4d241506baff5f647cbd30ae7a0 files/digest-e2fsprogs-1.36 67
 MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r1 67
 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
-MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild
new file mode 100644
index 000000000000..5d63be2f8aa0
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild,v 1.1 2005/02/06 21:57:56 chainsaw Exp $
+
+inherit eutils flag-o-matic gnuconfig toolchain-funcs
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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
+
+	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
+
+	# kernel headers use the same defines as e2fsprogs and can cause issues #48829
+	sed -i \
+		-e 's:CONFIG_JBD_DEBUG:__CONFIG_JBD_DEBUG__E2FS:g' \
+		configure e2fsck/journal.c e2fsck/recovery.c \
+		e2fsck/unix.c lib/ext2fs/kernel-jbd.h \
+		|| die "sed jbd debug failed"
+}
+
+src_compile() {
+	# building e2fsprogs on sparc results in silo breaking
+	[ "${ARCH}" = "sparc" ] && filter-flags -fstack-protector
+
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+
+	local myconf
+	use static \
+		&& myconf="${myconf} --with-ldopts=-static" \
+		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
+	use diet && myconf="${myconf} --with-diet-libc"
+	econf \
+		$(use_enable nls) \
+		${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
+
+	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.36 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.36
new file mode 100644
index 000000000000..b9df1ce9da18
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.36
@@ -0,0 +1 @@
+MD5 1804ee96b76e5e7113fe3cecd6fe582b e2fsprogs-1.36.tar.gz 3264042