Version bump.

Package-Manager: portage-2.1.3_rc6

4 files changed, 136 insertions, 16 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 405a7343556b..dc3589b3f763 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.108 2007/06/30 16:17:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.109 2007/07/09 03:20:02 vapier Exp $
+
+*e2fsprogs-1.40.1 (09 Jul 2007)
+
+  09 Jul 2007; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.1.ebuild:
+  Version bump.
 
 *e2fsprogs-1.40 (30 Jun 2007)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 8175275867e9..07fe02f80162 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -46,7 +46,7 @@ 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 e2fsprogs-1.40.1.tar.gz 3957193 RMD160 5b468a143ac73da34601ad2d2f358e60091b4f08 SHA1 86e4d29accdd2a5d439940bd5c0551cfcbe875b7 SHA256 5db8bd0d4af126a112e784d40f81187a1d111d36e7b86a6ef993806a6ee02d39
 DIST e2fsprogs-1.40.tar.gz 4160254 RMD160 50b80f50c8565514a241a8dbef012139bb5d8313 SHA1 9a8c0d76313f2061228dbc6ee51d4bc054efcd2a SHA256 3a506f345e5da098c6c37239eb99e92d11a4100490245e102b13c446d1124296
 DIST ext4-e2fsprogs-1.39.patch.tar 716800 RMD160 5b20e7f2133e7339d22ee85d39c92cd7af920bb9 SHA1 fce15f60164a6c067c0d5a50cf00d4716e9a4f92 SHA256 0472210d002808f1505f96b1ca0e667f3cc2a6d585bca7d9a00130d6fe0ca38e
 EBUILD e2fsprogs-1.39-r1.ebuild 4135 RMD160 53858f13289fa28c18e12fa60d43bce2f49a0f0e SHA1 c80c11ee9251d32ce8c8ab61f7178cb261426d6d SHA256 542314a8c1db0282f5e7ed6a681d6c0662ccb77efbc200161e9f4836bd77a29a
@@ -61,18 +61,18 @@ EBUILD e2fsprogs-1.39.ebuild 3774 RMD160 52f8e3bc55d3acc51861fc36c86fddded0b63c7
 MD5 f988fbb7327fcba76f182c21ac099ae3 e2fsprogs-1.39.ebuild 3774
 RMD160 52f8e3bc55d3acc51861fc36c86fddded0b63c7f e2fsprogs-1.39.ebuild 3774
 SHA256 198195e53e519a72a40995cc0fa7f093268ecc7461372995186687a81d020c12 e2fsprogs-1.39.ebuild 3774
+EBUILD e2fsprogs-1.40.1.ebuild 3642 RMD160 90c1b440d48e70185dc4e58702ae21c707594b8c SHA1 d3139cc905b2e74a162df51420a240accd48ea66 SHA256 ee69e9dfc2c0848bb05dcd19e7ffec8848db8128b5afc30b419c2b70375438b6
+MD5 f16ea0195240c0f54a2fef6fe6923c7a e2fsprogs-1.40.1.ebuild 3642
+RMD160 90c1b440d48e70185dc4e58702ae21c707594b8c e2fsprogs-1.40.1.ebuild 3642
+SHA256 ee69e9dfc2c0848bb05dcd19e7ffec8848db8128b5afc30b419c2b70375438b6 e2fsprogs-1.40.1.ebuild 3642
 EBUILD e2fsprogs-1.40.ebuild 3813 RMD160 a3659340588ec4a1ea9de3f4fc4eb2203d46b647 SHA1 67531855043e331e0c0eec99e2da9b28b956c680 SHA256 dd445f6048aa7c2532e2ad36a4f406cccb233715ecd7d8ddfd9d1973f07687e2
 MD5 f324e28d0aa31c460dc5bd9014316d4c e2fsprogs-1.40.ebuild 3813
 RMD160 a3659340588ec4a1ea9de3f4fc4eb2203d46b647 e2fsprogs-1.40.ebuild 3813
 SHA256 dd445f6048aa7c2532e2ad36a4f406cccb233715ecd7d8ddfd9d1973f07687e2 e2fsprogs-1.40.ebuild 3813
