diff options
| -rw-r--r-- | sys-fs/e2fsprogs/Manifest | 1 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.ebuild | 138 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch | 45 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch | 26 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.41.5-makefile.patch | 91 | ||||
| -rw-r--r-- | sys-libs/e2fsprogs-libs/Manifest | 1 | ||||
| -rw-r--r-- | sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild | 51 |
7 files changed, 0 insertions, 353 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 2b5778e950ee..260b00f58e63 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.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.tar.xz 5086756 SHA256 d027eec0282e169eb55229beefca258c425c9d96f65292e2c004012d5353cd38 SHA512 f5f2d9331ebbec6530c9f41ce9c2e2296454f76b125e61802a36b8fe1f0d0f71f036275d7ff2d29bb0555b9daa6be8ac925d38192eb5085d3427ff6003d4bb78 WHIRLPOOL 4bcf553285e8cb4b347e3edc22e0d3cac206be1aa50196be5356561aabed57568f2cb6ef56988dba5c305bf801723b2cd15fc2fc907ba2f0373a16ef19ff765e diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.ebuild deleted file mode 100644 index 6274c41fb7d2..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils flag-o-matic toolchain-funcs multilib - -DESCRIPTION="Standard EXT2/EXT3/EXT4 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 ~x86-fbsd" -IUSE="nls elibc_FreeBSD" - -RDEPEND="~sys-libs/${PN}-libs-${PV} - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig - sys-apps/texinfo" - -pkg_setup() { - if [[ ! -e ${ROOT}/etc/mtab ]] ; then - # add some crap to deal with missing /etc/mtab #217719 - ewarn "No /etc/mtab file, creating one temporarily" - echo "${PN} crap for src_test" > "${ROOT}"/etc/mtab - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 - epatch "${FILESDIR}"/${PN}-1.41.5-makefile.patch - epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch - epatch "${FILESDIR}"/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch #276352 - # blargh ... trick e2fsprogs into using e2fsprogs-libs - rm -rf doc - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - -e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ - -e '/^DEPLIB(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" - # stupid configure script clobbers CC for us - sed -i \ - -e '/if test -z "$CC" ; then CC=cc; fi/d' \ - configure || die "touching configure" - - # we want to build the blkid/findfs binaries, but not the libs - sed -i \ - -e '/BLKID_CMT=/s:BLKID_CMT:LIBBLKID_CMT:g' \ - configure || die "touching configure for blkid" - sed -i \ - -e '/BLKID_LIB_SUBDIR/s:@BLKID_CMT@:@LIBBLKID_CMT@:g' \ - Makefile.in || die "remove blkid subdir better" - append-cppflags -DCONFIG_BUILD_FINDFS #275923 - - # Avoid rebuild - touch lib/ss/ss_err.h -} - -src_compile() { - # Keep the package from doing silly things #261411 - export VARTEXFONTS=${T}/fonts - - # We want to use the "bsd" libraries while building on Darwin, but while - # building on other Gentoo/*BSD we prefer elf-naming scheme. - local libtype - case ${CHOST} in - *-darwin*) libtype=bsd;; - *) libtype=elf;; - esac - - ac_cv_path_LDCONFIG=: \ - econf \ - --with-root-prefix=/ \ - --enable-${libtype}-shlibs \ - --with-ldopts="${LDFLAGS}" \ - $(tc-has-tls || echo --disable-tls) \ - --without-included-gettext \ - $(use_enable nls) \ - $(use_enable userland_GNU fsck) \ - --disable-libblkid \ - --disable-libuuid \ - || 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 https://bugs.gentoo.org/show_bug.cgi?id=81096" - die "Preventing included intl cruft from building" - fi - emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die - - # Build the FreeBSD helper - if use elibc_FreeBSD ; then - cp "${FILESDIR}"/fsck_ext2fs.c . - emake fsck_ext2fs || die - fi -} - -pkg_preinst() { - if [[ -r ${ROOT}/etc/mtab ]] ; then - if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then - rm -f "${ROOT}"/etc/mtab - fi - 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="/$(get_libdir)" \ - DESTDIR="${D}" \ - install install-libs || die - dodoc README RELEASE-NOTES - - if use elibc_FreeBSD ; then - # Install helpers for us - into / - dosbin "${S}"/fsck_ext2fs || die - doman "${FILESDIR}"/fsck_ext2fs.8 - - # these manpages are already provided by FreeBSD libc - # and filefrag is linux only - rm -f \ - "${D}"/usr/sbin/filefrag \ - "${D}"/usr/share/man/man8/filefrag.8 \ - "${D}"/usr/bin/uuidgen \ - "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ - "${D}"/usr/share/man/man1/uuidgen.1 || die - fi -} diff --git a/sys-fs/e2fsprogs/files/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch b/sys-fs/e2fsprogs/files/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch deleted file mode 100644 index 979bf74a0ea8..000000000000 --- a/sys-fs/e2fsprogs/files/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/276352 - -From 3a4d9869d47c462c84688b0f8b15df5ab6f93381 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Thu, 2 Jul 2009 13:54:22 -0400 -Subject: [PATCH] resize2fs: Fix error message so the mountpoint is printed correctly - -The resize2fs program was freeing the mountpoint information too -early, so garbage was getting printed instead of the correct -information in an error message. - -Addresses-Debian-Bug: #535452 - -Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> ---- - resize/main.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/resize/main.c b/resize/main.c -index 9b03ba9..2dae161 100644 ---- a/resize/main.c -+++ b/resize/main.c -@@ -250,10 +250,8 @@ int main (int argc, char ** argv) - device_name); - exit(1); - } -- if (!(mount_flags & EXT2_MF_MOUNTED) || (mtpt[len-1] == 0)) { -- free(mtpt); -+ if (!(mount_flags & EXT2_MF_MOUNTED) || (mtpt[len-1] == 0)) - break; -- } - free(mtpt); - len = 2 * len; - } -@@ -453,6 +451,7 @@ int main (int argc, char ** argv) - ((flags & RESIZE_PERCENT_COMPLETE) ? - resize_progress_func : 0)); - } -+ free(mtpt); - if (retval) { - com_err(program_name, retval, _("while trying to resize %s"), - device_name); --- -1.6.3.3 - diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch deleted file mode 100644 index 6c316ac2a38b..000000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch +++ /dev/null @@ -1,26 +0,0 @@ -Since the tests analyze the output messages, force the default locale. - -http://bugs.gentoo.org/99766 - ---- tests/test_script.in -+++ tests/test_script.in -@@ -3,6 +3,19 @@ - # Test script for e2fsck - # - -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ unset $as_var -+ fi -+done -+ - if test "$1"x = x ; then - TESTS=`ls -d $SRCDIR/[a-zA-Z]_* | $EGREP -v "\.failed|\.new"` - else diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.5-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.5-makefile.patch deleted file mode 100644 index 010a09aafabe..000000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.5-makefile.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- e2fsprogs-1.41.5/e2fsck/Makefile.in -+++ e2fsprogs-1.41.5/e2fsck/Makefile.in -@@ -195,12 +195,12 @@ - @echo " LINK $(root_sbindir)/fsck.ext2" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ -+ @$(LN_S) -f e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext2 - @echo " LINK $(root_sbindir)/fsck.ext3" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ -+ @$(LN_S) -f e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext3 - @echo " LINK $(root_sbindir)/fsck.ext4" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ -+ @$(LN_S) -f e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext4 - @echo " LINK $(root_sbindir)/fsck.ext4dev" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ -+ @$(LN_S) -f e2fsck \ - $(DESTDIR)$(root_sbindir)/fsck.ext4dev -@@ -221,12 +221,12 @@ - @echo " LINK $(man8dir)/fsck.ext2.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ -+ @$(LN_S) -f e2fsck.8 \ - $(DESTDIR)$(man8dir)/fsck.ext2.8 - @echo " LINK $(man8dir)/fsck.ext3.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ -+ @$(LN_S) -f e2fsck.8 \ - $(DESTDIR)$(man8dir)/fsck.ext3.8 - @echo " LINK $(man8dir)/fsck.ext4.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ -+ @$(LN_S) -f e2fsck.8 \ - $(DESTDIR)$(man8dir)/fsck.ext4.8 - @echo " LINK $(man8dir)/fsck.ext4.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ -+ @$(LN_S) -f e2fsck.8 \ - $(DESTDIR)$(man8dir)/fsck.ext4dev.8 ---- e2fsprogs-1.41.5/misc/Makefile.in -+++ e2fsprogs-1.41.5/misc/Makefile.in -@@ -394,19 +394,19 @@ - @echo " LINK $(root_sbindir)/mkfs.ext2" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ -+ @$(LN_S) -f mke2fs \ - $(DESTDIR)$(root_sbindir)/mkfs.ext2 - @echo " LINK $(root_sbindir)/mkfs.ext3" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ -+ @$(LN_S) -f mke2fs \ - $(DESTDIR)$(root_sbindir)/mkfs.ext3 - @echo " LINK $(root_sbindir)/mkfs.ext4" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ -+ @$(LN_S) -f mke2fs \ - $(DESTDIR)$(root_sbindir)/mkfs.ext4 - @echo " LINK $(root_sbindir)/mkfs.ext4dev" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ -+ @$(LN_S) -f mke2fs \ - $(DESTDIR)$(root_sbindir)/mkfs.ext4dev - @echo " LINK $(root_sbindir)/e2label" -- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ -+ @$(LN_S) -f tune2fs \ - $(DESTDIR)$(root_sbindir)/e2label - @if test -n "$(FINDFS_LINK)"; then \ - echo " LINK $(root_sbindir)/findfs"; \ -- $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ -+ $(LN_S) -f tune2fs \ - $(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \ -@@ -431,12 +431,12 @@ - @echo " LINK mkfs.ext2.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ -+ @$(LN_S) -f mke2fs.8 \ - $(DESTDIR)$(man8dir)/mkfs.ext2.8 - @echo " LINK mkfs.ext3.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ -+ @$(LN_S) -f mke2fs.8 \ - $(DESTDIR)$(man8dir)/mkfs.ext3.8 - @echo " LINK mkfs.ext4.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ -+ @$(LN_S) -f mke2fs.8 \ - $(DESTDIR)$(man8dir)/mkfs.ext4.8 - @echo " LINK mkfs.ext4dev.8" -- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ -+ @$(LN_S) -f mke2fs.8 \ - $(DESTDIR)$(man8dir)/mkfs.ext4dev.8 ---- e2fsprogs-1.41.5/Makefile.in -+++ e2fsprogs-1.41.5/Makefile.in -@@ -281,6 +66,7 @@ - uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs - - install-libs: install-libs-recursive -+install-libs-recursive: | install-shlibs-libs-recursive - - uninstall-libs: uninstall-libs-recursive - diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest index c475d65a5437..72835dc7caf2 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.13.tar.gz 605222 SHA256 79ad28c14ffd12083d8c4efea04cff7d175faf070de03d29bc580b5f1b669a14 SHA512 803ec87f9b3926c1f423cac424dc7fe2bfbaa3237a93023fe0213b88e35b933090299304be1c47d876d9d14487acadea3e8b9a926dab24733dbe6ee3f1d846e0 WHIRLPOOL 0adb43e1dd0ea476729dfd455430d1b803e96985c6a190ec518e57f628da6c9a85e2389f877026492f3b757db2d470a175e54db9d608ec586536854e21c7462f DIST e2fsprogs-libs-1.43.tar.xz 394012 SHA256 130f1b9f35138eb6ac1fe2cbe291345fa3c1f270c2dbb209dcd7cfcc7773797b SHA512 b3fcae815d144760b209a274262c70a22902ebf664642330af47f39cbec8ea98645ac91a58efeb075eb08cb831911948e5a67f26510a3c2375415058cc48d0ee WHIRLPOOL c39f95b51ce39824cecdd2fa12ca3548ebfb8542153b0fdfee5be5e9df2364adf899e47a32afb806fb3d164d700ba218e7f23f96322e800fc58d312c32b3b77a diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild deleted file mode 100644 index 9a355c2daa32..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit flag-o-matic toolchain-funcs multilib - -DESCRIPTION="e2fsprogs libraries (common error, subsystem, uuid, block id)" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${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" - -RDEPEND="!sys-libs/com_err - !sys-libs/ss - !<sys-fs/e2fsprogs-1.41" -DEPEND="nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -src_prepare() { - # stupid configure script clobbers CC for us - sed -i '/if test -z "$CC" ; then CC=cc; fi/d' configure -} - -src_configure() { - # We want to use the "bsd" libraries while building on Darwin, but while - # building on other Gentoo/*BSD we prefer elf-naming scheme. - local libtype - case ${CHOST} in - *-darwin*) libtype=bsd;; - *) libtype=elf;; - esac - - ac_cv_path_LDCONFIG=: \ - econf \ - --enable-${libtype}-shlibs \ - $(tc-has-tls || echo --disable-tls) \ - $(use_enable nls) -} - -src_install() { - emake STRIP=: DESTDIR="${D}" install || die - - set -- "${D}"/usr/$(get_libdir)/*.a - set -- ${@/*\/lib} - gen_usr_ldscript -a "${@/.a}" -} |