Version bump #225161 by Krzysztof Olędzki and rework ldscripts.

Package-Manager: portage-2.2_pre5.spank.spunk

3 files changed, 154 insertions, 2 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 4fac4d5b29ef..3a45f523178d 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.147 2008/06/07 16:51:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.148 2008/06/07 17:07:08 vapier Exp $
+
+*e2fsprogs-1.40.10 (07 Jun 2008)
+
+  07 Jun 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.10.ebuild:
+  Version bump #225161 by Krzysztof Olędzki and rework ldscripts.
 
   07 Jun 2008; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.40.9.ebuild:
   Stable for HPPA (bug #225239).
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 96bfae85e408..91eb58a6d6b5 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX e2fsprogs-1.38-tests-locale.patch 656 RMD160 16c625c16144ed16942fa19988524b7b5727c583 SHA1 debd15eba41a392cf0336e694bebf0c2409b18e3 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598
 AUX e2fsprogs-1.39-makefile.patch 2646 RMD160 5e5dca19f977c56d516ab1df3bf65700d870425a SHA1 9e6e7f5228dc15b458af0346827474376ea89f3a SHA256 b9d6876b76f36e873295e1ad7301d86dc00d7f2adab0743de57be9adf1578f9a
 AUX e2fsprogs-1.39-util-strptime.patch 178 RMD160 04d8e04d5e04f9a927a76b36a072c50fb80eae84 SHA1 95d1dd6b457c374a801bfbdddbf8603cbaeeecf3 SHA256 fa300c80bbd679967ff74c361b63a9610f911b0916eff38fd491b797c0ff99c5
@@ -8,13 +11,22 @@ AUX e2fsprogs-1.40.4-prototypes.patch 622 RMD160 5aa9ec39ebaff23ba5a42f9458d073d
 AUX e2fsprogs-1.40.5-libintl.patch 425 RMD160 a3cc77c99f42eebb8518b402c66565627ae869c3 SHA1 449968df4e6f06056d7a1266ff910394e10409e6 SHA256 281b175c362805d3c543dee4627e6ce065209652eff8ebea0d3b4f1d41ce0506
 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.10.tar.gz 4092763 RMD160 1ac25372d88539b171dd0c6a340babe21721ae72 SHA1 d386074911aa4380a9378f06f779480ffb93bf36 SHA256 36071b91510d4101a35887b7c654962945c571e8285af9fa974a7a6265dfaabc
 DIST e2fsprogs-1.40.4.tar.gz 4048867 RMD160 053556aab3de6ffffe5ab5981f436d4cdf9d9dae SHA1 c9268104027d22418e164346624cf726fa27efaa SHA256 2e1ece31b004ff1f4a26e5633e884eda11457b489bc854edaa0d7f024bc06564
 DIST e2fsprogs-1.40.6.tar.gz 4072124 RMD160 deaa6e316efb5d91be42a8c1c21686203f5dd6a0 SHA1 b1f422a5527f437516d5b68a8fe9a3e398b66d2c SHA256 b5fb67fb6b4f85fdf3256b1c2f9d9473e018d4fd5af0c50b1030ad794160c11e
 DIST e2fsprogs-1.40.8.tar.gz 4102707 RMD160 6a212b0aaa3ae4f9b1ba99a914df5c688ad452f5 SHA1 9410c11fc8be1cba435f24d086d154526dc42a77 SHA256 38df70f8b5ba121b11b02101cc399306a199d3c66c8185d8a2c0d07f5688eead
 DIST e2fsprogs-1.40.9.tar.gz 4092812 RMD160 1cc51cb1b4bdcb338a2fdff50c79f38fb6e09eef SHA1 c584e9a8d3c444f42f4c0a786bb94f4a00ea2b48 SHA256 ab6852230dcb30d75f640125a5d0c7b496bbc31502afdb76528e3bcd4089c9e4
+EBUILD e2fsprogs-1.40.10.ebuild 4179 RMD160 8c95556f24fb9e8b33a321c419a140eda849e92e SHA1 e0f0f3dca7d122eb4245518948a1bcf05d53e91b SHA256 7eec6f6b40a67e1a220336a4abcc7521ad2c9ed2ea13611933101fae6bf6f107
 EBUILD e2fsprogs-1.40.4.ebuild 3913 RMD160 c4da3a1694d5762542820bad3da5dcb7a78155c0 SHA1 5f1b8cfce0318c8634c7c14edf1e4233dd66feaf SHA256 ad24b1782e230186ab9993160d0125a18c2ba1f693959368e555e2dfcdeb8457
 EBUILD e2fsprogs-1.40.6.ebuild 4093 RMD160 ba5e52745aafcc89fdbd47466323f78a9713f82f SHA1 d09916d4e9710baee88ea88a5e82e381e8c84d6d SHA256 196e1c546ba22e6dd10dea2250166b65c1f32f9a9a53d86a0ef772207328742f
 EBUILD e2fsprogs-1.40.8.ebuild 4099 RMD160 3b57b69405aab77124603bfea4df8230783f51aa SHA1 4a8ea8a86fd0c58ae9fdd2f3618b4c3e40da9a0b SHA256 69d846accdb75e9acecd9b5a0d3592915155c88e66c49e2f7bef9b04f81a0229
 EBUILD e2fsprogs-1.40.9.ebuild 4099 RMD160 bdc6f54e15c80d7014097fd5e128f0c9c3f44d38 SHA1 95b178b295507636104f360e4eebf0ae55afded3 SHA256 7baedd58228194af4667238e4715fec2421444c8534f72b06b6774f0bcf22711
-MISC ChangeLog 22459 RMD160 6550ed9a20528692da3e6ebca46b85bcaed82fbf SHA1 34a4b0b50c9f6bd01e6da8fc6686d8b1000942cc SHA256 fea146f0169269bce0ca56734da2922d8fc8540b2cd29808a6b010ca064f1d51
+MISC ChangeLog 22641 RMD160 054d3d8f123479369fe7f7dd6414895a5dcef8e8 SHA1 e8c917bf57853f295bd6f1e2225b4c1f34d6ac31 SHA256 f419dd3c53d0c70c7fa6eaf97293d949338714d6e442212b89d4db2e31c6ed84
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFISsBCj9hvisErhMIRAntqAJ0c+IVQtBCatoHI7tu+6Vp0Vv0AtQCeIHT2
+pHCjA+fpjXpu7NXiv9icvH0=
+=54mo
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.10.ebuild
new file mode 100644
index 000000000000..4b93b4764d25
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.10.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.10.ebuild,v 1.1 2008/06/07 17:07:08 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 static elibc_FreeBSD"
+
+RDEPEND="~sys-libs/com_err-${PV}
+	~sys-libs/ss-${PV}
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	sys-apps/texinfo"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
+	chmod u+w po/*.po # Userpriv fix #27348
+	# Clean up makefile to suck less
+	epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40.5-libintl.patch #122368
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+
+	# kernel headers use the same defines as e2fsprogs and can cause issues #48829
+	sed -i \
+		-e 's:CONFIG_JBD_DEBUG:__CONFIG_JBD_DEBUG__E2FS:g' \
+		$(grep -rl CONFIG_JBD_DEBUG *) \
+		|| die "sed jbd debug failed"
+
+	# fake out files we forked into sep packages
+	sed -i \
+		-e '/^LIB_SUBDIRS/s:lib/et::' \
+		-e '/^LIB_SUBDIRS/s:lib/ss::' \
+		Makefile.in || die "remove subdirs"
+
+	# since we've split out com_err/ss into their own ebuilds, we
+	# need to fake out the local files.  let the toolchain find them.
+	mkdir tc || die
+	echo "GROUP ( libcom_err.a )" > tc/libcom_err.a
+	echo "GROUP ( libcom_err.so )" > tc/libcom_err.so
+	echo "GROUP ( libss.a )" > tc/libss.a
+	echo "GROUP ( libss.so )" > tc/libss.so
+	sed -i \
+		-e '/^LIB\(SS\|COM_ERR\)/s:$(LIB):$(top_builddir)/tc:' \
+		MCONFIG.in || die
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
+	ln -s $(type -P mk_cmds) lib/ss/mk_cmds
+	ln -s $(type -P compile_et) lib/et/compile_et
+
+	# sanity check for Bug 105304
+	if [[ -z ${USERLAND} ]] ; then
+		eerror "You just hit Bug 105304, please post your 'emerge info' here:"
+		eerror "http://bugs.gentoo.org/105304"
+		die "Aborting to prevent screwing your system"
+	fi
+}
+
+src_compile() {
+	# Keep the package from doing silly things
+	export LDCONFIG=:
+	export CC=$(tc-getCC)
+	export STRIP=:
+
+	econf \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--enable-elf-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable !static dynamic-e2fsck) \
+		$(use_enable !elibc_uclibc tls) \
+		--without-included-gettext \
+		$(use_enable nls) \
+		$(use_enable userland_GNU fsck) \
+		|| 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
+	# Parallel make sometimes fails
+	emake -j1 COMPILE_ET=compile_et || die
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake fsck_ext2fs || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README RELEASE-NOTES
+
+	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
+	# and install linker scripts to /usr/lib/.
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/
+	dolib.a lib/*.a || die "dolib.a"
+	rm -f "${D}"/usr/$(get_libdir)/lib{com_err,ss}.a #125146
+	local x
+	cd "${D}"/$(get_libdir)
+	for x in *.so ; do
+		gen_usr_ldscript ${x} || die "gen ldscript ${x}"
+	done
+
+	# 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
+}