Version bump.

Package-Manager: portage-2.1.4_rc4

4 files changed, 167 insertions, 9 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 113a24c316c0..75c2e43336dd 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.117 2007/11/26 03:21:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.118 2007/12/08 21:16:40 vapier Exp $
+
+*e2fsprogs-1.40.3 (08 Dec 2007)
+
+  08 Dec 2007; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.3.ebuild:
+  Version bump.
 
   26 Nov 2007; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.40.2.ebuild:
   Stable for HPPA (bug #200192).
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index fbade9c7dc02..6b5b06ed1fd6 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
@@ -57,6 +60,7 @@ SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22 files/fs
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
 DIST e2fsprogs-1.40.1.tar.gz 3957193 RMD160 5b468a143ac73da34601ad2d2f358e60091b4f08 SHA1 86e4d29accdd2a5d439940bd5c0551cfcbe875b7 SHA256 5db8bd0d4af126a112e784d40f81187a1d111d36e7b86a6ef993806a6ee02d39
 DIST e2fsprogs-1.40.2.tar.gz 3965919 RMD160 6e4ec42d50fa6f0762b5c4f58c09a0fa71a9af79 SHA1 65519d66bd15550d0bcd32ec72481ff0dbe737e2 SHA256 8bbdfd8866b60edec27fee58611d98ef841892c4e2cd0f0dacf194f20a716a63
+DIST e2fsprogs-1.40.3.tar.gz 4064408 RMD160 a49813cfaa5dc972c64119628a016b5857b7a74d SHA1 46cf38d469812f0ed4fa2ab35998f73bd40bc4d3 SHA256 1d4bc00e2759b29ca3051da1154bcc53d817a4190b2a7130b3241f50ee6cb00f
 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 4095 RMD160 fa68994a8a76d0a347174ccff537bd8df9d5b3af SHA1 17a61b9ea081ab179d2257f31a8b118775577447 SHA256 def7cc0344233fb99a40bf9d9273cbf880a16b5868db4101825bb639e4f3eb46
@@ -71,18 +75,22 @@ EBUILD e2fsprogs-1.40.1.ebuild 3599 RMD160 fc246bd28a367af4deda74c4316c8bef54b5f
 MD5 64da91c07c111cdcc367e731b9484f14 e2fsprogs-1.40.1.ebuild 3599
 RMD160 fc246bd28a367af4deda74c4316c8bef54b5f3da e2fsprogs-1.40.1.ebuild 3599
 SHA256 d3afb17ab40fb7f14eae0944be2855ec895141252f060a51ed98e2622658d05d e2fsprogs-1.40.1.ebuild 3599
-EBUILD e2fsprogs-1.40.2.ebuild 4031 RMD160 91079d1df815418d905dabc6cb90531580d4ef69 SHA1 aea0326b4125ea28e8c0da61b981c8d1ae71e6ec SHA256 80436a2762a15cfb8a06955dd0da96c86d1d45c560a4cfd542bf8fe2eea12bca
-MD5 283eb9a0da56c34fd811227b59a9a18a e2fsprogs-1.40.2.ebuild 4031
-RMD160 91079d1df815418d905dabc6cb90531580d4ef69 e2fsprogs-1.40.2.ebuild 4031
-SHA256 80436a2762a15cfb8a06955dd0da96c86d1d45c560a4cfd542bf8fe2eea12bca e2fsprogs-1.40.2.ebuild 4031
+EBUILD e2fsprogs-1.40.2.ebuild 4030 RMD160 4927cad50f46478bf45961460aa86d23f3385a89 SHA1 bb87a66be02c5fd5d63093c4b374bf21fd65aed4 SHA256 683a883d38e6595b584a9174267767854fb52c24faa55958349457e4a3c57e58
+MD5 8213fbb91cd0c8e68174118477cc86fa e2fsprogs-1.40.2.ebuild 4030
+RMD160 4927cad50f46478bf45961460aa86d23f3385a89 e2fsprogs-1.40.2.ebuild 4030
+SHA256 683a883d38e6595b584a9174267767854fb52c24faa55958349457e4a3c57e58 e2fsprogs-1.40.2.ebuild 4030
+EBUILD e2fsprogs-1.40.3.ebuild 4041 RMD160 454750cf2b183b3dafda02c32ddecf314d50e93c SHA1 0154585eb18af0cf4b8999dd2b0d40a60a8f908a SHA256 a3136768be158093b016adf4c82cec3aac097f180340a299eefaa1fbb7c73e90
+MD5 6514b1f0baf60b6f3c33695a1420eee9 e2fsprogs-1.40.3.ebuild 4041
+RMD160 454750cf2b183b3dafda02c32ddecf314d50e93c e2fsprogs-1.40.3.ebuild 4041
+SHA256 a3136768be158093b016adf4c82cec3aac097f180340a299eefaa1fbb7c73e90 e2fsprogs-1.40.3.ebuild 4041
 EBUILD e2fsprogs-1.40.ebuild 3770 RMD160 9be884e5dc9c2310b26add4e148c42c4643b39aa SHA1 ed69e81d2a6761f7982ee5c7ae2b40d023bd604b SHA256 92ddaf954231c2a82c4286dc94e1255e3911c29fa9ab545f984e343d635e17b2
 MD5 3d5746cff0bfe3d4ab2a65e6b42626df e2fsprogs-1.40.ebuild 3770
 RMD160 9be884e5dc9c2310b26add4e148c42c4643b39aa e2fsprogs-1.40.ebuild 3770
 SHA256 92ddaf954231c2a82c4286dc94e1255e3911c29fa9ab545f984e343d635e17b2 e2fsprogs-1.40.ebuild 3770
-MISC ChangeLog 18674 RMD160 034d779c75160d4116d6d2ce99c6bd09bf045b00 SHA1 c2c31ad33622a0a71665a3c44246901e6239c319 SHA256 25b3f9778880757a3d5110cced93cb446482d7c25103c31e550471bb7386a1a0
-MD5 3e9a95f4b76424277c187511afdb59ec ChangeLog 18674
-RMD160 034d779c75160d4116d6d2ce99c6bd09bf045b00 ChangeLog 18674
-SHA256 25b3f9778880757a3d5110cced93cb446482d7c25103c31e550471bb7386a1a0 ChangeLog 18674
+MISC ChangeLog 18803 RMD160 dff3116e19e582d295f9afe31efabec78d76b523 SHA1 5190fc81151043623346a6543f95f9c3bcd88385 SHA256 cac6f14a8674dad15922886d93ac15d562f151518e4555bf51e077a598493eb7
+MD5 f71e8ff3c785b6eea4fe99d7af47057b ChangeLog 18803
+RMD160 dff3116e19e582d295f9afe31efabec78d76b523 ChangeLog 18803
+SHA256 cac6f14a8674dad15922886d93ac15d562f151518e4555bf51e077a598493eb7 ChangeLog 18803
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -102,3 +110,13 @@ SHA256 34fc9d99ddb2ac1455d1eb05a649862baa502d24becbd4d952389d34498b1fe9 files/di
 MD5 4dfbb4dfcdb81f785ddc91f3307408ed files/digest-e2fsprogs-1.40.2 253
 RMD160 e4d75313507a8be6e01cfffe25055b77f885bc86 files/digest-e2fsprogs-1.40.2 253
 SHA256 68110f35f1b48f57c5da0f660ab454bc56debab94691022394ab4722f698b992 files/digest-e2fsprogs-1.40.2 253
+MD5 39514f3775b7a460db1c9ab0808b7b1c files/digest-e2fsprogs-1.40.3 253
+RMD160 d7c691d3c672cce47d5514661866a62aab0a9e53 files/digest-e2fsprogs-1.40.3 253
+SHA256 4b67dff555415a64a37dcd04b3195c487f77ed3b4c4649a61f27b3b4a3f867d7 files/digest-e2fsprogs-1.40.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHWwm+p/wUKkr7RBoRApPvAJ9Ktd2pzahsydKXPa/BOhyZ/+dbwwCgnk2Z
+VKHMLsw6oThuXZw0yM1P7nc=
+=0TQ6
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.3.ebuild
new file mode 100644
index 000000000000..dd603afae274
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.3.ebuild
@@ -0,0 +1,132 @@
+# 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.3.ebuild,v 1.1 2007/12/08 21:16:40 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 ~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}"
+	# 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
+
+	# Fix compile on FreeBSD
+	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"
+
+	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=:
+	export CC=$(tc-getCC)
+	export STRIP=:
+
+	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
+
+	# 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 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
+
+	# 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
+}
diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.3 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.3
new file mode 100644
index 000000000000..5b99f85c7b0d
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.3
@@ -0,0 +1,3 @@
+MD5 ad7ff4da7e200b9b25df58dc39989053 e2fsprogs-1.40.3.tar.gz 4064408
+RMD160 a49813cfaa5dc972c64119628a016b5857b7a74d e2fsprogs-1.40.3.tar.gz 4064408
+SHA256 1d4bc00e2759b29ca3051da1154bcc53d817a4190b2a7130b3241f50ee6cb00f e2fsprogs-1.40.3.tar.gz 4064408