Version bump.

Package-Manager: portage-2.2_pre2

3 files changed, 149 insertions, 2 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 75c46361bab2..9cbf9573487f 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.136 2008/02/20 22:32:50 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.137 2008/03/14 01:38:11 vapier Exp $
+
+*e2fsprogs-1.40.8 (14 Mar 2008)
+
+  14 Mar 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.8.ebuild:
+  Version bump.
 
   20 Feb 2008; <solar@gentoo.org> e2fsprogs-1.40.5-r1.ebuild,
   e2fsprogs-1.40.6.ebuild:
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 4dcc217a9b6e..d5a8c9ac5c9a 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
@@ -12,10 +15,19 @@ DIST e2fsprogs-1.40.3.tar.gz 4064408 RMD160 a49813cfaa5dc972c64119628a016b5857b7
 DIST e2fsprogs-1.40.4.tar.gz 4048867 RMD160 053556aab3de6ffffe5ab5981f436d4cdf9d9dae SHA1 c9268104027d22418e164346624cf726fa27efaa SHA256 2e1ece31b004ff1f4a26e5633e884eda11457b489bc854edaa0d7f024bc06564
 DIST e2fsprogs-1.40.5.tar.gz 4048882 RMD160 ec4a1ab69c114092075b3e6e37aade2facc6e878 SHA1 9a467da21952c8366a5eb246274a3237df7ff5de SHA256 11df6d84e0eb0da17938d4802d7872657b464c9a53ed21b0521c929d481d8ac4
 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
 EBUILD e2fsprogs-1.40.3-r1.ebuild 4023 RMD160 0a74cdc61b4d74502d91f179b89da1601aa68c54 SHA1 f2c49ac7482a46081e505fbbcf076669512591c8 SHA256 b833436e6f8a11cae8f3640a67bb852597182f9be7f4bfe6e1f35f59ad5a648d
 EBUILD e2fsprogs-1.40.3.ebuild 3957 RMD160 12ce3e2b1862aee056896db5f6c8e5b2d8463509 SHA1 88552dfbbc4aa2b51fc34556623ab1342cf8724f SHA256 868d9884c2ed83d07be84fdf37914f3d53afd97f7f59cc2f099748bc5896d0c9
 EBUILD e2fsprogs-1.40.4.ebuild 3882 RMD160 485393b715e50235711a22ef171e8f0ac26fd307 SHA1 734bac4d29dbcfc641603c10bd71beaaffa2a199 SHA256 4908ed9dd6b84f1fcf044c3fbe01ebc130d78527134bfbc99326e19396524c89
 EBUILD e2fsprogs-1.40.5-r1.ebuild 4105 RMD160 4256288a5b5cd59630955e1779271abf626f0dda SHA1 54f8d3c7acac1b1161adacb65a9564570fc612fe SHA256 b482820c23a527a2000782ece7b73ba21b0c9712edb7f261348f8a27474bd275
 EBUILD e2fsprogs-1.40.6.ebuild 4102 RMD160 562d47a95e00c53d84520cff6960ebbe5a283bb2 SHA1 3789017b1835d8a60965b615475beb8040f1f462 SHA256 5ecec3494db949e62a89d0c6a855416af94f537f7568266b46ebe7676be3b22a
-MISC ChangeLog 21256 RMD160 2160a013f80a716a71b0a4bde243b6c920473655 SHA1 dfd4d6f284d3b39b915618cb1cb61f292e363deb SHA256 0e5779288aee5b6819c73c05658f148f0725bf937609d31d3199fd18a765c127
+EBUILD e2fsprogs-1.40.8.ebuild 4103 RMD160 bf7f71875cf010f5e5c49e281d859791c5f9a141 SHA1 d8fd31d2a328c9f8fa4628bb1dee0a2d5c5fd098 SHA256 13b8950031bcef6d239fbc40e3cdeacf8a4f2e9d15930db21f153b64d0afbd98
+MISC ChangeLog 21383 RMD160 96c64b83b20f5ef5d4111f695913d1d216649e4a SHA1 85f1c02aaf6ec57950377e15eac642a55e016413 SHA256 404b9a4708a6fcb63d3be2178585e46ccbe3cb81a68b89bb2722adacd9fbf977
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH2dc3j9hvisErhMIRAo3eAJ9jdakOEVsCLh/AiN2IL/R+zyX+zgCaAla2
+INBoTrDnY4VffQhT5rAML9M=
+=HRWo
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.8.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.8.ebuild
new file mode 100644
index 000000000000..7e6f3f5e6936
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.8.ebuild
@@ -0,0 +1,130 @@
+# 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.8.ebuild,v 1.1 2008/03/14 01:38:11 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.
+	echo "GROUP ( /usr/$(get_libdir)/libcom_err.a )" > lib/libcom_err.a
+	echo "GROUP ( /usr/$(get_libdir)/libcom_err.so )" > lib/libcom_err.so
+	echo "GROUP ( /usr/$(get_libdir)/libss.a )" > lib/libss.a
+	echo "GROUP ( /usr/$(get_libdir)/libss.so )" > lib/libss.so
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
+	ln -s /usr/bin/mk_cmds lib/ss/mk_cmds
+
+	# 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
+}