Version bump #326655 by Sebastian Koehler.

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

3 files changed, 160 insertions, 5 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 03fd77f83d2e..d9ef7bed697c 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.214 2010/07/03 02:11:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.215 2010/07/03 02:12:23 vapier Exp $
+
+*e2fsprogs-1.41.12 (03 Jul 2010)
+
+  03 Jul 2010; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.41.12.ebuild:
+  Version bump #326655 by Sebastian Koehler.
 
   03 Jul 2010; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.41.11.ebuild:
   Mark alpha/arm/ia64/s390/sh stable #323893.
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 68c4f03c9953..853217c1c04a 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch 1251 RMD160 37ccdd9081c35d0e527850a280d8aadb989a3bd0 SHA1 79944cb3a4b33529e43b7fd142f6d85d4eb9a073 SHA256 01dc8bf59f6d5f435abd4b26dda92897abc338f452a80de33600594d25586013
 AUX e2fsck.conf 138 RMD160 9e818294ac6d2facbde100768371143ec33e4e6d SHA1 bdbc4e2c823367ea203f869f496b310867ecba18 SHA256 c2864aa7c5c5bf27227909bdb9af395fc07294d1f93d372ef10c79309d7aec08
 AUX e2fsprogs-1.38-tests-locale.patch 656 RMD160 16c625c16144ed16942fa19988524b7b5727c583 SHA1 debd15eba41a392cf0336e694bebf0c2409b18e3 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598
@@ -13,14 +16,21 @@ AUX e2fsprogs-1.41.8-makefile.patch 317 RMD160 f07a8fdd75e8dd43bf6ff0b6b8dad5e12
 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.10.tar.gz 4466866 RMD160 87b679871db4fc91296c4bdea823994801bdd48f SHA1 18fa09e34009c5fcbce40461ac435ddcce0fee39 SHA256 4109d45dd220bc450e3198056a135164bdcee21855de97eda4e863a461eed8c9
 DIST e2fsprogs-1.41.11.tar.gz 4472354 RMD160 1190540e1df3b873faf2179ce8cbc618a91fc836 SHA1 1cd75560595cff0b7b5ac9da11cfdaa7d0dfd6d9 SHA256 5c9f367f6d5131f90d91dfd2f6c639d5e2c9455cac1f0d8ccc886239c90d775e
+DIST e2fsprogs-1.41.12.tar.gz 4496194 RMD160 aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7 SHA1 62b002fe507b2ddafc24b89532e472fe4b55a14f SHA256 9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20
 DIST e2fsprogs-1.41.7.tar.gz 4425159 RMD160 ad001d9d2b7c2e19b2f410b92446330fb5fbdf11 SHA1 0d5acf71bb81256e470d7f5ffa714f10e674172f SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c
 DIST e2fsprogs-1.41.9.tar.gz 4452610 RMD160 b30a1bb1c984811b82f6130da3ed6ff12573d508 SHA1 e30d6bc67ac7b14cd817986c9bff13fb695d7a35 SHA256 cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8
 EBUILD e2fsprogs-1.40.9.ebuild 4095 RMD160 57ef80d905f1079c6a6e3ae235d453c8007059d8 SHA1 6d2234e98a227c63a4f96ffcb4e2c56154322db5 SHA256 ea9c7d8b37a655b0f188d3f42f95c19de943fcd3413ebcbc846655c66d050ecf
-EBUILD e2fsprogs-1.41.10.ebuild 3855 RMD160 8ac1ce68611de717d22047e90b8220febc0fd356 SHA1 81c855a5ef2c6aa16d610ccebca18b27f6c391ac SHA256 2cc9524ac4db282b260dd5cc8c57e837c78c53c5d1707a8bda22d45cb75e4e17
-EBUILD e2fsprogs-1.41.11.ebuild 3907 RMD160 2ebb7d763ab57a8bf6288b10da6d5cf5685df4f6 SHA1 798827276f6a3500a2d3e1b643669fd180f6282f SHA256 72a9868e4b16dd7b2c8e4424a9bf6a8659c08ef6885fe0e94c4e69f59cd1dfbe
+EBUILD e2fsprogs-1.41.11.ebuild 3901 RMD160 53148ada31eeeb674d7943eea416b20affb0d007 SHA1 1c1eeec6d766dc4709c106b6a6d41ad2fe237ba4 SHA256 8ed548a40ab92892be2eeb575d985542fe288ca601197ec447afcbebd5dfa1fc
+EBUILD e2fsprogs-1.41.12.ebuild 3911 RMD160 b58799adfde404d997684c0ac2337ccad5e6f853 SHA1 1941c62748c8f255ad7627e8bf01c7f7276f261b SHA256 069688eebcb3d899980d11a29c7fae676674c50cef941275716ad1a6c2ca3dc5
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4158 RMD160 13600b8acea0bc70338d6df1eb065a353ec254bc SHA1 bf42c33a7e7a55b2628d69269d140c29cfb66f02 SHA256 24defb5da08763aaf7d239c2b404a75f2182eefcbbc9193d817f77d3e63068d5
 EBUILD e2fsprogs-1.41.9.ebuild 3968 RMD160 adb1086c4520ad5765e08d974d98b02cdd3596dc SHA1 ca8db2b31a40baed18b656e68b5d2e0127eb7e56 SHA256 514cec2bcd6efb956546cbb68143c096afa41a403da3b51e9de7adb41ef38b6b
-MISC ChangeLog 31662 RMD160 efa2cc8b035c7728e7862dee374a053504ce84c5 SHA1 a5e1a1cdf65a00fa972c3bfcf3b5253b048f6a0b SHA256 73fc4342d50e92542e3332e0921987ec269d7674b058e348609448fd87be70c7
+MISC ChangeLog 31942 RMD160 69ad7d1662abb6a2e88c48a73e1fe3c9576e1379 SHA1 fee4e29e4428be5486b87b66f968d906beb2c5a9 SHA256 b9f12e2b57c37c9fd51c499d4ee60b66f7405f56c9c8560f4dfc3ffd04ff8974
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwunEIACgkQTwhj9JtAlp4qnQD8CqxYpyxDnrkcV6vcn3lBxOyc
+JmfpssODP02xhWWf+PEBAIyopTNQEO7t2PYTt4ouV5BBLAqV4DJGrKH2L5kGKUAd
+=a94s
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.12.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.12.ebuild
new file mode 100644
index 000000000000..d4b0287a0080
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.12.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.12.ebuild,v 1.1 2010/07/03 02:12:23 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"
+	sed -i \
+		-e '/^#define _XOPEN/i#define _GNU_SOURCE' \
+		misc/mke2fs.c || die # needs open64() prototype
+
+	# 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 \
+		$(tc-has-tls || echo --disable-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
+
+	insinto /etc
+	doins "${FILESDIR}"/e2fsck.conf || die
+
+	# 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
+}