diff options
author | Mike Frysinger <vapier@gentoo.org> | 2007-06-30 16:17:38 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2007-06-30 16:17:38 +0000 |
commit | 1cd3f77048f214d17bebc33d84b295b3504eda14 (patch) | |
tree | 991c95190936f55f00c0f3eb6a008384340ce729 /sys-fs | |
parent | Add ~alpha wrt #165190 (diff) | |
download | gentoo-2-1cd3f77048f214d17bebc33d84b295b3504eda14.tar.gz gentoo-2-1cd3f77048f214d17bebc33d84b295b3504eda14.tar.bz2 gentoo-2-1cd3f77048f214d17bebc33d84b295b3504eda14.zip |
Version bump.
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 7 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.40.ebuild | 115 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40 | 3 |
3 files changed, 124 insertions, 1 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index af8d076cce38..405a7343556b 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.107 2007/06/23 02:27:57 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.108 2007/06/30 16:17:38 vapier Exp $ + +*e2fsprogs-1.40 (30 Jun 2007) + + 30 Jun 2007; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.ebuild: + Version bump. 23 Jun 2007; Daniel Drake <dsd@gentoo.org> e2fsprogs-1.39.ebuild, e2fsprogs-1.39-r1.ebuild, e2fsprogs-1.39-r2.ebuild, diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.ebuild new file mode 100644 index 000000000000..71c0cd101ce0 --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.ebuild @@ -0,0 +1,115 @@ +# 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.ebuild,v 1.1 2007/06/30 16:17:38 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" +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" + +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 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40 new file mode 100644 index 000000000000..9ae46389c607 --- /dev/null +++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40 @@ -0,0 +1,3 @@ +MD5 40095356dbe3d970b898469fe598317c e2fsprogs-1.40.tar.gz 4160254 +RMD160 50b80f50c8565514a241a8dbef012139bb5d8313 e2fsprogs-1.40.tar.gz 4160254 +SHA256 3a506f345e5da098c6c37239eb99e92d11a4100490245e102b13c446d1124296 e2fsprogs-1.40.tar.gz 4160254 |