From 76a23cc6c0817052df563ad301d98cbe16b75531 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 16 May 2018 10:52:29 +0200 Subject: sys-fs/e2fsprogs: Removed old. Package-Manager: Portage-2.3.36, Repoman-2.3.9 --- sys-fs/e2fsprogs/Manifest | 3 - sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild | 139 --------------------- sys-fs/e2fsprogs/e2fsprogs-1.44.0.ebuild | 137 -------------------- .../e2fsprogs/files/e2fsprogs-1.43-sysmacros.patch | 125 ------------------ 4 files changed, 404 deletions(-) delete mode 100644 sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild delete mode 100644 sys-fs/e2fsprogs/e2fsprogs-1.44.0.ebuild delete mode 100644 sys-fs/e2fsprogs/files/e2fsprogs-1.43-sysmacros.patch (limited to 'sys-fs') diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 0515c6bd677..a7db197d4bd 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,8 +1,5 @@ DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc -DIST e2fsprogs-1.43.3-missing_uninit_bg.patch 1317 BLAKE2B ec53c0aca102e137fce437f98f299b674b25110a7df38139c35fa4da6756992a0923c65bbcd39e4739c3d454b119c8b30681b7426b1c22853538f9d4d00d2a02 SHA512 bd80dd679245c4d26837fa5a0f7dc6a05560973d912a3fe8f5c3c8c352675496f21c9b775d37fb190a7fbb3fb61882b6d4d6a20b34918cda0bfe65e7d0cce8e8 -DIST e2fsprogs-1.43.3.tar.gz 7405892 BLAKE2B 158aeee327a1ca68ce1bda1f97c9fa25ba1bd78ea9ee418c8ad85d2bf422d49ea93ad6c1b33c9b7bdafceacb4c0975da776c6e5b2df8962baf0d368c894db5a8 SHA512 77e753f77222a0a7a334d7d93c900ea6cb339ed40af29952e414fc4e45d8c5c01d67771978a941195effe666df965746c2b31977c5f05ff307429b978dac8dea DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66 DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b -DIST e2fsprogs-1.44.0.tar.gz 7547084 BLAKE2B 32b16453931e33eb21cd42724c7dbe420c21ebdf1650f7eb9b8bc5a1016166e4fd244e97f7dd2c90c934f7244b9cae75bd9d177685b92a9430f29e3349f47b64 SHA512 a084973097bcc806d63b94c106fb22d840a53863c63016d7e0d68094b01679c6985a195e5f7983cfeb356e0a45636a52d6c444af30275c4c42c49c1d94663fed DIST e2fsprogs-1.44.1.tar.gz 7534979 BLAKE2B 1d1dcdfebca41d62bb15e0b0464bcfc848b8c1379f89987f91a59093d497536ccd5e80be67419cad05daf694be1629774f881d026ef834e3a61b00dc64f3543b SHA512 acd612a5146e4a07aa7ab3ef1b38c3ef3f27120f65c519dd02d44e48e5814c86d013315eb30c4f08edecaef6f08f0ec0b91fa133ea9dbd769ee29be3f2ae17c9 DIST e2fsprogs-1.44.2.tar.gz 7562398 BLAKE2B a828cb9f5f3ee1579a2c5b29ef0eaf0e5696e2bf27a639cf1bf27b8d334bbbd1d142588e53e359934338f2ec95d06343a42b7c2fbd44dd6e01b348958aae3189 SHA512 d416e14a69f3e2e4ea2f4563764c422cc63400bcd514ddb12ebda6456ef04cff523da215664ede1329183acc22246111016e1abd92ff604a23e015e066dd379a diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild deleted file mode 100644 index f53dee8757b..00000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 )" - -# Fix for bug #598100 -SRC_URI+=" http://git.kernel.org/cgit/fs/ext2/e2fsprogs.git/patch/?id=d33e690fe7a6cbeb51349d9f2c7fb16a6ebec9c2 -> ${PN}-1.43.3-missing_uninit_bg.patch" - -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:0 ) - 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 - - # Upstream patches (can usually removed with next version bump) - "${DISTDIR}"/${P}-missing_uninit_bg.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 -} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.0.ebuild deleted file mode 100644 index 76d036d2679..00000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.44.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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:0 ) - 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 - - # 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 - - # 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 - - local myeconfargs=( - --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 - ) - 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 - 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 :/ - if ! use static-libs ; then - find "${D}" -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 -} diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.43-sysmacros.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.43-sysmacros.patch deleted file mode 100644 index 2dbb40c1bd6..00000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.43-sysmacros.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 30ef41f68703b6a16027cc8787118b87f1462dff Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 28 Mar 2016 20:31:33 -0400 -Subject: [PATCH e2fsprogs] include sys/sysmacros.h as needed - -The minor/major/makedev macros are not entirely standard. glibc has had -the definitions in sys/sysmacros.h since the start, and wants to move away -from always defining them implicitly via sys/types.h (as this pollutes the -namespace in violation of POSIX). Other C libraries have already dropped -them. Since the configure script already checks for this header, use that -to pull in the header in files that use these macros. - -Signed-off-by: Mike Frysinger ---- - debugfs/debugfs.c | 3 +++ - lib/blkid/devname.c | 3 +++ - lib/blkid/devno.c | 3 +++ - lib/ext2fs/finddev.c | 3 +++ - lib/ext2fs/ismounted.c | 3 +++ - misc/create_inode.c | 4 ++++ - misc/mk_hugefiles.c | 3 +++ - 7 files changed, 22 insertions(+) - -diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c -index ba8be40..7d481bc 100644 ---- a/debugfs/debugfs.c -+++ b/debugfs/debugfs.c -@@ -26,6 +26,9 @@ extern char *optarg; - #include - #endif - #include -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - - #include "debugfs.h" - #include "uuid/uuid.h" -diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c -index 3e2efa9..671e781 100644 ---- a/lib/blkid/devname.c -+++ b/lib/blkid/devname.c -@@ -36,6 +36,9 @@ - #if HAVE_SYS_MKDEV_H - #include - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - #include - - #include "blkidP.h" -diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c -index 479d977..61e6fc7 100644 ---- a/lib/blkid/devno.c -+++ b/lib/blkid/devno.c -@@ -31,6 +31,9 @@ - #if HAVE_SYS_MKDEV_H - #include - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - - #include "blkidP.h" - -diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c -index 311608d..62fa0db 100644 ---- a/lib/ext2fs/finddev.c -+++ b/lib/ext2fs/finddev.c -@@ -31,6 +31,9 @@ - #if HAVE_SYS_MKDEV_H - #include - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - - #include "ext2_fs.h" - #include "ext2fs.h" -diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c -index e0f69dd..7404996 100644 ---- a/lib/ext2fs/ismounted.c -+++ b/lib/ext2fs/ismounted.c -@@ -49,6 +49,9 @@ - #if HAVE_SYS_TYPES_H - #include - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - - #include "ext2_fs.h" - #include "ext2fs.h" -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 4dbd8e5..98aeb41 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -22,6 +22,10 @@ - #include - #endif - #include -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif -+ - #include - #include - #include -diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c -index 71a15c5..00e95cd 100644 ---- a/misc/mk_hugefiles.c -+++ b/misc/mk_hugefiles.c -@@ -35,6 +35,9 @@ extern int optind; - #include - #include - #include -+#ifdef HAVE_SYS_SYSMACROS_H -+#include -+#endif - #include - #include - #include --- -2.8.2 - -- cgit v1.2.1