Version bump.

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

3 files changed, 140 insertions, 6 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index dc9d1bacc647..a51204883e8a 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.186 2009/05/30 18:56:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.187 2009/05/30 18:57:03 vapier Exp $
+
+*e2fsprogs-1.41.6 (30 May 2009)
+
+  30 May 2009; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.41.6.ebuild:
+  Version bump.
 
   30 May 2009; Mike Frysinger <vapier@gentoo.org>
   files/e2fsprogs-1.41.5-makefile.patch:
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 55e75c453a4a..443052b05dd3 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -8,7 +8,7 @@ AUX e2fsprogs-1.40.5-libintl.patch 425 RMD160 a3cc77c99f42eebb8518b402c66565627a
 AUX e2fsprogs-1.41.0-makefile.patch 3044 RMD160 678da7d57ec775eaced1aa29f8bb6ea794e06621 SHA1 f5634e52b005d8a51fe60eae336f4459a31ab920 SHA256 4b00fbc25bb65079d0d6d0a3060a31280f28a115b28aad9a0af7f9c755a15376
 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 2936 RMD160 7ca8c814c4cd8ea5ea3803dc26f91b16c48197b8 SHA1 d08e466bed4b294e1cee7d2f99e04179ec071ed8 SHA256 4efa82b0aa31b3ece73849ed31f6a6c8251cd4f949e9b4b5dd7a81c19b21afc2
+AUX e2fsprogs-1.41.5-makefile.patch 3253 RMD160 822300273927fbdea60fc3dc747a9b6ba9c375dd SHA1 96855d5afb8d294ca57c06889d9a7ce5de29baef SHA256 7d2d075a475e47d90dd181fdaaf6554b80939802e7bf161fcd6b72d2b1510b10
 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.11.tar.gz 4116013 RMD160 face7ce0de8049774ae7941ffa274dce064d7dbb SHA1 22f8abc2915873faa85ce92464fa0b3b4265c2a9 SHA256 3eeb0c3513b3b251f5d51ec3413bc77e3a21cb8bc84a1979022a67fe733c897b
@@ -16,18 +16,20 @@ DIST e2fsprogs-1.40.9.tar.gz 4092812 RMD160 1cc51cb1b4bdcb338a2fdff50c79f38fb6e0
 DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204abd6 SHA1 d85f05b7bcef1adf8306a789f3ac0325c3c67e8d SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
 DIST e2fsprogs-1.41.4.tar.gz 4389512 RMD160 da1f77f0a41a0047b86bf540bfb484622efd79fd SHA1 55da145bce7b024ab609aa4a6fc8be81a2bb3490 SHA256 2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
 DIST e2fsprogs-1.41.5.tar.gz 4415819 RMD160 dc6a7bddd0745e234c9824612083a7e1c979c589 SHA1 0c08a74e0d137fd0bdb1aa3a8cc54d18a4fc553d SHA256 b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198
+DIST e2fsprogs-1.41.6.tar.gz 4422395 RMD160 f2c330b3b9e1dec834411a45ee01e3d427bf9691 SHA1 4fe3f88b198e3039f7a26771f0c136933ef99ea3 SHA256 58975d71999197bc3db663bd47aa0c718ccd7e60fdb9541ac98ce5d19f6bb444
 EBUILD e2fsprogs-1.40.11.ebuild 4206 RMD160 b353dd0ac6e39232e415496e696c0a9ba86a8384 SHA1 851a0995d0ba8a2d9c24be7f6f27db32ca62909d SHA256 28ba5fe8c1318dfa3ee59a16fec506b7ea5cc8744fbeadec3a54fca225b8ebee
 EBUILD e2fsprogs-1.40.9.ebuild 4091 RMD160 ef0e2d0f136a5fd4b5acdc4c88eb450a90771bb9 SHA1 fb745566ddc65245bc974d8d2a6cf464a79d53ba SHA256 1d532704eb68eca1aa7922130bcf87fe13cc5955467c13797d3d393a0e7387ba
 EBUILD e2fsprogs-1.41.3-r1.ebuild 3892 RMD160 2c201932b919588f07da740be9612388d74e3d81 SHA1 15c20b4eb340ce67a91d7b03863fb0613d9a05c8 SHA256 ad9fa9478c611e5d054ea76d3a84b92519831f11ac5d8c5d8d679d13857392cb
 EBUILD e2fsprogs-1.41.3.ebuild 3836 RMD160 8d307133494c34428c3d62eff496631d5e7835dc SHA1 123499b2218449a63e6bba38c5addcb9c5c52eac SHA256 e1375e16af6550b97a83cb5ba51a222139dcff6953bfbdb665c71f455b9a09bb
 EBUILD e2fsprogs-1.41.4.ebuild 3805 RMD160 33387aa25a0f148775e9500376b522df1f10fa74 SHA1 39f0db740d4828803f343649a0ca23d1491dd646 SHA256 834a0357110997f14da9b3196bac42c2ac33d32d0bb85756c04edef31c53db36
 EBUILD e2fsprogs-1.41.5.ebuild 3755 RMD160 21a93480de09ef1030c792c2d1bf5a15a07132c8 SHA1 1be89ecbf2075dd738eda2f2bb18248b23753ae4 SHA256 6aa20b168621b47006a81e3ca3f8255c4a6debba4371e3236f63aed0a38c447b
-MISC ChangeLog 27471 RMD160 74e8620a3e17a5d38687617afcd48ca4f0f7ea62 SHA1 2ee71fd4fd127c90e03436fa94744b111ee42f03 SHA256 5015634d5be501aca0c6fea573f67b11d1a241fd8529859922be3b3ef8c8f3ca
+EBUILD e2fsprogs-1.41.6.ebuild 3755 RMD160 86ea3c4442f621261976dd564a9d2b65c5a24de4 SHA1 376f5e11ff34ab0ef0d4a2577b2d1487a83aa731 SHA256 bc449b10c1fde8039bfdeebfabb0b3d4033ba6f0552e02eefe304381436500eb
+MISC ChangeLog 27756 RMD160 e9fc1c5c650b03a7413f917f4a74a6b12775cca2 SHA1 3eda3420c7305670bf599d9c45e950c7537f107b SHA256 5dd5fde01458444ccf960dbfb0f1563d7d398dd52c92de5debb78deb83821ffb
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkogb08ACgkQn/5bYzqsSmEpWACfVhoXz5YTnrA+c++9zTv9Ysax
-xB4AoMt6L1cLEGWnCAE1B3DD3yQjTDLV
-=Wi9m
+iEYEARECAAYFAkohgScACgkQn/5bYzqsSmF/sgCfT+JsublxmYgovVN+YvUTe7sa
+q5QAoMtotdoPxRAh+mAA/QB2yf5r99GP
+=QCJT
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.6.ebuild
new file mode 100644
index 000000000000..f0011bfe4df4
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.6.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.6.ebuild,v 1.1 2009/05/30 18:57:03 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
+}