From 48be7bae52fdbdb4e99ebd161bcf2993fc22ab5e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 28 Jan 2008 06:43:46 +0000 Subject: Version bump. (Portage version: 2.1.4) --- sys-fs/e2fsprogs/ChangeLog | 8 +- sys-fs/e2fsprogs/e2fsprogs-1.40.5.ebuild | 129 +++++++++++++++++++++ sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.5 | 3 + .../e2fsprogs/files/e2fsprogs-1.40.5-libintl.patch | 15 +++ 4 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 sys-fs/e2fsprogs/e2fsprogs-1.40.5.ebuild create mode 100644 sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.5 create mode 100644 sys-fs/e2fsprogs/files/e2fsprogs-1.40.5-libintl.patch (limited to 'sys-fs/e2fsprogs') diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index f5d4e779a2b0..40180f4774b7 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,12 @@ # 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.127 2008/01/01 13:13:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.128 2008/01/28 06:43:46 vapier Exp $ + +*e2fsprogs-1.40.5 (28 Jan 2008) + + 28 Jan 2008; Mike Frysinger + +files/e2fsprogs-1.40.5-libintl.patch, +e2fsprogs-1.40.5.ebuild: + Version bump. *e2fsprogs-1.40.4 (01 Jan 2008) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.5.ebuild new file mode 100644 index 000000000000..8da0d716c8b5 --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.5.ebuild @@ -0,0 +1,129 @@ +# 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.40.5.ebuild,v 1.1 2008/01/28 06:43:46 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}" + epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 + 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.5-libintl.patch #122368 + 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" + + # since we've split out com_err/ss into their own ebuilds, we + # need to fake out the local files. let the toolchain find them. + echo 'GROUP ( /usr/lib/libcom_err.a )' > lib/libcom_err.a + echo 'GROUP ( /usr/lib/libcom_err.so )' > lib/libcom_err.so + echo 'GROUP ( /usr/lib/libss.a )' > lib/libss.a + echo 'GROUP ( /usr/lib/libss.so )' > lib/libss.so + echo '#include_next ' > lib/ss/ss_err.h + ln -s /usr/bin/mk_cmds lib/ss/mk_cmds + + # 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 README RELEASE-NOTES + + # 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.5 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.5 new file mode 100644 index 000000000000..b16b69b20a27 --- /dev/null +++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.5 @@ -0,0 +1,3 @@ +MD5 69e55eaf543acfab8e2eb8ba2883d8cd e2fsprogs-1.40.5.tar.gz 4048882 +RMD160 ec4a1ab69c114092075b3e6e37aade2facc6e878 e2fsprogs-1.40.5.tar.gz 4048882 +SHA256 11df6d84e0eb0da17938d4802d7872657b464c9a53ed21b0521c929d481d8ac4 e2fsprogs-1.40.5.tar.gz 4048882 diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40.5-libintl.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40.5-libintl.patch new file mode 100644 index 000000000000..272807368cff --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.40.5-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@ @STATIC_BLKID_DEVMAPPER_LIBS@ +-LIBINTL = @LIBINTL@ ++LIBINTL = @LTLIBINTL@ + DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@ + DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@ + -- cgit v1.2.3-65-gdbad