Version bump #437434 by Bernhard Hartleb.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

3 files changed, 171 insertions, 15 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 80a6680501a0..291b9afcaeed 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.254 2012/08/04 19:39:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.255 2012/10/07 16:22:17 vapier Exp $
+
+*e2fsprogs-1.42.6 (07 Oct 2012)
+
+  07 Oct 2012; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.42.6.ebuild:
+  Version bump #437434 by Bernhard Hartleb.
 
   04 Aug 2012; Mike Frysinger <vapier@gentoo.org>
   +files/e2fsprogs-1.42.5-ldflags.patch, e2fsprogs-1.42.5.ebuild:
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index c30fc43c07eb..a0f8588a505a 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -28,6 +28,7 @@ DIST e2fsprogs-1.42.1.tar.gz 5724307 SHA256 0f1fdc10c6289b6750714490837df9aab691
 DIST e2fsprogs-1.42.3.tar.gz 5817248 SHA256 ad6a41be876fab94c2bd5d10f7a0871a5601bbaf9cd25c551c2af11c1c8d5436 SHA512 0ec74d4a82a2c1dbad9ab5edcb7018d58736c65eb15e4bd499d87205f0806363a531c9ada8fedc64a41896050b7b9f7179372df72cf5e0dcebabaf4d74d4f997 WHIRLPOOL 708690e71e0d4b61da0f1bf33021dfaa8dda1305ae0d0525918fa10d5d699cba1e2c0a76bb2838885bba2296c2b26e8903fa9448b6459aa818c3acc6b2043499
 DIST e2fsprogs-1.42.4.tar.gz 5873284 SHA256 3946f347842a7b892b23476e231da21e572f9db828cb02a38bc57beb25db905e SHA512 2392e52b206775e7b799d53febb42eb351ccaee2435ab0bc456b4953468e6309d19019059d83aa1c0162b8342fc566072abd39f88f37adf0a246025bf767fa01 WHIRLPOOL aaccb3116d9e01d404ef1761e6c96f4f0faec63e0107f1535bbd88bdbab18faa35083d0fdd2e9d11d73dd8a864c43485f2d0f5a663115d7b8e6083c4a85651d7
 DIST e2fsprogs-1.42.5.tar.gz 5918892 SHA256 76edaad8eb7464356e1317d60eb19952728091dad358f1f939239874cc1871ce SHA512 536fa81071c828ae62b2238a33fa7a60d0a731ef7f4b51022e99d50cf4946509b4dd8d94b5c200759c69895879ac985587b40010af4282ff5196193c9926274f WHIRLPOOL a8a2c5869ea9db8df8a5942c42c4d9a4994a58e589d8831598cfa66db2e440b56aa535516bbe8a2a585309d2abd8f4c27f72e77ea647f46ad7d3825207b932ae