-EBUILD e2fsprogs-1.40_pre20070411.ebuild 3970 RMD160 c113223315c1419b7bc9a91d5bb287db275cb5d7 SHA1 d24087edac9f2f2c6bd46d46febf1df58a9272a0 SHA256 9a78b0fbacef88caa78524c5d4919b94edf658cb3d76a1720dabc6130d8a0755
-MD5 263d5036144ca147442b8c4467f5011e e2fsprogs-1.40_pre20070411.ebuild 3970
-RMD160 c113223315c1419b7bc9a91d5bb287db275cb5d7 e2fsprogs-1.40_pre20070411.ebuild 3970
-SHA256 9a78b0fbacef88caa78524c5d4919b94edf658cb3d76a1720dabc6130d8a0755 e2fsprogs-1.40_pre20070411.ebuild 3970
-MISC ChangeLog 17567 RMD160 e5413164663c0f60064d93d3fff7c52a6d19fb41 SHA1 ea7cd2d942ec6a6b71eb66d0987ac7fa61e24c71 SHA256 a187b026a5b3843786029eead40785376888f95fa4a23604ee0cc34e7859ad69
-MD5 50cc0560ab566220a7bcafc24124cefb ChangeLog 17567
-RMD160 e5413164663c0f60064d93d3fff7c52a6d19fb41 ChangeLog 17567
-SHA256 a187b026a5b3843786029eead40785376888f95fa4a23604ee0cc34e7859ad69 ChangeLog 17567
+MISC ChangeLog 17693 RMD160 9ab39f3d2b6030433f0ec2f92caeee83b7b79722 SHA1 92ec3c39317b1a65c277764c8b87ece532cf9abd SHA256 372452cd38e9389dea00ba1cc4dc06526dcfbceea31131387a1e0f5e33ec94e1
+MD5 cb142af97175667c1ef39c29761db623 ChangeLog 17693
+RMD160 9ab39f3d2b6030433f0ec2f92caeee83b7b79722 ChangeLog 17693
+SHA256 372452cd38e9389dea00ba1cc4dc06526dcfbceea31131387a1e0f5e33ec94e1 ChangeLog 17693
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -89,13 +89,13 @@ SHA256 7f2869196368e8285912d8cc8ebe8d2ad3f08d07abad83f1011f753f3f824762 files/di
 MD5 d015e3a177ccf541d355ca62a4876347 files/digest-e2fsprogs-1.40 247
 RMD160 9c8bdca620a22cc5f9e09f6b4a73dddf9f806b69 files/digest-e2fsprogs-1.40 247
 SHA256 4d06e2187b0ece696260dd7b90af6c1c4c009247d48a014807d1b445e6cc73f2 files/digest-e2fsprogs-1.40 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
+MD5 f3146cef2366c9ce69b16a47c0975e0a files/digest-e2fsprogs-1.40.1 253
+RMD160 b75016e9af7c1cec280f95c4ff39a59db8a3ac12 files/digest-e2fsprogs-1.40.1 253
+SHA256 34fc9d99ddb2ac1455d1eb05a649862baa502d24becbd4d952389d34498b1fe9 files/digest-e2fsprogs-1.40.1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGhoJop/wUKkr7RBoRAjAWAJ4q0zCxBGKc8DozWEhXHYEHB6rofgCdFygM
-Pbi9EpWVuy4uo/CAZTfeFyQ=
-=2sBM
+iD8DBQFGkaoDp/wUKkr7RBoRAlJSAKDSe/uyFnmM9BxG5s1gJx7TD7wSuQCfcd1k
+9A1D0BGW0+YGCCyIqu04JLE=
+=Eno2
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.1.ebuild
new file mode 100644
index 000000000000..feaeced70ce0
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.1.ebuild
@@ -0,0 +1,112 @@
+# 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.1.ebuild,v 1.1 2007/07/09 03:20:02 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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"
+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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Fix locale issues while running tests #99766
+	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
+	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}"/${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.1 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.1
new file mode 100644
index 000000000000..6d9af5ec94b7
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.1
@@ -0,0 +1,3 @@
+MD5 6bde5e7ca69ebf939098906c203d754c e2fsprogs-1.40.1.tar.gz 3957193
+RMD160 5b468a143ac73da34601ad2d2f358e60091b4f08 e2fsprogs-1.40.1.tar.gz 3957193
+SHA256 5db8bd0d4af126a112e784d40f81187a1d111d36e7b86a6ef993806a6ee02d39 e2fsprogs-1.40.1.tar.gz 3957193