diff options
Diffstat (limited to 'sys-fs/e2fsprogs')
| -rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.40_pre20070411.ebuild | 121 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40_pre20070411 | 3 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.40-libintl.patch | 15 |
4 files changed, 146 insertions, 1 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index 2a3029482ef3..f7e710b4765d 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,12 @@ # 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.101 2007/05/03 06:34:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.102 2007/05/05 06:37:28 vapier Exp $ + +*e2fsprogs-1.40_pre20070411 (05 May 2007) + + 05 May 2007; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.40-libintl.patch, +e2fsprogs-1.40_pre20070411.ebuild: + Version bump #175790 by Hanno Boeck. 03 May 2007; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.39-r2.ebuild: Stable for HPPA (bug #176841). diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40_pre20070411.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40_pre20070411.ebuild new file mode 100644 index 000000000000..20b03aa3c29e --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.40_pre20070411.ebuild @@ -0,0 +1,121 @@ +# 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_pre20070411.ebuild,v 1.1 2007/05/05 06:37:28 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +SNAP="${PV##*_pre}" +MY_PV="${PV%%_pre*}-WIP-${SNAP:0:4}-${SNAP:4:2}-${SNAP:6:2}" +MY_P="e2fsprogs-${MY_PV}" + +DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +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" + +S=${WORKDIR}/e2fsprogs-${PV%%_pre*} + +src_unpack() { + unpack ${A} + cd "${S}" + # Fix locale issues while running tests #99766 + epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 + # Fix a cosmetic error in mk_cmds's help output. + epatch "${FILESDIR}"/e2fsprogs-1.32-mk_cmds-cosmetic.patch + 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}"/e2fsprogs-1.39-parse-types.patch #146903 + 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_pre20070411 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40_pre20070411 new file mode 100644 index 000000000000..808386f08fa8 --- /dev/null +++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40_pre20070411 @@ -0,0 +1,3 @@ +MD5 99f3092962caff73db7b750cbde0b286 e2fsprogs-1.40-WIP-2007-04-11.tar.gz 4150775 +RMD160 23de8d61cdb5f52f21022bfbb634ce60372627d4 e2fsprogs-1.40-WIP-2007-04-11.tar.gz 4150775 +SHA256 3e259bd2a31905b83f30dc7847e80356f0334108b79ef04f6af9eafd7caf3293 e2fsprogs-1.40-WIP-2007-04-11.tar.gz 4150775 diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-libintl.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-libintl.patch new file mode 100644 index 000000000000..fc058c158cab --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-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@ +-LIBINTL = @LIBINTL@ ++LIBINTL = @LTLIBINTL@ + DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@ + DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@ + |