Version bump.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26.1 x86_64

5 files changed, 220 insertions, 8 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 20afec8e7e51..3c18a7a1f9dc 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.155 2008/06/18 09:33:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.156 2008/08/16 04:43:40 vapier Exp $
+
+*e2fsprogs-1.41.0 (16 Aug 2008)
+
+  16 Aug 2008; Mike Frysinger <vapier@gentoo.org>
+  files/e2fsprogs-1.40-fbsd.patch, +files/e2fsprogs-1.41.0-makefile.patch,
+  +e2fsprogs-1.41.0.ebuild:
+  Version bump.
 
 *e2fsprogs-1.40.11 (18 Jun 2008)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index d290bf5d237a..162202db7db7 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -4,11 +4,12 @@ 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
-AUX e2fsprogs-1.40-fbsd.patch 407 RMD160 6bbfde16337a957a21343a05ab9cbe9f6878d1fe SHA1 8b4f61190850fbffef1e351946ea22bc48849dc1 SHA256 fa95b52353f0976d7b83b789208860cb04397c16413624180fcb223306bd5181
+AUX e2fsprogs-1.40-fbsd.patch 352 RMD160 2d3f0979522a29bdf5aae1af9c73b33e76b02f23 SHA1 b229990591965b454dfaa88bf47437cc8386343d SHA256 52865c6600fa0f601a89e4396797ae2d23a1ed895e64b098c36e8bcab1ac8505
 AUX e2fsprogs-1.40-libintl.patch 395 RMD160 dc4216ba03bc4e530b499198838f5c5625d7f245 SHA1 59c50cc94f27537bc7e93094b919faf82b6512b7 SHA256 fb56042fde8e1cb0a22e3c76c3381ba39449ee151c95d437a267c5188dfdd6b1
 AUX e2fsprogs-1.40.3-fsck-fuse.patch 1385 RMD160 a8bfab6141133c01f35839d388e9e22cd317c1dc SHA1 9665ec8494a4c4a3c9e181354442de7a4c7b503c SHA256 9924d991d7f8fa40e0d17d56b3a505066751fa4ac7b8a2f6ad3ab84ed5a91aa7
 AUX e2fsprogs-1.40.4-prototypes.patch 622 RMD160 5aa9ec39ebaff23ba5a42f9458d073db088ade13 SHA1 577fd2ba81685a1c3192c8b90820e6ead0f3985b SHA256 8efad16b0c9dde8f50869c4d663706cc0c3650d7c97c4fcc33c9ab96d33ea7f9
 AUX e2fsprogs-1.40.5-libintl.patch 425 RMD160 a3cc77c99f42eebb8518b402c66565627ae869c3 SHA1 449968df4e6f06056d7a1266ff910394e10409e6 SHA256 281b175c362805d3c543dee4627e6ce065209652eff8ebea0d3b4f1d41ce0506
+AUX e2fsprogs-1.41.0-makefile.patch 3044 RMD160 678da7d57ec775eaced1aa29f8bb6ea794e06621 SHA1 f5634e52b005d8a51fe60eae336f4459a31ab920 SHA256 4b00fbc25bb65079d0d6d0a3060a31280f28a115b28aad9a0af7f9c755a15376
 AUX fsck_ext2fs.8 3806 RMD160 193e4e01508ad363c28c8d5feb124f65d59a76eb SHA1 dff54a3149f8d6187f6481c428d4b980c3abfb97 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0
 AUX fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 SHA1 c0027c5e031b87dd8a5d50a3a256ac7637e59fd3 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22
 DIST e2fsprogs-1.40.10.tar.gz 4092763 RMD160 1ac25372d88539b171dd0c6a340babe21721ae72 SHA1 d386074911aa4380a9378f06f779480ffb93bf36 SHA256 36071b91510d4101a35887b7c654962945c571e8285af9fa974a7a6265dfaabc
@@ -17,18 +18,20 @@ DIST e2fsprogs-1.40.4.tar.gz 4048867 RMD160 053556aab3de6ffffe5ab5981f436d4cdf9d
 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