+DIST e2fsprogs-1.42.6.tar.gz 5920183 SHA256 726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5 SHA512 365178e2fc7cbb0e85da23dcfdc33c43c225640573e3d44c135193391985fe0c1263bac1f074ddba9668859d4522dbff1c6584bc8d380d2879c1e3d8c6f04acb WHIRLPOOL 0c2a775104b1accc1ee7d501d402411bcb7fffd96f1bdd8323dcee404c9fdcfee1d4e70525fcd86e2b1b48ca2d085dc1e9b85e0d99aa9478c4c5adad67a661c8
 DIST e2fsprogs-1.42.tar.gz 5709827 SHA256 55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46 SHA512 4db3d59187ff31d4d8e1f2b355fcba5dd2e60343f759b41a02545bb3aedc50ab079e21bf15240208442a1f6192e420ef391ccb9f20690f5f19d37b6fdb6f15c5 WHIRLPOOL d01a58e2c3cb653694f13033fc22256823ab4d0b9f39f626652d29b804b7e7d33efd76a3c640dd8c15e45e619d0c977611ef0271cfe78363b677f5efae6d501a
 EBUILD e2fsprogs-1.41.12-r1.ebuild 4301 SHA256 c521fff426f2e36a898023bfdb3b93425f1acb3a4fddcd06f3330afe6c4896b3 SHA512 aca89df269e8601779b67c0853b9885addf143d05cfad3524d0ef9c90db42aa3f1f8e4b04862ad77de57868fc26b392f00cecc26a3a4a6af8269e2ada2552e97 WHIRLPOOL bb12236cb8d6483f0817eee7198c9fbcb93484287fa49bc0f878726b9797c2d719093992a9e03d340922d7850e4ca1e6af73b5f276e0eb462679373e41a95630
 EBUILD e2fsprogs-1.41.12.ebuild 3899 SHA256 c3d88a35d192cb544a41959f6fd9061bee699e0285775adf77a060d2b664f92a SHA512 e828b606c70c92c9706777ab02bad24b79599129395c4e3b098b38210c82254611f1cfebaadb0903163b71614c031d6fe6589ae007ba19a6428a27a850bcb54e WHIRLPOOL ee175a7a95eba313563cc9a9f1368b1c850f6f2631de17f02a06415d03bcf0bd87d1c13d69b547e96e2d04b5cfe169776e7233c78c103ef07948a58b84766001
@@ -37,23 +38,24 @@ EBUILD e2fsprogs-1.42.1.ebuild 4677 SHA256 1a0cce002b78b2cd1c93947b1cfde1b184b95
 EBUILD e2fsprogs-1.42.3.ebuild 4431 SHA256 c7d6a2dd48218a10866f32c39a2cb7840c9846d9dafe9691c2f5c7f6e7947f9c SHA512 498c6f720b1bc745a02c3fbbe6df09357a4ba1cff45c78b1c8a2c1015aac7f0f9a2b07f4cb3b7169b50327d42b247897a533af3f60369fa8ddad4d74eb353e6b WHIRLPOOL 74a3ff4e1e4446bf33de5b13b6a1d9807a87be51661aa4699705dd4d801611882f64cf67fed5f25713861510baa8b4497d4b15a130e113af93ac9f9928d9e0cf
 EBUILD e2fsprogs-1.42.4.ebuild 4329 SHA256 f9840190bdf5fd375a75032936629ac8bbe37e0ae5dbc085948d37158561c7f8 SHA512 f48129d0693fb8a553a07186aa68d9f6a0781995dab0b6a587fcf083e1adf84375d1dd125b81bcc02ee77985bc389ae04d0be122b1b82a84d2423cd19cb51514 WHIRLPOOL 35105adf9d46ff9496ec8867301b77e14b01cf01e4829e6fd010838d2ec44baf2f87252544acf5a1eec9fff84076d361dfc6a44cf630095c28ce035de27a3878
 EBUILD e2fsprogs-1.42.5.ebuild 4327 SHA256 49c96b22e90e135da3df1f53a1fa645db6535fe0bac81a5094b275ddc9497fec SHA512 fc24fe21824977515276b1f3bcb9b43e2b55f8e728e8b583ef596e84ff8b053601d341dddc434290dfa707ddd5602df1489e88e541a5384d7f77f80e89cb1287 WHIRLPOOL 9d9046025e25b1cfb5717e0e06a998458e27e3d4d8150c623ef23470e942a6bbbf2fc054227736fbc8e7868cb7254dcbe6035ce121b15c51ffd00c340ccbd827
