Version bump.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64

3 files changed, 124 insertions, 12 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 886e36971de7..2b0f971cb1d6 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.160 2008/10/02 18:16:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.161 2008/10/18 16:44:15 vapier Exp $
+
+*e2fsprogs-1.41.3 (18 Oct 2008)
+
+  18 Oct 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.41.3.ebuild:
+  Version bump.
 
 *e2fsprogs-1.41.2 (02 Oct 2008)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index dfca13693eaf..ea6f61d7c623 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.40-fbsd.patch 352 RMD160 2d3f0979522a29bdf5aae1af9c73b33e76b02f23 SHA1 b229990591965b454dfaa88bf47437cc8386343d SHA256 52865c6600fa0f601a89e4396797ae2d23a1ed895e64b098c36e8bcab1ac8505
@@ -14,17 +11,12 @@ DIST e2fsprogs-1.40.9.tar.gz 4092812 RMD160 1cc51cb1b4bdcb338a2fdff50c79f38fb6e0
 DIST e2fsprogs-1.41.0.tar.gz 4260246 RMD160 12cfc7168539036e51853ec51a74f11b92a698c3 SHA1 651f14f64838019745173d587e028072a8e46a98 SHA256 db02fb36dae963eda7e8d8c11d1e178e5992f53893c5f0e76493d412758a1675
 DIST e2fsprogs-1.41.1.tar.gz 4352631 RMD160 0b5b1af0f2c9ff7ead7fa2b1caf1c6e41ee326fa SHA1 f55b95df6956cd5a9f85f7deb90968d24d79a4ab SHA256 4b0fb1fdceea52dabdb7f9aadd34febe5a4bb229d2ac8ff97229d0d349c118e4
 DIST e2fsprogs-1.41.2.tar.gz 4365064 RMD160 debe0ee72e2e68fb773887fb60ef509ad7bf6d76 SHA1 8334f9eaea5f0001e3241ea71ea094f2d87298a9 SHA256 635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56
+DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204abd6 SHA1 d85f05b7bcef1adf8306a789f3ac0325c3c67e8d SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
 EBUILD e2fsprogs-1.40.11.ebuild 4206 RMD160 b353dd0ac6e39232e415496e696c0a9ba86a8384 SHA1 851a0995d0ba8a2d9c24be7f6f27db32ca62909d SHA256 28ba5fe8c1318dfa3ee59a16fec506b7ea5cc8744fbeadec3a54fca225b8ebee
 EBUILD e2fsprogs-1.40.9.ebuild 4091 RMD160 ef0e2d0f136a5fd4b5acdc4c88eb450a90771bb9 SHA1 fb745566ddc65245bc974d8d2a6cf464a79d53ba SHA256 1d532704eb68eca1aa7922130bcf87fe13cc5955467c13797d3d393a0e7387ba
 EBUILD e2fsprogs-1.41.0.ebuild 3459 RMD160 ff88d3823e1d2c46e6d16d0e01d9511886a049bc SHA1 3eca1a1d726c612dec8cc158ea0a258a4b213f1f SHA256 0c743f36f080371d5efa634a426574a12f8d1643d01dac910751931782f5548e
 EBUILD e2fsprogs-1.41.1.ebuild 3459 RMD160 c4ae79307142ef6abc23ef84bb9ffb8125863200 SHA1 8e3bf9b55b6225c9c92435287d2db9f05747b75e SHA256 2391a7ad29f9f192a8feafbdacbb327592890b610ba7af871899e3fe0b1b9b77
 EBUILD e2fsprogs-1.41.2.ebuild 3459 RMD160 b38ca43fecc6f64186a66198e76943206d76ddbd SHA1 02e6cd03d4a6bc0792ba24d80f92ae748b8c2d2b SHA256 4e04ba4646f06a31e133e051a635fb57804b8558e597105430a6e4d135f82f75
-MISC ChangeLog 24489 RMD160 1fd28dc8b4b62af82228d76cc1eb212b0f92695d SHA1 c64ee9df0ce1e59916c44745d8fdc00dcdffa92b SHA256 4417ebae59968ae8651761a56693319f6d6497240ad89e93bf8247cf66c9b55b
+EBUILD e2fsprogs-1.41.3.ebuild 3459 RMD160 491603afbf7883067422b004f61d3bcf93db8f1e SHA1 e2a942bbaa5650fbb796cd705b87585b1e869f8d SHA256 e51513aa7ae9fe2c27578a5b9971d7c1f5ddcafae870fa025ee397d0013d266d
+MISC ChangeLog 24615 RMD160 fa5ae763c8a759c0bc4da548455619ce7fd8e2dd SHA1 c2cce887bbf76a31a23b1a306b904891245a0d66 SHA256 54cc487ad3da91b6414525e04a77be23cdc31bd2222b53b0fa2c670db7150ed4
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjlD+8ACgkQ67wieSYcaxfPmgCg5+0WnmcrmLD9tKQgUCzwGe5a
-l+wAn16VgNqBAMuKs3rAuzG6MsMU4SF+
-=t07p
------END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild
new file mode 100644
index 000000000000..33ec13e8c076
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.3.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.3.ebuild,v 1.1 2008/10/18 16:44:15 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 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.2-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	rm -rf doc
+	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 !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
+}