Version bump #269378 by Matthias Schwarzott.

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

4 files changed, 161 insertions, 5 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 4507cedd8f69..1a54da6494ea 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.192 2009/07/05 17:36:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.193 2009/07/16 03:12:39 vapier Exp $
+
+*e2fsprogs-1.41.8 (16 Jul 2009)
+
+  16 Jul 2009; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.41.8.ebuild,
+  +files/e2fsprogs-1.41.8-makefile.patch:
+  Version bump #269378 by Matthias Schwarzott.
 
   05 Jul 2009; Mike Frysinger <vapier@gentoo.org>
   e2fsprogs-1.41.7-r1.ebuild:
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 690cfc5e10c7..dd9716af1cad 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -10,24 +10,27 @@ AUX e2fsprogs-1.41.0-makefile.patch 3044 RMD160 678da7d57ec775eaced1aa29f8bb6ea7
 AUX e2fsprogs-1.41.2-makefile.patch 2813 RMD160 11b20c97f58efe18850296aefe08a155084dc825 SHA1 37bb9fd7cd06e1d7f5f302c2e7c0ff24fbd3c448 SHA256 48192b8d38bc00c048489de92a7361a773df0b6c4bbbb5e22b0b5c91962864f4
 AUX e2fsprogs-1.41.3-tune2fs-opt.patch 3027 RMD160 98c7ea72fc19f262b9965ef940629958de753844 SHA1 db9fcb2c696bcb71009b7ff4ecb630996712a59a SHA256 c4e7966c674d7853d03c5af5f431ffef54d463870793d8a7a7784874486bb4e1
 AUX e2fsprogs-1.41.5-makefile.patch 3253 RMD160 822300273927fbdea60fc3dc747a9b6ba9c375dd SHA1 96855d5afb8d294ca57c06889d9a7ce5de29baef SHA256 7d2d075a475e47d90dd181fdaaf6554b80939802e7bf161fcd6b72d2b1510b10
+AUX e2fsprogs-1.41.8-makefile.patch 317 RMD160 f07a8fdd75e8dd43bf6ff0b6b8dad5e12dec2f05 SHA1 5d95d5ef3c07a40617e453ff328c4195f9155dac SHA256 f8a4e2180f557c3bb9a50c38300e406420b3df296f50d6eab59d0b28cb65904d
 AUX fsck_ext2fs.8 3806 RMD160 193e4e01508ad363c28c8d5feb124f65d59a76eb SHA1 dff54a3149f8d6187f6481c428d4b980c3abfb97 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0
 AUX fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 SHA1 c0027c5e031b87dd8a5d50a3a256ac7637e59fd3 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22
 DIST e2fsprogs-1.40.9.tar.gz 4092812 RMD160 1cc51cb1b4bdcb338a2fdff50c79f38fb6e09eef SHA1 c584e9a8d3c444f42f4c0a786bb94f4a00ea2b48 SHA256 ab6852230dcb30d75f640125a5d0c7b496bbc31502afdb76528e3bcd4089c9e4
 DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204abd6 SHA1 d85f05b7bcef1adf8306a789f3ac0325c3c67e8d SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
 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
 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
 EBUILD e2fsprogs-1.41.6.ebuild 3776 RMD160 03e655cf4dff13b07ac0373572b076bcdaf990f1 SHA1 265f307f01fde616a2e22615d0e2d3c17b318080 SHA256 51a11a747ea18d5363af0c320142c1f5e5d7b70fe8de90a163822f05e0d80775
 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
-MISC ChangeLog 28786 RMD160 a8a0b0a9f154c544a5036c98d5028e196517f238 SHA1 8883f0f0f294d2cfe6d9a2c1d5af2ad00a3fc0b7 SHA256 fb418bb1609a97e529f1695cbc243e9060c009669167914c62bbe02ec551b410
+EBUILD e2fsprogs-1.41.8.ebuild 4009 RMD160 f5d7267de069bb389d3e5c46f3ec0f75073e54da SHA1 db49bb229fc189a3af1f2139b70627b604fa5445 SHA256 ca371a7ab18ab9bd73d87a7473f3149354a167f01d680ad667711a74f155e150
+MISC ChangeLog 28985 RMD160 81323da666f80d1ecc325e3df4d0d3e96cc690b8 SHA1 20e3041affd7250c8595ba5bbfa40e9b8488089e SHA256 05a07ac44b0a1e93968b0d8455fb391ce3ad26259771927c7bb53d79d134f8da
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkpQ5K0ACgkQlPl3HsVfCDoHlQCeIGgW5pv3KfdIknaRtNfgNXD8
-5jkAnRucrSxhg5PaOE4BYVVD6mMoMrhy
-=96D0
+iEYEARECAAYFAkpemq4ACgkQlPl3HsVfCDo1KQCfTr+AFLI+l70czlTlTzvxPCgd
+h2YAn3OzABfvB2gMJA2Yyaxun1nahxxb
+=tQ7e
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild
new file mode 100644
index 000000000000..be7d3d7ba7b7
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild
@@ -0,0 +1,137 @@
+# 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.8.ebuild,v 1.1 2009/07/16 03:12:39 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) \
+		$(use_enable userland_GNU fsck) \
+		--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
+
+	# deploy linker scripts rather than abs symlinks for cross-compiling
+	gen_usr_ldscript -a e2p ext2fs
+
+	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}"/usr/sbin/filefrag \
+			"${D}"/usr/share/man/man8/filefrag.8 \
+			"${D}"/usr/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.8-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch
new file mode 100644
index 000000000000..b7d3d96856b5
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch
@@ -0,0 +1,10 @@
+--- e2fsprogs-1.41.5/Makefile.in
++++ e2fsprogs-1.41.5/Makefile.in
+@@ -281,6 +66,7 @@
+ uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
+ 
+ install-libs: install-libs-recursive
++install-libs-recursive: | install-shlibs-libs-recursive
+ 
+ uninstall-libs: uninstall-libs-recursive
+