+DIST e2fsprogs-1.41.0.tar.gz 4260246 RMD160 12cfc7168539036e51853ec51a74f11b92a698c3 SHA1 651f14f64838019745173d587e028072a8e46a98 SHA256 db02fb36dae963eda7e8d8c11d1e178e5992f53893c5f0e76493d412758a1675
 EBUILD e2fsprogs-1.40.10.ebuild 4204 RMD160 2e8a57cb3091058b9c44ba25c0f2f4782b09b65b SHA1 a7b439f171a41f5bd4831b114cf5344578daf70e SHA256 267ca696188b5511c49bdbb76df03ea0890c8bea4cd4c7a254d179eed571059c
 EBUILD e2fsprogs-1.40.11.ebuild 4206 RMD160 b353dd0ac6e39232e415496e696c0a9ba86a8384 SHA1 851a0995d0ba8a2d9c24be7f6f27db32ca62909d SHA256 28ba5fe8c1318dfa3ee59a16fec506b7ea5cc8744fbeadec3a54fca225b8ebee
 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 4094 RMD160 7fc244c76119f8c619f687460fbbfe777d4b02a2 SHA1 d5e2dc85285f1e4f2234b741a9914982500d17df SHA256 032ebb0aa6d7b429a8e1b0e33a3e3fad3d6b6e17bfbec05ce946cbb06dcea7a6
 EBUILD e2fsprogs-1.40.9.ebuild 4091 RMD160 ef0e2d0f136a5fd4b5acdc4c88eb450a90771bb9 SHA1 fb745566ddc65245bc974d8d2a6cf464a79d53ba SHA256 1d532704eb68eca1aa7922130bcf87fe13cc5955467c13797d3d393a0e7387ba
