Version bump #141246 by David Brown.

(Portage version: 2.1.1_pre4)

5 files changed, 220 insertions, 1 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 914f5259d561..0eef102e7a87 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.88 2006/04/27 23:06:36 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.89 2006/08/01 04:48:50 vapier Exp $
+
+*e2fsprogs-1.39 (01 Aug 2006)
+
+  01 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.39-libintl.patch, +files/e2fsprogs-1.39-makefile.patch,
+  +e2fsprogs-1.39.ebuild:
+  Version bump #141246 by David Brown.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
   Fixing SHA256 digest, pass four
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
new file mode 100644
index 000000000000..0ac4c608e32a
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild,v 1.1 2006/08/01 04:48:50 vapier Exp $
+
+inherit eutils flag-o-matic 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 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="nls static"
+
+RDEPEND="~sys-libs/com_err-${PV}
+	~sys-libs/ss-${PV}
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	sys-apps/texinfo"
+
+pkg_setup() {
+	# sanity check for #125146
+	if [[ -L ${ROOT}/usr/$(get_libdir)/libcom_err.a ]] || \
+	   [[ ! -e ${ROOT}/usr/$(get_libdir)/libcom_err.a ]]
+	then
+		rm -f "${ROOT}"/usr/$(get_libdir)/libcom_err.a
+		eerror "Your libcom_err.a is broken, please re-emerge com_err:"
+		eerror "  # emerge com_err"
+		die "Mr. T pities the fool with a broken libcom_err.a"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Fix locale issues while running tests #99766
+	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch
+	# Fix a cosmetic error in mk_cmds's help output.
+	epatch "${FILESDIR}"/e2fsprogs-1.32-mk_cmds-cosmetic.patch
+	chmod u+w po/*.po # Userpriv fix #27348
+	# Clean up makefile to suck less
+	epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch
+
+	# Fixes libintl handling on non-glibc #122368
+	epatch "${FILESDIR}"/${PN}-1.39-libintl.patch
+
+	# 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' \
+		$(grep -rl CONFIG_JBD_DEBUG *) \
+		|| die "sed jbd debug failed"
+
+	# fake out files we forked into sep packages
+	sed -i \
+		-e '/^LIB_SUBDIRS/s:lib/et::' \
+		-e '/^LIB_SUBDIRS/s:lib/ss::' \
+		Makefile.in || die "remove subdirs"
+	ln -s "${ROOT}"/usr/$(get_libdir)/libcom_err.a lib/libcom_err.a
+	ln -s "${ROOT}"/$(get_libdir)/libcom_err.so lib/libcom_err.so
+	ln -s /usr/bin/mk_cmds lib/ss/mk_cmds
+	ln -s "${ROOT}"/usr/include/ss/ss_err.h lib/ss/
+	ln -s "${ROOT}"/$(get_libdir)/libss.so lib/libss.so
+
+	# sanity check for Bug 105304
+	if [[ -z ${USERLAND} ]] ; then
+		eerror "You just hit Bug 105304, please post your 'emerge info' here:"
+		eerror "http://bugs.gentoo.org/105304"
+		die "Aborting to prevent screwing your system"
+	fi
+}
+
+src_compile() {
+	# Keep the package from doing silly things
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+
+	econf \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--enable-elf-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable !static dynamic-e2fsck) \
+		--without-included-gettext \
+		$(use_enable nls) \
+		$(use_enable userland_GNU fsck) \
+		|| die
+	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
+		die "Preventing included intl cruft from building"
+	fi
+	# Parallel make sometimes fails
+	emake -j1 COMPILE_ET=compile_et || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog README RELEASE-NOTES SHLIBS
+	docinto e2fsck
+	dodoc e2fsck/ChangeLog e2fsck/CHANGES
+
+	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
+	# and install linker scripts to /usr/lib/.
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/
+	dolib.a lib/*.a || die "dolib.a"
+	rm -f "${D}"/usr/$(get_libdir)/libcom_err.a #125146
+	local x
+	cd "${D}"/$(get_libdir)
+	for x in *.so ; do
+		gen_usr_ldscript ${x} || die "gen ldscript ${x}"
+	done
+
+	# move 'useless' stuff to /usr/
+	dosbin "${D}"/sbin/mklost+found
+	rm -f "${D}"/sbin/mklost+found
+
+	# these manpages are already provided by FreeBSD libc
+	use elibc_FreeBSD && \
+		rm -f "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
+			"${D}"/usr/share/man/man1/uuidgen.1
+}
diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39
new file mode 100644
index 000000000000..7e58444d768b
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39
@@ -0,0 +1,3 @@
+MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111
+RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111
+SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-libintl.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-libintl.patch
new file mode 100644
index 000000000000..85549a228438
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-libintl.patch
@@ -0,0 +1,11 @@
+--- e2fsprogs-1.39/MCONFIG.in
++++ e2fsprogs-1.39/MCONFIG.in
+@@ -71,7 +71,7 @@
+ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
+ LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@
+ LIBBLKID = $(LIB)/libblkid@LIB_EXT@ $(DEVMAPPER_LIBS)
+-LIBINTL = @LIBINTL@
++LIBINTL = @LTLIBINTL@
+ DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
+ 
+ STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch
new file mode 100644
index 000000000000..4eaebba15d23
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch
@@ -0,0 +1,72 @@
+--- Makefile.in
++++ Makefile.in
+@@ -48,3 +48,3 @@
+   install-shlibs-libs-recursive install-doc-libs
+-	if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi
++	$(MAKE) install-libs
+ 
+--- e2fsck/Makefile.in
++++ e2fsck/Makefile.in
+@@ -163,6 +163,6 @@
+ 	@echo "	LINK $(root_sbindir)/fsck.ext2"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	@$(LN_S) -f e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext2
+ 	@echo "	LINK $(root_sbindir)/fsck.ext3"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	@$(LN_S) -f e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext3
+@@ -176,6 +176,6 @@
+ 	@echo "	LINK $(man8dir)/fsck.ext2.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	@$(LN_S) -f e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext2.8
+ 	@echo "	LINK $(man8dir)/fsck.ext3.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	@$(LN_S) -f e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext3.8
+--- misc/Makefile.in
++++ misc/Makefile.in
+@@ -228,12 +228,12 @@
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext2"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	@$(LN_S) -f mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext2
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext3"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	@$(LN_S) -f mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext3
+ 	@echo "	LINK $(root_sbindir)/e2label"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
++	@$(LN_S) -f tune2fs \
+ 		$(DESTDIR)$(root_sbindir)/e2label
+ 	@echo "	LINK $(root_sbindir)/findfs"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
++	@$(LN_S) -f tune2fs \
+ 		$(DESTDIR)$(root_sbindir)/findfs
+@@ -257,6 +257,6 @@
+ 	@echo "	LINK mkfs.ext2.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	@$(LN_S) -f mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext2.8
+ 	@echo "	LINK mkfs.ext3.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	@$(LN_S) -f mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext3.8
+--- lib/uuid/Makefile.in
++++ lib/uuid/Makefile.in
+@@ -148,5 +148,5 @@
+ 	@echo "	LINK $(man3dir)/uuid_generate_random.3"
+-	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
++	@$(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
+ 	@echo "	LINK $(man3dir)/uuid_generate_time.3"
+-	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
++	@$(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
+ 	@echo "	INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
+--- lib/Makefile.elf-lib
++++ lib/Makefile.elf-lib
+@@ -49,3 +49,3 @@
+ 	@echo "	SYMLINK $(libdir)/$(ELF_IMAGE).so"
+-	@$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
++	@$(LN_S) -f $(ELF_SONAME) \
+ 		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so