+EBUILD e2fsprogs-1.42.6.ebuild 4270 SHA256 4074263272bcd406dcd6391d42668ad5c750deb19d165b59fae6dc5af022a8f8 SHA512 d31baad91092711b314655e9d8661d8e4d525d4e34692914458a93c3999d3c66e5d2b2e5376dec63c05396059b6ca3761e48928e786bb68efa8513e813aa641a WHIRLPOOL cbd7b42a5e84869b446f49eecc3beab33db98ca2752d6ab94e72b69a62ac6061bde31c8d0300f54fd18384af349e1288391a58e09cb531345a38a73063d1e5cf
 EBUILD e2fsprogs-1.42.ebuild 4523 SHA256 aebb33bbb1d0f0b27e83503ac1fb8dc83aea140d2af77b34aece290ea5aa33b7 SHA512 0a2e7c9bb1942a3e754dfb5645ab84a54529f7e3fddc2147ca7ac28652110bcb35f06208c40d9ae301bd0647b6e817589f5f129fdcb56c2e75134dc478d1a7ce WHIRLPOOL 42ddae6fcd1b1bfcbdfc2a261d07925ef5a18d8903f1738f5ef6e8216befe97e1d20a3351a81cfaa18a44a24d299e72d32acb3216d058337443364a62dc77348
