Version bump (bug #454532)

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 172 insertions, 5 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 1b25c29d5107..344f21a48be5 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.256 2013/02/22 15:43:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.257 2013/03/07 12:18:01 polynomial-c Exp $
+
+*e2fsprogs-1.42.7 (07 Mar 2013)
+
+  07 Mar 2013; Lars Wendler <polynomial-c@gentoo.org> +e2fsprogs-1.42.7.ebuild:
+  Non-maintainer commit: Version bump with kind permission from Chainsaw (bug
+  #454532).
 
   22 Feb 2013; Zac Medico <zmedico@gentoo.org> e2fsprogs-1.42.6.ebuild:
   Add ~arm-linux keyword.
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index d16ad796e9a6..66d81cdb1b66 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -29,6 +29,7 @@ DIST e2fsprogs-1.42.3.tar.gz 5817248 SHA256 ad6a41be876fab94c2bd5d10f7a0871a5601
 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.7.tar.gz 5981006 SHA256 dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 SHA512 954dbb832c2614d20cfaa5233033b469f16bf96612cf25074a66da79a5b3abf5eb1b340781e351bde06daf13bbbf5db4643774858aa494b8a8394ea742b6f07b WHIRLPOOL dd48dd13acb485eb8b8646bf4198e45e3ad8e8c6bd53b8186011a1cd2ee4a8ae7db75b6de982fd0d2f9d252f480645bd882cc95d76e614bd8bc10a36755d679c
 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
@@ -39,13 +40,24 @@ EBUILD e2fsprogs-1.42.3.ebuild 4431 SHA256 c7d6a2dd48218a10866f32c39a2cb7840c984
 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 4282 SHA256 83377430341860f723ee9268df9f4cc700d14c32cb86b1e7d7188992e1105a94 SHA512 1e44fe9d158204224acadd21b4d405d35ac9410b56d2cbee10e7b0b5670e31a625168b9c4d0dcd55e1af9bdeb6128719d2acdfc365f0e58db94c49823c454ce1 WHIRLPOOL 316a8b4d15b55529881a495fc6f921dcb0841e8e3b5691c583eb35fe3ab7ea4c9564842601731734a09ab0ccac7da30d4389ed1723504415ceef705c8be9feb3
+EBUILD e2fsprogs-1.42.7.ebuild 4287 SHA256 0d2db4f99bbb3878ad2d51de0a9ef78e28f389e5b6efcb4275cc459dc1805eae SHA512 c60c7a118c0cec790dbca64c292fd36b4d7a0738c8e434580d68f2731ea48059a6ac1e84da84406269865bbbd0f00a1de58cd8743486ea6aa20daacc65930851 WHIRLPOOL 1b5a07137f6d6e17a202c144d4f7afaccd3fbd2d1a0a3fe3a2cd1bea641492b6f3fbd266397d72802a678171a341d1ae18778fdfb944889361de8ad728d90f08
 EBUILD e2fsprogs-1.42.ebuild 4523 SHA256 aebb33bbb1d0f0b27e83503ac1fb8dc83aea140d2af77b34aece290ea5aa33b7 SHA512 0a2e7c9bb1942a3e754dfb5645ab84a54529f7e3fddc2147ca7ac28652110bcb35f06208c40d9ae301bd0647b6e817589f5f129fdcb56c2e75134dc478d1a7ce WHIRLPOOL 42ddae6fcd1b1bfcbdfc2a261d07925ef5a18d8903f1738f5ef6e8216befe97e1d20a3351a81cfaa18a44a24d299e72d32acb3216d058337443364a62dc77348
-MISC ChangeLog 38174 SHA256 8a3a9574423922c2ef9e88d3a7972bb4bb2e2783cc20505a90fed38204d97abf SHA512 c61827ad0c6ef691b0b2292a9468bb0f513137f271a64b048df66f4d183392ff8c73f599a2707e37c34edecdccd84d6fc18083e01fef9ebbf12232bae89014ca WHIRLPOOL 230105f4d952990117f29d57c5c46768221a48e8e959217173c6680ebdbaecc62d06b38e61e172287d95a4ae82c359893cf66a4f922f7f603348c3ace2e76249
+MISC ChangeLog 38383 SHA256 57c7149d4f5c9e6cd225cba423ae7c31540ab1b388d2681bd4815698d418f46c SHA512 3a018777d8e2d2aac31448cd5f1b3b36ff666b42a3e885750879a6ed1d71f786da153d53c28e3e10330667e45df08c3ed1c5f53dc7e56ad29107bb67e8d42c28 WHIRLPOOL 13a61d55c8c68b7ec042a198f27f7e7c2de8990cd7917b6bab485e2936f851dfd56458a8742ba35dcff03b9e81edbc2dadb404069b4cf4d3e84ef3fb1196c404
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEnkhsACgkQ/ejvha5XGaM0WACfZns+UOGz4iF/+pFXrsJcib5k
-tnwAoK3BgqRb4nQca2GES61FVM25ou/i
-=i0tK
+iQIcBAEBCAAGBQJROIV6AAoJEPiazRVxLXTFJ9AP/jG2nxoO1d9yyOXEyZsyg7Au
+BTO0cGnpInUUd/AKK0bttPn4dL49aXtju9vWmkHcY4djAPO5l0xzxb7pnc0moZ0l
+H50CPPcYH+EZy4hV/9MIxOE+aBwT6RbyP++yERQQDH/h38VvG5hKE1631NVcHPL/
+/mbt2TSrhoi154TZDDQA9O7Z74Oa0ICw65PEBhGjjEUxMSwYoOuqIem6HLtNzSiK
+JrlOX+qPcGrsmH0RJ7J+l0h+RYDk9FjVL0LRmVLkUmFu2NyNtZ18RNxBEt1T+k2F
+FT6++kwDMSd8CIg1gjpFp0mi7gRx3KgbfPgK7dNsdOjO+bntkfAzotpbM0Cl9UJN
+EPuboWnRvtvc179aXfEhwkvbUUdjWQIWkxWlw0cYw763PBVyGXgCPPCJdScAs7v5
+PIGJe3vg7SUx07Rgayizy4+VfanH0HiNUtbxhmKvL7tsynz3oMc7U/rWocapQqUK
+K/v4hUSyRA0mlPmE+yMyvd/hXU407Gp2HCMRlujJ//QjxCCweBvmsFSNViFzFX0I
+68zDxjBY6yqd1P32mYISujRRAGaKZR5TED2+9cJJe2bbHLlBsIwmWHuBGRg8qGKT
+asSbL3gbflZJctP/lT1fMvNqsL/VDpkTE2Jtz+kjnpFEJk2Scfz75x7S748bJZ4u
+prjhszuN/wa3MMRSUvr+
+=GuyF
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild
new file mode 100644
index 000000000000..ea6489fedefc
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild,v 1.1 2013/03/07 12:18:01 polynomial-c 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 ~arm-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
+}