-MISC ChangeLog 23676 RMD160 06bd470ea961647971dac51e622d1af52ff62ab3 SHA1 4b24b632f63a3698fc7fbd660d576d1370929cec SHA256 9cef79172e76ac3e3afcc94f42978c86b3a2712b32695c2a673e70e94df0a0b2
+EBUILD e2fsprogs-1.41.0.ebuild 3495 RMD160 34b18addb55cd213ddaa1005cfe30789c35f771a SHA1 78725dba525ae60b737a581e4ef8c6f6e8445c92 SHA256 936ddc3beda726a9593f016875f0dc47e1ed8c015844b13e70f52868cf3893a4
+MISC ChangeLog 23879 RMD160 5201ecfe31764df57e77e577b82eb0fa93450c3a SHA1 3456cfc94b8c845e486c4f32ef1d437b87e39227 SHA256 d8a827ac8c5f12dd7666149a9e089d46cad2bb00e2ec374c3f5b02eb7cc5996b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhY1ooACgkQ67wieSYcaxcwpQCcDqE2BwEdBvvD7u6b+HEzYE47
-LH4An0j4uYt6y5L+BXQXAEw8fm9fzuw8
-=ERC5
+iEYEARECAAYFAkimWwQACgkQ67wieSYcaxf//ACeKrbmlSQC8W1myutKB9W3V7Dp
+Y+0AoKIXPz/yf0V1hBDHEr/a7NmP8qNM
+=w3Ee
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.0.ebuild
new file mode 100644
index 000000000000..e0570b999630
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.0.ebuild
@@ -0,0 +1,115 @@
+# 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.41.0.ebuild,v 1.1 2008/08/16 04:43:40 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/${PN}-libs-${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
+	epatch "${FILESDIR}"/${PN}-1.41.0-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		-e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
+		-e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \
+		MCONFIG.in || die "muck libs" #122368
+	sed -i -r \
+		-e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \
+		Makefile.in || die "remove subdirs"
+	touch lib/ss/ss_err.h
+}
+
+src_compile() {
+	# Keep the package from doing silly things
+	addwrite /var/cache/fonts
+	export LDCONFIG=:
+	export CC=$(tc-getCC)
+	export STRIP=:
+
+	# We want to use the "bsd" libraries while building on Darwin, but while
+	# building on other Gentoo/*BSD we prefer elf-naming scheme.
+	local libtype
+	case ${CHOST} in
+		*-darwin*) libtype=bsd;;
+		*)         libtype=elf;;
+	esac
+
+	econf \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--enable-${libtype}-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
+	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || 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
+	emake DESTDIR="${D}" install-libs || 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)
+	local lib slib
+	for lib in "${D}"/usr/$(get_libdir)/*.a ; do
+		slib=${lib##*/}
+		mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}"
+		gen_usr_ldscript ${slib%.a}$(get_libname)
+	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/e2fsprogs-1.40-fbsd.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch
index 547befb3ec5a..7d0919600d05 100644
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch
@@ -1,5 +1,5 @@
---- a/lib/ext2fs/ext2_fs.h.orig	Sat Jun 30 16:36:37 2007
-+++ b/lib/ext2fs/ext2_fs.h	Sat Jun 30 16:36:43 2007
+--- a/lib/ext2fs/ext2_fs.h
++++ b/lib/ext2fs/ext2_fs.h
 @@ -414,7 +414,7 @@
  
  #define i_size_high	i_dir_acl
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.0-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.0-makefile.patch
new file mode 100644
index 000000000000..f4c95e14dbd0
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.0-makefile.patch
@@ -0,0 +1,87 @@
+--- e2fsck/Makefile.in
++++ e2fsck/Makefile.in
+@@ -199,12 +199,12 @@
+ 	@echo "	LINK $(root_sbindir)/fsck.ext2"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	@$(LN_S) -f e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext2
+ 	@echo "	LINK $(root_sbindir)/fsck.ext3"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	@$(LN_S) -f e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext3
+ 	@echo "	LINK $(root_sbindir)/fsck.ext4"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	@$(LN_S) -f e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext4
+ 	@echo "	LINK $(root_sbindir)/fsck.ext4dev"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
++	@$(LN_S) -f e2fsck \
+ 			$(DESTDIR)$(root_sbindir)/fsck.ext4dev
+@@ -225,12 +225,12 @@
+ 	@echo "	LINK $(man8dir)/fsck.ext2.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	@$(LN_S) -f e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext2.8
+ 	@echo "	LINK $(man8dir)/fsck.ext3.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	@$(LN_S) -f e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext3.8
+ 	@echo "	LINK $(man8dir)/fsck.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	@$(LN_S) -f e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext4.8
+ 	@echo "	LINK $(man8dir)/fsck.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
++	@$(LN_S) -f e2fsck.8 \
+ 		$(DESTDIR)$(man8dir)/fsck.ext4dev.8
+--- misc/Makefile.in
++++ misc/Makefile.in
+@@ -279,18 +279,18 @@
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext2"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	@$(LN_S) -f mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext2
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext3"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	@$(LN_S) -f mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext3
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext4"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	@$(LN_S) -f mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext4
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext4dev"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
++	@$(LN_S) -f mke2fs \
+ 		$(DESTDIR)$(root_sbindir)/mkfs.ext4dev
+ 	@echo "	LINK $(root_sbindir)/e2label"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
++	@$(LN_S) -f tune2fs \
+ 		$(DESTDIR)$(root_sbindir)/e2label
+ 	@echo "	LINK $(root_sbindir)/findfs"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
++	@$(LN_S) -f tune2fs \
+ 		$(DESTDIR)$(root_sbindir)/findfs
+@@ -314,12 +314,12 @@
+ 	@echo "	LINK mkfs.ext2.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	@$(LN_S) -f mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext2.8
+ 	@echo "	LINK mkfs.ext3.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	@$(LN_S) -f mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext3.8
+ 	@echo "	LINK mkfs.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	@$(LN_S) -f mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext4.8
+ 	@echo "	LINK mkfs.ext4dev.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
++	@$(LN_S) -f mke2fs.8 \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext4dev.8
+--- lib/Makefile.elf-lib
++++ lib/Makefile.elf-lib
+@@ -49,3 +49,3 @@
+ 	@echo "	SYMLINK $(libdir)/$(ELF_IMAGE).so"
+-	@$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
++	@$(LN_S) -f $(ELF_SONAME) \
+ 		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so