commit: 00a607f1f48e9591ce0555cb0bd45a50e5985773
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 23:54:32 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 00:44:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00a607f1
sys-libs/e2fsprogs-libs & sys-fs/e2fsprogs: drop old 1.42.12 versions
sys-fs/e2fsprogs/Manifest | 1 -
sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild | 126 ---------------------
...gs-1.42.10-e2fsck-fix-makefile-dependency.patch | 28 -----
.../files/e2fsprogs-1.42.10-fix-build-cflags.patch | 13 ---
sys-libs/e2fsprogs-libs/Manifest | 1 -
.../e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild | 70 ------------
.../e2fsprogs-libs-1.42.10-fix-build-cflags.patch | 13 ---
7 files changed, 252 deletions(-)
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ed319e2..80679d7 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,4 +1,3 @@
DIST e2fsprogs-1.41.7.tar.gz 4425159 SHA256
2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c SHA512
c17c5f23feb7747941e7f019f197cca1cd4a84c067ad27d1a578ae213c7d7274aa79f3a64c7d69515f3f94db80df01ca71d4af83e9ea84c578a7257205395f7c
WHIRLPOOL
f760d7e658a1c78835ca470d077c7076a21f727f7d0a2411f5428363d12b7cd1676e2f221be9d9d1f5843c25320f7ef2f896ea47c9d4dc91190e0bc7df89ef36
-DIST e2fsprogs-1.42.12.tar.gz 6381695 SHA256
e17846d91a0edd89fa59b064bde8f8e5cec5851e35f587bcccb4014dbd63186c SHA512
a4b03470ed8f3e6c353250d80807070b8d5529ce219f7ec3076af89bd7cd674fbd443aab4d07dccff74606c9f620e349da32b451e3896a0635f6c700419f7cbf
WHIRLPOOL
15f85fe969b174a99f06d875afafc83cc3e85cde0d8f1d833cb045c30259b3bfa9293ee84eeb793d9c60ece2cba4ca6bacbb8c861f11f3b56bd863ca1a2296f2
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
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild
b/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild
deleted file mode 100644
index bb428b3..0000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-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
- 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="nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
- >=sys-apps/util-linux-2.16
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
- sys-apps/texinfo"
-
-S=${WORKDIR}/${P%_pre*}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
- epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
- if [[ ${CHOST} == *-mint* ]] ; then
- epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch
- fi
- epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch #516854
-
- # 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 <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
-
- 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 nls) \
- --disable-libblkid \
- --disable-libuuid \
- --disable-quota \
- --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
-}
diff --git
a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch
b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch
deleted file mode 100644
index 0330847..0000000
---
a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5c15bf5f978bae01f1ca3cbe6414ab1d355a6adf Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <[email protected]>
-Date: Thu, 22 May 2014 18:52:27 -0400
-Subject: e2fsck: fix Makefile dependency for quota.o
-
-Signed-off-by: "Theodore Ts'o" <[email protected]>
-
-diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
-index 4b10f6f..f773fea 100644
---- a/e2fsck/Makefile.in
-+++ b/e2fsck/Makefile.in
-@@ -552,3 +552,13 @@ logfile.o: $(srcdir)/logfile.c
$(top_builddir)/lib/config.h \
- $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
- $(top_srcdir)/lib/../e2fsck/dict.h
- prof_err.o: prof_err.c
-+quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \
-+ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \
-+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
-+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
-+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
-+ $(top_builddir)/lib/ext2fs/ext2_err.h \
-+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-+ $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \
-+ $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
-+ $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/problem.h
---
-cgit v0.10.1
-
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch
b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch
deleted file mode 100644
index 69e6f35..0000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/516854
-
---- a/e2fsprogs-libs-1.42.10/configure
-+++ b/e2fsprogs-libs-1.42.10/configure
-@@ -1328,7 +1328,7 @@
- BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
- BUILD_LDFLAGS="$LDFLAGS"
- else
-- BUILD_CFLAGS=
-+ BUILD_CFLAGS="$INCLUDES"
- BUILD_LDFLAGS=
- fi
-
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index f289e0b..1fba44d 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,3 +1,2 @@
DIST e2fsprogs-libs-1.41.7.tar.gz 494463 SHA256
b6d9c9ec405ad1d644cf35d57f0f1e878fa6af6ad45b97683de847ff49cbdf84 SHA512
01bf6571efc3b63b985bb45190553cbf0e486ddcf022715a2bdf36eb3e45ffada603ed52bf17d6920b9dc3e98ffc6758d2481a83b68bbf5d946c76173f7d14a8
WHIRLPOOL
058fc1278ff2427d956728ad2d132652e80b60570c20c904c6d6e2a15c4a9d00ec13340ad56114f82dd703ee87cd576c2f69eb3d40f1f16743430476c3e383b1
-DIST e2fsprogs-libs-1.42.12.tar.gz 604947 SHA256
ca0a562b9b35f340d849f68977d1158ac9d92d9e77d97e2a85b8383e949dcd7b SHA512
2de9e828b5f123236505ae83cbfef906ca23f875dd15f5b7d8cbac9f59722e31c7304e5a92a326b42b71186ea5eb18550aac2986c45e70176047a5b1774b260a
WHIRLPOOL
177ef831b978ea5febce5b87c98216843463df5a292705f93129dd8609f6ada345b45910c85248f1f70685b073d95531c63512366e4e407158bf1467781c9f24
DIST e2fsprogs-libs-1.42.13.tar.gz 605222 SHA256
79ad28c14ffd12083d8c4efea04cff7d175faf070de03d29bc580b5f1b669a14 SHA512
803ec87f9b3926c1f423cac424dc7fe2bfbaa3237a93023fe0213b88e35b933090299304be1c47d876d9d14487acadea3e8b9a926dab24733dbe6ee3f1d846e0
WHIRLPOOL
0adb43e1dd0ea476729dfd455430d1b803e96985c6a190ec518e57f628da6c9a85e2389f877026492f3b757db2d470a175e54db9d608ec586536854e21c7462f
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild
b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild
deleted file mode 100644
index 1c268c2..0000000
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*) UP_PV=${PV} ;;
-esac
-
-inherit toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/";
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
~m68k-mint ~x86-solaris"
-IUSE="nls static-libs"
-
-RDEPEND="!sys-libs/com_err
- !sys-libs/ss
- !<sys-fs/e2fsprogs-1.41.8
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${P%_pre*}
-
-src_prepare() {
- printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs
#305613
- epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
- epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch #516854
-}
-
-multilib_src_configure() {
- local myconf=()
- # we use blkid/uuid from util-linux now
- if use kernel_linux ; then
- export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
- myconf+=( --disable-lib{blkid,uuid} )
- fi
- ac_cv_path_LDCONFIG=: \
- ECONF_SOURCE="${S}" \
- CC="$(tc-getCC)" \
- BUILD_CC="$(tc-getBUILD_CC)" \
- BUILD_LD="$(tc-getBUILD_LD)" \
- econf \
- --disable-quota \
- $(tc-is-static-only || echo --enable-elf-shlibs) \
- $(tc-has-tls || echo --disable-tls) \
- $(use_enable nls) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- emake V=1
-}
-
-multilib_src_install() {
- emake V=1 STRIP=: DESTDIR="${D}" install || die
- multilib_is_native_abi && gen_usr_ldscript -a com_err ss $(usex
kernel_linux '' 'uuid blkid')
- # configure doesn't have an option to disable static libs :/
- use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git
a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
deleted file mode 100644
index 69e6f35..0000000
---
a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/516854
-
---- a/e2fsprogs-libs-1.42.10/configure
-+++ b/e2fsprogs-libs-1.42.10/configure
-@@ -1328,7 +1328,7 @@
- BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
- BUILD_LDFLAGS="$LDFLAGS"
- else
-- BUILD_CFLAGS=
-+ BUILD_CFLAGS="$INCLUDES"
- BUILD_LDFLAGS=
- fi
-
