Version bump.

Package-Manager: portage-2.2_pre5

3 files changed, 142 insertions, 5 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index e06c6bf86b9f..15f0e0ece2d7 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.141 2008/03/28 08:18:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.142 2008/04/27 22:22:57 vapier Exp $
+
+*e2fsprogs-1.40.9 (27 Apr 2008)
+
+  27 Apr 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.9.ebuild:
+  Version bump.
 
   28 Mar 2008; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.40.6.ebuild:
   Stable for HPPA too.
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 959304588f81..713f66e54428 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -14,15 +14,17 @@ AUX fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 SHA1 c002
 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.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 4103 RMD160 bf7f71875cf010f5e5c49e281d859791c5f9a141 SHA1 d8fd31d2a328c9f8fa4628bb1dee0a2d5c5fd098 SHA256 13b8950031bcef6d239fbc40e3cdeacf8a4f2e9d15930db21f153b64d0afbd98
-MISC ChangeLog 21801 RMD160 422d60f42a4610fde396b330a0b9b55b7d1b71d3 SHA1 cad3dd84f0c8eb199e212fdec54050959efe102e SHA256 e3c5670eb39673c59fbd04ab0d35a86b24229881199c7a5dc3fa031feafa43dd
+EBUILD e2fsprogs-1.40.9.ebuild 4103 RMD160 0255cf8c08f6c0e7fe5831cfdf4b03d6264f4624 SHA1 cc67e249b6bb52720c73a3f0b38779d357cfa31f SHA256 7229356da847a5bd85afc832b329fdd7b9a2f28308936cce9d6a3a32055640bf
+MISC ChangeLog 21930 RMD160 d0e5f35517e305128a181ffb0166c8aa9d351077 SHA1 5bcc1fd393557a324a9df37d76fbe9d93b550210 SHA256 8a404c41a72c03deed18479c9df7732bd69c0875c1f9b98c55c2d518cef29512
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIFPqjj9hvisErhMIRAoQUAKDhRq+V1lG3M7W/u5IBdFPNN+1mngCdF9yn
-l8a9+h5WNgfPc9dFNCyZ2/U=
-=iG4b
+iD8DBQFIFPzHj9hvisErhMIRAvWxAJ4gJGUORbhwQnIxsmL6hdspHj+aXACgsvBR
+rRsm3icELLBD1Ytb3DPWVvw=
+=Dg0s
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.9.ebuild
new file mode 100644
index 000000000000..a13349c6e63c
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.9.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.9.ebuild,v 1.1 2008/04/27 22:22:57 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
+}