-MISC ChangeLog 37920 SHA256 1728fa237622b437b958c811e5712dd78551965862c7385709c716c353ce4c31 SHA512 ef0aed1a1a094ebef5673ff6c3749f4033145c710b3b1c0d34b63a1db63b0c595ad5d11a6e38a5df6d474462b25d94adf671c9291b038e6f4bb44f1f3c676939 WHIRLPOOL 4ceb764f2f0c640ddbd711c7fef2aaf09d963ef4c06b89709d31d602e4b6fac8bfd4845fb7667b511135b8cec1eb9dad221de84be017d6a81f6b9d301031a612
+MISC ChangeLog 38074 SHA256 f7018812dd3ac74b670299b62e7c0514a557133ba59362e84864e9e0933d7685 SHA512 c666564bf46790a97f1a685b043936010dd1c2e87df51f11414160fa199b4c74bc3f6f13a05a62d65fd10595b791745acc928085c85292efb8e17526381f88b9 WHIRLPOOL 96583959684f85543845105a39e07910b9f0e6fdfb69a6dc26223d90032627c0e739dd4c832d0b79194805184e78c4aa92e45abd9018c19c5d029d5834467716
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQHXp7AAoJELEHsLL7fEFWls4QAMJv2y7bwst0mtIlGged7yvG
-TGOPFYnx0PqNJnrSN+DiX38nCHwj/SX7jJ2EXo/8pnkhm0ogwBmgu8s9OZxxfjpP
-G53LMFdBkJXUmXQ4RCQfb0ONHd/vlFWc8m5813HHhk55feGLnWFIYN5ou8qCCkTO
-hTVhS+IOknd11SdxRJ7oaYn0cq2btlfmWu8kTjbjLOWAOJSBHzH3rrbAgRvPPC8I
-Yfl1P9pvSMbYq1rh8jOcpARJuJyJVQYcam8bfgv7D9d5I1w3y7foqiBDgHp24Eze
-oCz4e4YJyjgmwpBcjDFqiL1DyOy11eYiz5hSU6lqTB7yR7wR9WgLt8Utn+qPH6a4
-yOxwyJA5mY1IjIrOq9XOWlGGnMIODOXkdPjfcvLpczcv9HidodJVp2glo036aMUU
-0jsu6Ou854seH32X6NG0J1muq5H5yCyxc0YFfA6YiLI7eWo7us2frccqCP32+8GW
-b4+8F8TJECjpZN5/0xdSHuiXvl0/hXjyfXoiJ1Avn3y1sJOjcIzpNQxJ3XF0p6x5
-5QRfN5r+65GWthnuw7DxdhlxsH+91xk16XGKIDXRdWPg3buLBGFMymVL2oHWrJUn
-CkI72mBjvgY6jnsmpLS6kqEjkJ9joNStMSE1znGYJ3+pM2xnmKwTZyeauIKkasaK
-dMqNTUVQVALz1YmUfPAG
-=2BAp
+iQIcBAEBCAAGBQJQcaxJAAoJELEHsLL7fEFWZNAP/RDnDx7H2gNRid1h9sJgyQBU
+XeR2HE06zgVcsYWMBT96hd7kDCywbtpxC9GtlIj8pE6nR6b1a483BbmMTs3vbhj/
+RQu6uMdyqQRxYz2zXim6QHVEr22w/KaptIW9srCNbIfEZzkoVsYJgRNhptd5tIfu
+DIuoV78qaVQeFGHTobDUju3dq65v52/lE9nIQ8CZ/ddgtnvu2VM+3BxqumwDjrfQ
+kng4ZekvzLoGxTUbIFfTncX6Zkgl2n7+cKV8ViVQmYZyDJ4Tt8dMgVNoIygacKpI
+GXBr9Kw/g14poap9lwjwQhagg/NtQjcecY3NRJms1pHdxVEX0IsOrELYwijj/qfG
+30gIKO5n5cJ09PRwBjEwtwI/uzmq0EyQxPLuwvXQAhfass2b6AItGg3TDiuALh51
+rMEEC4csCfKqdDINcLcZOXALuCJP/4esLgHdqg0ZACOO+hPLF7fnyt/Ir0RzYQBH
+JJ2fyZuNz3GsuGzAAOl5wiZ39avcEmC8G4GC6e04ztYw2eR6zK4w++EXtVV++Ojv
+Y0Dr7c3nkQ69AF8I1YHaWgbyriBFQXHoKhz2aox17N+n1tG4YcGnNqKqtDnpX//J
+7jjucsd8JZP2/wjnmCNkqG0H1lvbkj6KNf8cKDk7I0dpE1SiuHgc/PtRgW7UfnMk
+gp50ti7loVJ8RfR607uM
+=JQWP
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild
new file mode 100644
index 000000000000..eb089afbf79c
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild,v 1.1 2012/10/07 16:22:17 vapier Exp $
+
+EAPI=3
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="nls static-libs elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+	>=sys-apps/util-linux-2.16
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+	sys-apps/texinfo"
+
+S=${WORKDIR}/${P%_pre*}
+
+pkg_setup() {
+	if [[ ! -e ${EROOT}/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" > "${EROOT}"/etc/mtab
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
+	if [[ ${CHOST} == *-mint* ]] ; then
+		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
+		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
+	fi
+	# 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"
+
+	# Avoid rebuild
+	touch lib/ss/ss_err.h
+}
+
+src_configure() {
+	# Keep the package from doing silly things #261411
+	export VARTEXFONTS=${T}/fonts
+
+	# needs open64() prototypes and friends
+	append-cppflags -D_GNU_SOURCE
+
+	# 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=--enable-bsd-shlibs  ;;
+		*-mint*)   libtype=                     ;;
+		*)         libtype=--enable-elf-shlibs  ;;
+	esac
+
+	ac_cv_path_LDCONFIG=: \
+	econf \
+		--with-root-prefix="${EPREFIX}/" \
+		--enable-symlink-install \
+		${libtype} \
+		$(tc-has-tls || echo --disable-tls) \
+		--without-included-gettext \
+		$(use_enable nls) \
+		--disable-libblkid \
+		--disable-libuuid \
+		--disable-quota \
+		--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
+}
+
+src_compile() {
+	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 ${EROOT}/etc/mtab ]] ; then
+		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
+			rm -f "${EROOT}"/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="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		install install-libs || die
+	dodoc README RELEASE-NOTES
+
+	insinto /etc
+	doins "${FILESDIR}"/e2fsck.conf || die
+
+	# Move shared libraries to /lib/, install static libraries to
+	# /usr/lib/, and install linker scripts to /usr/lib/.
+	gen_usr_ldscript -a e2p ext2fs
+	# configure doesn't have an option to disable static libs :/
+	use static-libs || find "${D}" -name '*.a' -delete
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs || die
+		doman "${FILESDIR}"/fsck_ext2fs.8 || die
+
+		# filefrag is linux only
+		rm \
+			"${ED}"/usr/sbin/filefrag \
+			"${ED}"/usr/share/man/man8/filefrag.8 || die
+	fi
+}