From 42c4ea829970554a3d015568756837de5a275d13 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 2 Sep 2016 09:58:16 +0200 Subject: sys-fs/e2fsprogs: Bump to version 1.43.2 Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler --- sys-fs/e2fsprogs/Manifest | 1 + sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild | 134 +++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 409df31469b0..cdf05480bc9f 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,4 +1,5 @@ DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4 SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0 WHIRLPOOL 2b26e355ad8e378cc7402be5fd5f5abe0af2aa6a1214b357dca682b922aa07c97af427b369ef21ddb3ee731768234a5f5faf488b92a68b0175d07845dbe7783f DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7 DIST e2fsprogs-1.43.1.tar.xz 5078696 SHA256 97e36a029224e2606baa6e9ea693b04a4d192ccd714572a1b50a2df9c687b23d SHA512 5bc9c8f992519acaadf44925357ddb03569801e65d889de4bb40a85b61a8d78c9d97bd33fb9c099d3dac8039e837f7c525a84053e17b6c9b296948a39f6f60fd WHIRLPOOL 034d393487fbadabf6e8a75a7a647bfc55f1c762143f2add7e90cd41954350f2f02cf0d6e90ae6ed5034de266420d63e41f713f3b27eac5e9f2a0545b5509e7d +DIST e2fsprogs-1.43.2.tar.gz 7389995 SHA256 20085fd43d52b8f81bda259a7df5c2b1a7a745b6fd3d082a2915965dd77f5365 SHA512 4a008f2200024685df37d5fb5c01097ca005d335c7bb2b0c6b2f13db71d9046da7dbbd367ef25800e0e16312bbfdbab603d78ac675581bb39610234002756be4 WHIRLPOOL f6d193b14e1a6b8160d419e78f43981176b1ddcb8edc6d5a2daac12647565948006eb415b332be19b3e8c3e29ea7b4f8583dce1fa9002d9f0968327b2542432d DIST e2fsprogs-1.43.tar.xz 5086756 SHA256 d027eec0282e169eb55229beefca258c425c9d96f65292e2c004012d5353cd38 SHA512 f5f2d9331ebbec6530c9f41ce9c2e2296454f76b125e61802a36b8fe1f0d0f71f036275d7ff2d29bb0555b9daa6be8ac925d38192eb5085d3427ff6003d4bb78 WHIRLPOOL 4bcf553285e8cb4b347e3edc22e0d3cac206be1aa50196be5356561aabed57568f2cb6ef56988dba5c305bf801723b2cd15fc2fc907ba2f0373a16ef19ff765e diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild new file mode 100644 index 000000000000..0db67024344b --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +case ${PV} in +*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; +*) UP_PV=${PV} ;; +esac + +inherit eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz + mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz + elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" +IUSE="fuse nls static-libs elibc_FreeBSD" + +RDEPEND="~sys-libs/${PN}-libs-${PV} + >=sys-apps/util-linux-2.16 + fuse? ( sys-fs/fuse ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig + sys-apps/texinfo" + +S=${WORKDIR}/${P%_pre*} + +PATCHES=( + "${FILESDIR}"/${PN}-1.41.8-makefile.patch + "${FILESDIR}"/${PN}-1.40-fbsd.patch + "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 + "${FILESDIR}"/${PN}-1.43-sysmacros.patch +) + +src_prepare() { + if [[ ${CHOST} == *-mint* ]] ; then + PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) + fi + + epatch "${PATCHES[@]}" + + # blargh ... trick e2fsprogs into using e2fsprogs-libs + rm -rf doc + sed -i -r \ + -e 's:@LIBINTL@:@LTLIBINTL@:' \ + -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ + -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ + MCONFIG.in || die "muck libs" #122368 + sed -i -r \ + -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ + Makefile.in || die "remove subdirs" + ln -s $(which mk_cmds) lib/ss/ || die + + # Avoid rebuild + echo '#include_next ' > lib/ss/ss_err.h +} + +src_configure() { + # Keep the package from doing silly things #261411 + export VARTEXFONTS=${T}/fonts + + # needs open64() prototypes and friends + append-cppflags -D_GNU_SOURCE + + ac_cv_path_LDCONFIG=: \ + econf \ + --with-root-prefix="${EPREFIX}/" \ + --enable-symlink-install \ + $(tc-is-static-only || echo --enable-elf-shlibs) \ + $(tc-has-tls || echo --disable-tls) \ + --without-included-gettext \ + $(use_enable fuse fuse2fs) \ + $(use_enable nls) \ + --disable-libblkid \ + --disable-libuuid \ + --disable-fsck \ + --disable-uuidd + 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 https://bugs.gentoo.org/show_bug.cgi?id=81096" + die "Preventing included intl cruft from building" + fi +} + +src_compile() { + emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds + + # Build the FreeBSD helper + if use elibc_FreeBSD ; then + cp "${FILESDIR}"/fsck_ext2fs.c . + emake V=1 fsck_ext2fs + fi +} + +src_install() { + # need to set root_libdir= manually as any --libdir options in the + # econf above (i.e. multilib) will screw up the default #276465 + emake \ + STRIP=: \ + root_libdir="${EPREFIX}/usr/$(get_libdir)" \ + DESTDIR="${D}" \ + install install-libs + dodoc README RELEASE-NOTES + + insinto /etc + doins "${FILESDIR}"/e2fsck.conf + + # Move shared libraries to /lib/, install static libraries to + # /usr/lib/, and install linker scripts to /usr/lib/. + gen_usr_ldscript -a e2p ext2fs + # configure doesn't have an option to disable static libs :/ + use static-libs || find "${D}" -name '*.a' -delete + + if use elibc_FreeBSD ; then + # Install helpers for us + into / + dosbin "${S}"/fsck_ext2fs + doman "${FILESDIR}"/fsck_ext2fs.8 + + # filefrag is linux only + rm \ + "${ED}"/usr/sbin/filefrag \ + "${ED}"/usr/share/man/man8/filefrag.8 || die + fi +} -- cgit v1.2.3-65-gdbad