Version bump #282445 by Marcin Mirosław.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

3 files changed, 151 insertions, 5 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 192fdab66c6d..40bddfd40d28 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.195 2009/07/22 14:05:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.196 2009/08/23 21:28:04 vapier Exp $
+
+*e2fsprogs-1.41.9 (23 Aug 2009)
+
+  23 Aug 2009; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.41.9.ebuild:
+  Version bump #282445 by Marcin Mirosław.
 
   22 Jul 2009; Alexis Ballier <aballier@gentoo.org> e2fsprogs-1.41.8.ebuild:
   Keyword -x86-fbsd due to bug #278667 and broken deps on util-linux
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index be4dc5c239d1..7f44248b5938 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -18,6 +18,7 @@ DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204
 DIST e2fsprogs-1.41.6.tar.gz 4422395 RMD160 f2c330b3b9e1dec834411a45ee01e3d427bf9691 SHA1 4fe3f88b198e3039f7a26771f0c136933ef99ea3 SHA256 58975d71999197bc3db663bd47aa0c718ccd7e60fdb9541ac98ce5d19f6bb444
 DIST e2fsprogs-1.41.7.tar.gz 4425159 RMD160 ad001d9d2b7c2e19b2f410b92446330fb5fbdf11 SHA1 0d5acf71bb81256e470d7f5ffa714f10e674172f SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c
 DIST e2fsprogs-1.41.8.tar.gz 4436913 RMD160 6ceb9d6780ae4286a6d23c5456df56d77ed12946 SHA1 e86b33d8997d24ceaf6e64afa20bfc7f5f2425b4 SHA256 782c9f281ca970d176c61759465beec12b40c7793bb5fa52c8d9a61741e33801
+DIST e2fsprogs-1.41.9.tar.gz 4452610 RMD160 b30a1bb1c984811b82f6130da3ed6ff12573d508 SHA1 e30d6bc67ac7b14cd817986c9bff13fb695d7a35 SHA256 cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8
 EBUILD e2fsprogs-1.40.9.ebuild 4091 RMD160 ef0e2d0f136a5fd4b5acdc4c88eb450a90771bb9 SHA1 fb745566ddc65245bc974d8d2a6cf464a79d53ba SHA256 1d532704eb68eca1aa7922130bcf87fe13cc5955467c13797d3d393a0e7387ba
 EBUILD e2fsprogs-1.41.3-r1.ebuild 3911 RMD160 ef1b5eb28946dde9abc45653d9b7308106a58e5b SHA1 82dd6e6b5b624db0fbaaec31e2453b9106e99afe SHA256 2d12957e8017015af243f1961fb83e3196070f7b73ca12015cbff3856d496457
 EBUILD e2fsprogs-1.41.6-r1.ebuild 4128 RMD160 db524bd2e5895dbd8f0cbbe7f0267629bedfb842 SHA1 7fcf67ae893d9ee63d97f80a3908deb382388579 SHA256 36ff24e90f87110d46dc741be3a93f0f813f5840ca24ff9538f656f47faea4b9
@@ -25,12 +26,13 @@ EBUILD e2fsprogs-1.41.6.ebuild 3776 RMD160 03e655cf4dff13b07ac0373572b076bcdaf99
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4154 RMD160 c285dcc8673a525e47abf4a3c5bb041b476396ff SHA1 dca951f1e09be8b9fc88e7fea8b97ed2950fab7e SHA256 5da54dee4c3f37bbb22d0c6f8680b480f8b4dbba36db828f2738d479a73dab87
 EBUILD e2fsprogs-1.41.7.ebuild 4042 RMD160 ac92f1a7591767b59346ae7903440eecb43d6091 SHA1 31e50c91bd5e48c3220cd8ccecf1b460387602bf SHA256 e302465e9e3c8e98a93f1a3dcfef096a8196bf0958f0989ed97a6c87b67c1a6f
 EBUILD e2fsprogs-1.41.8.ebuild 3919 RMD160 8bca3ae2b77593724bb9d8878b6d7f16cb395c8f SHA1 88e5c8d28b16c2f43866ad430613f8d63a762609 SHA256 4d4725aaf2346de175279f735e8b45cec1acfc54f7f2a02a63ba2e47a6516403
