diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2019-05-28 14:36:27 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2019-05-28 14:37:53 +0200 |
commit | 13d18e1bacb8e4ac44574f0a9061d19fe946ec9d (patch) | |
tree | 433aefd7726cbb579af1b0456b14f7f19cccbeff /sys-fs/e2fsprogs | |
parent | sys-libs/e2fsprogs-libs: Bump to version 1.45.2 (diff) | |
download | gentoo-13d18e1bacb8e4ac44574f0a9061d19fe946ec9d.tar.gz gentoo-13d18e1bacb8e4ac44574f0a9061d19fe946ec9d.tar.bz2 gentoo-13d18e1bacb8e4ac44574f0a9061d19fe946ec9d.zip |
sys-fs/e2fsprogs: Bump to version 1.45.2
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-fs/e2fsprogs')
-rw-r--r-- | sys-fs/e2fsprogs/Manifest | 1 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild | 144 |
2 files changed, 145 insertions, 0 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index f5731d7097aa..55947dbe2294 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -3,3 +3,4 @@ DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024ed DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf DIST e2fsprogs-1.45.0.tar.xz 5520532 BLAKE2B de7c27b90e68e822a8157e99d103933d98afe094765016a58dbdce4d5bebda86493c94dbf3bd009aa25063edf34a0c8229cbc1045f1041a357448619aee55de8 SHA512 208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014 DIST e2fsprogs-1.45.1.tar.xz 5507236 BLAKE2B d454f0228df2079edd3b7f8ad406417ee48cacb5b62fc1c869eff21b35dafc9bbc4ffd80e6040629a8da1edac230beb3981bc43eb12b6feecf4225a9b9f335e6 SHA512 2e8974d30e92d7f194ccad7f152b495d2a6e41328b1532351f13af27ceaef5ee01d52963e17801cc7317f7b5208791bd20c9028f15a9859225f0e64d175be779 +DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild new file mode 100644 index 000000000000..c0ce32929e1b --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic systemd toolchain-funcs udev + +DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz + mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz + 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 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" +IUSE="cron fuse nls static-libs elibc_FreeBSD" + +RDEPEND="~sys-libs/${PN}-libs-${PV} + >=sys-apps/util-linux-2.16 + cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) + fuse? ( sys-fs/fuse:0 ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND=" + nls? ( sys-devel/gettext ) + virtual/pkgconfig + sys-apps/texinfo +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch + "${FILESDIR}"/${PN}-1.40-fbsd.patch + "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 + + # Upstream patches (can usually removed with next version bump) +) + +src_prepare() { + if [[ ${CHOST} == *-mint* ]] ; then + PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) + fi + + default + + cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" + + # Get rid of doc -- we don't use them. This also prevents a sandbox + # violation due to mktexfmt invocation + rm -r doc || die "Failed to remove doc dir" + + # blargh ... trick e2fsprogs into using e2fsprogs-libs + 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 <ss/ss_err.h>' > 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 + + local myeconfargs=( + --with-root-prefix="${EPREFIX}" + $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") + --with-systemd-unit-dir="$(systemd_get_systemunitdir)" + --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" + --enable-symlink-install + --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 + ) + ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" + + 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 + + einstalldocs + + 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 :/ + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi + + 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 +} |