Version bump #175790 by Hanno Boeck.

Package-Manager: portage-2.1.2.5

5 files changed, 172 insertions, 5 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 2a3029482ef3..f7e710b4765d 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.101 2007/05/03 06:34:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.102 2007/05/05 06:37:28 vapier Exp $
+
+*e2fsprogs-1.40_pre20070411 (05 May 2007)
+
+  05 May 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.40-libintl.patch, +e2fsprogs-1.40_pre20070411.ebuild:
+  Version bump #175790 by Hanno Boeck.
 
   03 May 2007; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.39-r2.ebuild:
   Stable for HPPA (bug #176841).
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ea1a56bdc382..b01aeeddb34a 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX e2fsprogs-1.32-mk_cmds-cosmetic.patch 316 RMD160 42dae53c318fb52b39c8e1d357974111bf8712bf SHA1 2515d77050072bcd1ae7defa90f32fb101ac01c5 SHA256 182da8741b852fdaf2d17a485da0451ec0c665adb83327b29b3372e2e43f712a
 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
 RMD160 42dae53c318fb52b39c8e1d357974111bf8712bf files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
@@ -38,7 +41,12 @@ AUX e2fsprogs-1.39-util-strptime.patch 178 RMD160 04d8e04d5e04f9a927a76b36a072c5
 MD5 1fafebe6571f92773e2773deef654d16 files/e2fsprogs-1.39-util-strptime.patch 178
 RMD160 04d8e04d5e04f9a927a76b36a072c50fb80eae84 files/e2fsprogs-1.39-util-strptime.patch 178
 SHA256 fa300c80bbd679967ff74c361b63a9610f911b0916eff38fd491b797c0ff99c5 files/e2fsprogs-1.39-util-strptime.patch 178
+AUX e2fsprogs-1.40-libintl.patch 395 RMD160 dc4216ba03bc4e530b499198838f5c5625d7f245 SHA1 59c50cc94f27537bc7e93094b919faf82b6512b7 SHA256 fb56042fde8e1cb0a22e3c76c3381ba39449ee151c95d437a267c5188dfdd6b1
+MD5 2b3e72dc3791ae92ec98b5c937f88942 files/e2fsprogs-1.40-libintl.patch 395
+RMD160 dc4216ba03bc4e530b499198838f5c5625d7f245 files/e2fsprogs-1.40-libintl.patch 395
+SHA256 fb56042fde8e1cb0a22e3c76c3381ba39449ee151c95d437a267c5188dfdd6b1 files/e2fsprogs-1.40-libintl.patch 395
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
+DIST e2fsprogs-1.40-WIP-2007-04-11.tar.gz 4150775 RMD160 23de8d61cdb5f52f21022bfbb634ce60372627d4 SHA1 1ee81a2ee7bfab444d7cf7ae0ee6ba8a4eb08664 SHA256 3e259bd2a31905b83f30dc7847e80356f0334108b79ef04f6af9eafd7caf3293
 DIST ext4-e2fsprogs-1.39.patch.tar 716800 RMD160 5b20e7f2133e7339d22ee85d39c92cd7af920bb9 SHA1 fce15f60164a6c067c0d5a50cf00d4716e9a4f92 SHA256 0472210d002808f1505f96b1ca0e667f3cc2a6d585bca7d9a00130d6fe0ca38e
 EBUILD e2fsprogs-1.39-r1.ebuild 4134 RMD160 813116a571ccb7d910707fd87ac98ffa2c3123c0 SHA1 dfc45693e5712abe57dd9654d8979bdb9583f8ad SHA256 87348159bbda080d97dd6abcb01bb3c92a10c09ce4c830cab28c88302936aca4
 MD5 716ed4c217eecfbbbb87c6eb637ce194 e2fsprogs-1.39-r1.ebuild 4134
@@ -52,10 +60,14 @@ EBUILD e2fsprogs-1.39.ebuild 3773 RMD160 d86bd1048293be54efaba2b121cb66199b6bffa
 MD5 9cde58b75db8e27a56c692484c95a839 e2fsprogs-1.39.ebuild 3773
 RMD160 d86bd1048293be54efaba2b121cb66199b6bffab e2fsprogs-1.39.ebuild 3773
 SHA256 27ffaf0ad7faad5b2de8bf490f56cd377b292b434f3e003f6f2b6b80a523c123 e2fsprogs-1.39.ebuild 3773
-MISC ChangeLog 16561 RMD160 886f15e5f30673f76c6b399658c1f4b50839fcbe SHA1 3f7e3acb27ae3fb392a75f7eb3d338060ef5604d SHA256 0ea728a07cbee6640fa80c5f244df382ea7fca8a1113453959a13e54f0826478
-MD5 9ee4250ae5a02d1850c7d0c08981ed15 ChangeLog 16561
-RMD160 886f15e5f30673f76c6b399658c1f4b50839fcbe ChangeLog 16561
-SHA256 0ea728a07cbee6640fa80c5f244df382ea7fca8a1113453959a13e54f0826478 ChangeLog 16561
+EBUILD e2fsprogs-1.40_pre20070411.ebuild 3979 RMD160 f7bf4bb61c1ba99c92a8ec99c725aa0a8214f4b0 SHA1 f4772862d90169b4946b274be0b9cafdf59f9955 SHA256 f6cc2e014a6898a20cadee8c70d1e057019a918fce9281344c5c08e03513e261
+MD5 6d1a0e849993531c5b1307473146afe6 e2fsprogs-1.40_pre20070411.ebuild 3979
+RMD160 f7bf4bb61c1ba99c92a8ec99c725aa0a8214f4b0 e2fsprogs-1.40_pre20070411.ebuild 3979
+SHA256 f6cc2e014a6898a20cadee8c70d1e057019a918fce9281344c5c08e03513e261 e2fsprogs-1.40_pre20070411.ebuild 3979
+MISC ChangeLog 16772 RMD160 ad8d960b2362d56432a8ced40820a8858945943d SHA1 f723044e6ffbd314269a3ffa7e2bd4f62832b52c SHA256 187f4eb41666899ef03b2207bdd982d3092e27083330a6f3aa5975b5bc710bb1
+MD5 48a6adf4d3ca81e2899cbd9d4fe77cf4 ChangeLog 16772
+RMD160 ad8d960b2362d56432a8ced40820a8858945943d ChangeLog 16772
+SHA256 187f4eb41666899ef03b2207bdd982d3092e27083330a6f3aa5975b5bc710bb1 ChangeLog 16772
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -69,3 +81,13 @@ SHA256 031d234c293c7df0edc6d603c55f54ee8880a322532f0a2c7f98877e2eae189a files/di
 MD5 fc00317ae73d9c2807fd61dff454474c files/digest-e2fsprogs-1.39-r2 247
 RMD160 7fc0216dd2eb0963650054e763b94a26a3214c6a files/digest-e2fsprogs-1.39-r2 247
 SHA256 7f2869196368e8285912d8cc8ebe8d2ad3f08d07abad83f1011f753f3f824762 files/digest-e2fsprogs-1.39-r2 247
+MD5 bd27e42f4e2e75817e19154b6bc0340a files/digest-e2fsprogs-1.40_pre20070411 292
+RMD160 724f994eda0063389f21553dc215bf51a9d5aa2c files/digest-e2fsprogs-1.40_pre20070411 292
+SHA256 13ff8f69ce7a64120e7be8b1d57c9a41bd41bf269a14e1767715612135a807a7 files/digest-e2fsprogs-1.40_pre20070411 292
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGPCZD8bi6rjpTunYRApG7AJ9FSNtlKm8kdw6F83bPTMGFgqFI6QCgtRSk
+sQ53Qa2Dxv9ypoQ6XCbM5aI=
+=EMYA
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40_pre20070411.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40_pre20070411.ebuild
new file mode 100644
index 000000000000..20b03aa3c29e
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.40_pre20070411.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40_pre20070411.ebuild,v 1.1 2007/05/05 06:37:28 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+SNAP="${PV##*_pre}"
+MY_PV="${PV%%_pre*}-WIP-${SNAP:0:4}-${SNAP:4:2}-${SNAP:6:2}"
+MY_P="e2fsprogs-${MY_PV}"
+
+DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls static"
+
+RDEPEND="~sys-libs/com_err-${PV}
+	~sys-libs/ss-${PV}
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	sys-apps/texinfo"
+
+S=${WORKDIR}/e2fsprogs-${PV%%_pre*}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Fix locale issues while running tests #99766
+	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
+	# Fix a cosmetic error in mk_cmds's help output.
+	epatch "${FILESDIR}"/e2fsprogs-1.32-mk_cmds-cosmetic.patch
+	epatch "${FILESDIR}"/e2fsprogs-1.39-util-strptime.patch
+	chmod u+w po/*.po # Userpriv fix #27348
+	# Clean up makefile to suck less
+	epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch
+	epatch "${FILESDIR}"/e2fsprogs-1.39-parse-types.patch #146903
+	epatch "${FILESDIR}"/${PN}-1.40-libintl.patch #122368
+
+	# 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"
+	ln -s "${ROOT}"/usr/$(get_libdir)/libcom_err.a lib/libcom_err.a
+	ln -s "${ROOT}"/$(get_libdir)/libcom_err.so lib/libcom_err.so
+	ln -s /usr/bin/mk_cmds lib/ss/mk_cmds
+	ln -s "${ROOT}"/usr/include/ss/ss_err.h lib/ss/
+	ln -s "${ROOT}"/$(get_libdir)/libss.so lib/libss.so
+
+	# 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=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+
+	econf \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--enable-elf-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable !static dynamic-e2fsck) \
+		--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
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README RELEASE-NOTES SHLIBS
+	docinto e2fsck
+	dodoc e2fsck/ChangeLog e2fsck/CHANGES
+
+	# 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)/libcom_err.a #125146
+	local x
+	cd "${D}"/$(get_libdir)
+	for x in *.so ; do
+		gen_usr_ldscript ${x} || die "gen ldscript ${x}"
+	done
+
+	ln -s libext2fs.info.gz  $D/usr/share/info/booga.info.gz
+	# move 'useless' stuff to /usr/
+	dosbin "${D}"/sbin/mklost+found
+	rm -f "${D}"/sbin/mklost+found
+
+	# these manpages are already provided by FreeBSD libc
+	use elibc_FreeBSD && \
+		rm -f "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
+			"${D}"/usr/share/man/man1/uuidgen.1
+}
diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40_pre20070411 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40_pre20070411
new file mode 100644
index 000000000000..808386f08fa8
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40_pre20070411
@@ -0,0 +1,3 @@
+MD5 99f3092962caff73db7b750cbde0b286 e2fsprogs-1.40-WIP-2007-04-11.tar.gz 4150775
+RMD160 23de8d61cdb5f52f21022bfbb634ce60372627d4 e2fsprogs-1.40-WIP-2007-04-11.tar.gz 4150775
+SHA256 3e259bd2a31905b83f30dc7847e80356f0334108b79ef04f6af9eafd7caf3293 e2fsprogs-1.40-WIP-2007-04-11.tar.gz 4150775
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-libintl.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-libintl.patch
new file mode 100644
index 000000000000..fc058c158cab
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-libintl.patch
@@ -0,0 +1,15 @@
+Fixes libintl handling on non-glibc
+
+http://bugs.gentoo.org/122368
+
+--- e2fsprogs-1.40/MCONFIG.in
++++ e2fsprogs-1.40/MCONFIG.in
+@@ -71,7 +71,7 @@
+ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
+ LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ 
+ LIBBLKID = $(LIB)/libblkid@LIB_EXT@
+-LIBINTL = @LIBINTL@
++LIBINTL = @LTLIBINTL@
+ DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
+ DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@
+