-MISC ChangeLog 29284 RMD160 c551027e767c77e5e30d6542772fcc602af789e5 SHA1 f258bbc06acfbd4493dc6426da190fc1deebc99a SHA256 eb5578ad72acf9f6d7e5651f34f74bd1e5f6133d93458adcb5fe4de511cd0778
+EBUILD e2fsprogs-1.41.9.ebuild 3917 RMD160 2219db09fd05b1d6b3ce3531755f6498f11af57a SHA1 3814b987460fc706cc2d1538f6721e9202649cb2 SHA256 96177946c64b8a26212774f190b674f6ba4740f5dbf2aff8d8158c46fbf0404a
+MISC ChangeLog 29436 RMD160 63a374c38ad26bc9c5be92e0b892901f9fa28f9e SHA1 c5352e7cb222cdfaef214e35734260cd684e11cf SHA256 df99c9a7bcaa6d6397fe78c13c7dcd9fa180174412a8c7457fc30b6ff6c8602a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpnHPIACgkQvFcC4BYPU0qUrACguCt6wRP+U1furKSktDwuxvuv
-k0UAoKCZR4e7Vd8LcdN25X376LVAqgKs
-=9W32
+iEYEARECAAYFAkqRtGoACgkQlPl3HsVfCDoCQACcD4mPlMT6dvQu5fT4w760ksh3
+sTQAniZx4vHOdCw6PDxIDYrWEX9Qpg50
+=SpFj
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.9.ebuild
new file mode 100644
index 000000000000..67ab9518cd7b
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.9.ebuild
@@ -0,0 +1,139 @@
+# 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.9.ebuild,v 1.1 2009/08/23 21:28:04 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 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}
+	>=sys-apps/util-linux-2.16
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig
+	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.8-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	# use symlinks rather than hardlinks
+	sed -i \
+		-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \
+		{e2fsck,misc}/Makefile.in || die
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	rm -rf doc
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
+		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
+		MCONFIG.in || die "muck libs" #122368
+	sed -i -r \
+		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+		Makefile.in || die "remove subdirs"
+	# stupid configure script clobbers CC for us
+	sed -i \
+		-e '/if test -z "$CC" ; then CC=cc; fi/d' \
+		configure || die "touching configure"
+
+	# Avoid rebuild
+	touch lib/ss/ss_err.h
+}
+
+src_compile() {
+	# Keep the package from doing silly things #261411
+	export VARTEXFONTS=${T}/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 \
+		--with-root-prefix=/ \
+		--enable-${libtype}-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable !elibc_uclibc tls) \
+		--without-included-gettext \
+		$(use_enable nls) \
+		--disable-libblkid \
+		--disable-libuuid \
+		--disable-fsck \
+		--disable-uuidd
+	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() {
+	# need to set root_libdir= manually as any --libdir options in the
+	# econf above (i.e. multilib) will screw up the default #276465
+	emake \
+		STRIP=: \
+		root_libdir="/$(get_libdir)" \
+		DESTDIR="${D}" \
+		install install-libs || die
+	dodoc README RELEASE-NOTES
+
+	# make sure symlinks are relative, not absolute, for cross-compiling
+	cd "${D}"/usr/$(get_libdir)
+	local x l
+	for x in lib* ; do
+		l=$(readlink "${x}")
+		[[ ${l} == /* ]] || continue
+		rm -f "${x}"
+		ln -s "../..${l}" "${x}"
+	done
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs || die
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# filefrag is linux only
+		rm \
+			"${D}"/usr/sbin/filefrag \
+			"${D}"/usr/share/man/man8/filefrag.8 || die
+	fi
+}