Version bump #267402 by Paul Mulders.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 215 insertions, 1 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 92c68f1d2da1..546ae3415595 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.184 2009/04/05 03:15:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.185 2009/05/29 23:27:02 vapier Exp $
+
+*e2fsprogs-1.41.5 (29 May 2009)
+
+  29 May 2009; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.41.5.ebuild,
+  +files/e2fsprogs-1.41.5-makefile.patch:
+  Version bump #267402 by Paul Mulders.
 
   05 Apr 2009; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.41.4.ebuild:
   Move LDCONFIG/STRIP disabling to src_install #264469 by Nick Fortino.
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.5.ebuild
new file mode 100644
index 000000000000..6fdfb3d0a6e0
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.5.ebuild,v 1.1 2009/05/29 23:27:02 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	sys-apps/texinfo"
+
+pkg_setup() {
+	if [[ ! -e ${ROOT}/etc/mtab ]] ; then
+		# add some crap to deal with missing /etc/mtab #217719
+		ewarn "No /etc/mtab file, creating one temporarily"
+		echo "${PN} crap for src_test" > "${ROOT}"/etc/mtab
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
+	epatch "${FILESDIR}"/${PN}-1.41.5-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	rm -rf doc
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		-e '/^LIB(COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
+		-e '/^DEPLIB(COM_ERR|SS|UUID)/s:=.*:=:' \
+		MCONFIG.in || die "muck libs" #122368
+	sed -i -r \
+		-e '/^LIB_SUBDIRS/s:lib/(et|ss|uuid)::g' \
+		Makefile.in || die "remove subdirs"
+	# stupid configure script clobbers CC for us
+	sed -i '/if test -z "$CC" ; then CC=cc; fi/d' configure
+	touch lib/ss/ss_err.h
+}
+
+src_compile() {
+	# Keep the package from doing silly things
+	addwrite /var/cache/fonts
+
+	# We want to use the "bsd" libraries while building on Darwin, but while
+	# building on other Gentoo/*BSD we prefer elf-naming scheme.
+	local libtype
+	case ${CHOST} in
+		*-darwin*) libtype=bsd;;
+		*)         libtype=elf;;
+	esac
+
+	ac_cv_path_LDCONFIG=: \
+	econf \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--enable-${libtype}-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable !elibc_uclibc tls) \
+		--without-included-gettext \
+		$(use_enable nls) \
+		$(use_enable userland_GNU fsck) \
+		--disable-libblkid \
+		|| 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
+	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake fsck_ext2fs || die
+	fi
+}
+
+pkg_preinst() {
+	if [[ -r ${ROOT}/etc/mtab ]] ; then
+		if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
+			rm -f "${ROOT}"/etc/mtab
+		fi
+	fi
+}
+
+src_install() {
+	emake STRIP=: DESTDIR="${D}" install install-libs || die
+	dodoc README RELEASE-NOTES
+
+	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
+	# and install linker scripts to /usr/lib/.
+	set -- "${D}"/usr/$(get_libdir)/*.a
+	set -- ${@/*\/lib}
+	gen_usr_ldscript -a "${@/.a}"
+
+	# move 'useless' stuff to /usr/
+	dosbin "${D}"/sbin/mklost+found
+	rm -f "${D}"/sbin/mklost+found
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs || die
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# these manpages are already provided by FreeBSD libc
+		# and filefrag is linux only
+		rm -f \
+			"${D}"/sbin/filefrag \
+			"${D}"/usr/share/man/man8/filefrag.8 \
+			"${D}"/bin/uuidgen \
+			"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
+			"${D}"/usr/share/man/man1/uuidgen.1 || die
+	fi
+}
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.5-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.5-makefile.patch
new file mode 100644
index 000000000000..affa3416fdfd
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.5-makefile.patch
@@ -0,0 +1,81 @@
+--- e2fsprogs-1.41.5/e2fsck/Makefile.in
++++ e2fsprogs-1.41.5/e2fsck/Makefile.in
+@@ -195,12 +195,12 @@
+ 	@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
+ 	@echo "	LINK $(root_sbindir)/fsck.ext4"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	@$(LN_S) -f e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext4
+ 	@echo "	LINK $(root_sbindir)/fsck.ext4dev"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	@$(LN_S) -f e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext4dev
+@@ -221,12 +221,12 @@
+ 	@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
+ 	@echo "	LINK $(man8dir)/fsck.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	@$(LN_S) -f e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext4.8
+ 	@echo "	LINK $(man8dir)/fsck.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	@$(LN_S) -f e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext4dev.8
+--- e2fsprogs-1.41.5/misc/Makefile.in
++++ e2fsprogs-1.41.5/misc/Makefile.in
+@@ -394,19 +394,19 @@
+ 	@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)/mkfs.ext4"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	@$(LN_S) -f mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext4
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext4dev"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	@$(LN_S) -f mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext4dev
+ 	@echo "	LINK $(root_sbindir)/e2label"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
++	@$(LN_S) -f tune2fs \
+ 		$(DESTDIR)$(root_sbindir)/e2label
+ 	@if test -n "$(FINDFS_LINK)"; then \
+ 		echo "  LINK $(root_sbindir)/findfs"; \
+-		$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
++		$(LN_S) -f tune2fs \
+ 			$(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \
+@@ -431,12 +431,12 @@
+ 	@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
+ 	@echo "	LINK mkfs.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	@$(LN_S) -f mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext4.8
+ 	@echo "	LINK mkfs.ext4dev.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	@$(LN_S) -f mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext4dev.8