diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-fs/e2fsprogs | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'sys-fs/e2fsprogs')
-rw-r--r-- | sys-fs/e2fsprogs/Manifest | 10 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild | 140 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild | 144 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild (renamed from sys-fs/e2fsprogs/e2fsprogs-1.45.3.ebuild) | 2 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch | 10 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch | 59 |
6 files changed, 3 insertions, 362 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index ad30fe48a366..83eef4ba8fbd 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,18 +1,12 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa17ddee65610332bcd3edbacad4fa501def1d224de39fd6a9979a35e63699b0a2d5e9a2242517122339b68edf6af SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146 -AUX e2fsprogs-1.41.8-makefile.patch 317 BLAKE2B 89f393fd0b09e853158707aa6ec7f803c8938138666459df6a2bbc1cc5e86ac107db67b40ffbd7b12694de8eb22863b6c910b6e192f42e07939c0206b248e627 SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 -AUX e2fsprogs-1.44.4-fix_make_install_for_subset.patch 2168 BLAKE2B 041a3ce097186d8cbad480157c2bcf686d83218cf90bf7dc419e6f709e1557955b26dfc18a30586644497364289f3266626efcb2e7765d8d53fd639ff0a9785a SHA512 f6fa19fbe5dc1ed9adae421bd371d4cad7f52b250eedad1c47883a00ac6aa7061530df3d5928d0f4cfbcd2af0d9c457c4ab1fa460c9e43df323d1db052934724 AUX e2fsprogs-1.44.6-parallel_install.patch 317 BLAKE2B a57666bebbbfdd9933112b027eb48aef6702514c835b0e5ce493957c6db7d6dd5570734a28415f27a874e54429e169e79b6895d4cfb69de1fb91fb2000f0245d SHA512 4b6b51d93cd2c84facd88174312522443822232f8f2259492dcb0e9d52b27d6a5bb6c2b874f50de53b0c127dd3df3cb86610e7f3615986851d8f743922e8dce0 AUX fsck_ext2fs.8 3802 BLAKE2B 379ef7974e29c654e4a69caa64c3703eecf375d63557915bdbfe23c8c0ca67cc9a13792988ba8c0b18bb4ae0819d220102f034499200fd20951e004d34273311 SHA512 639af16c7881bdfca55a9cd39623d3eeb9ae0ca93f8e65321c69ab1b2591cb17cdd0cfc21d27c20b8cc65bd295cccf23e47f740fffb91f4cf17e32959bb166d0 AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa0722a0a3163885561bf06f0fdb73b4cf8c9cfc5bd0dc0c6ee0a7fb340a2416ce34555eff22f71a4 SHA512 1cac2963c0e85dd6a111bfe2a00f2b4f65c17a05bf0039cec073d4109ad4b0efee8905cff1a25098e0693f367db300054d92598a85dfbe8e5db7ff6419534af6 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc -DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e -DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e -DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94f93d2e921472c34da7913cdb2d60f998fa154c98f6ba4f9e598de152006a0fdb63a9006bbf3bb1847166d9342a29f SHA512 9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52 DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda -EBUILD e2fsprogs-1.44.5.ebuild 3929 BLAKE2B 31e29eb9610406b1dc0c10e43be042976371be51ed6d17e28a09fdd6bc0fce2edf1c26abb931a891302e0dfc48aff681cd3eca31b5dfaa6dd54f001642f9ec5d SHA512 579423805a574f91fa6a3444e93fb23ca03914fceba3d27f33430472a2fb6b125f8b563227ccf9f4fa3ad0e658696350312f235207f0ca4cb69f59c497cccad7 -EBUILD e2fsprogs-1.45.2.ebuild 4095 BLAKE2B 6d34711ed7b09788c37ca2e3f7f9ba19a38277cfdbab4133e213eb3a7823c0f64c8aa5c233c69ee7581521cf650f13b9d5642a6273d1649d58090348d58dfb14 SHA512 b7bcab130d875d7302e3fea99687c47e06afc035e5c353495ebf8bfacbaf59723c6d546eca168ff1110f56f449e8a70067325f0e41d220a045eae4695acb6207 -EBUILD e2fsprogs-1.45.3.ebuild 4108 BLAKE2B 8f6aeb8fcac2bf80dc03baae754d68f3a0365bb9b9ffaf1db28971b73f87f77b551c7337545b7ae077ed17da3fa12cb635b7291d3ae71cebce6ca88aa918fecc SHA512 ba0c7c0a0ebfa2dab25bb4f5dda2834a7243c3d8a7d105bfcb41f7608da1b330578524c714fc476537ddfafccc042286d89b26e3d5d00f9e0a11f96ab09b20dd +DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce EBUILD e2fsprogs-1.45.4.ebuild 4095 BLAKE2B 6d34711ed7b09788c37ca2e3f7f9ba19a38277cfdbab4133e213eb3a7823c0f64c8aa5c233c69ee7581521cf650f13b9d5642a6273d1649d58090348d58dfb14 SHA512 b7bcab130d875d7302e3fea99687c47e06afc035e5c353495ebf8bfacbaf59723c6d546eca168ff1110f56f449e8a70067325f0e41d220a045eae4695acb6207 +EBUILD e2fsprogs-1.45.5.ebuild 4108 BLAKE2B 3ffbb1dd16e6656cb5a47646462f04a985e17487bbf8479e6738b56261079c0e85093c26e9dbdcd563d66885afae37f158dabdfa62d083e8408346cbd4fa2c3d SHA512 e934c694b55c5e31e0ecff662f6a46831771a9ed08ed01d8a0d616b42523183e1c6b922dc97d34b268270da68a51b55cd59d4e4e2128c4686fd98e1f8efed0a2 MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild deleted file mode 100644 index 62549675f713..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic multilib toolchain-funcs usr-ldscript - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz - https://www.kernel.org/pub/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 s390 sh sparc x86 ~amd64-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" - -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 - - eapply -R "${FILESDIR}"/${PN}-1.44.4-fix_make_install_for_subset.patch - - 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%/}/" - --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 -} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild deleted file mode 100644 index 901d0170ae23..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# 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 usr-ldscript - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz - https://www.kernel.org/pub/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 ~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 -} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild index 5d69f41bdf97..c89dd215ca89 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.3.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch deleted file mode 100644 index b7d3d96856b5..000000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch deleted file mode 100644 index 222366f6c015..000000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ed07fd93056a2d2c03affe3255d3d5747deaab21 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Wed, 22 Aug 2018 13:42:23 -0400 -Subject: Fix "make install" for configure --enable-subset - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> ---- - Makefile.in | 24 ++++++++++++++---------- - 1 file changed, 14 insertions(+), 10 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 745e8590..80ab2994 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -42,7 +42,7 @@ subs: $(DEP_SUBSTITUTE) - - progs: all-progs-recursive - libs: all-libs-recursive --all-progs-recursive all-libs-recursive: subs -+all-progs-recursive all-libs-recursive:: subs - - rpm: - sh contrib/build-rpm -@@ -91,19 +91,23 @@ TAGS clean-recursive distclean-recursive depend-recursive fullcheck-recursive \ - done - - all-progs-recursive install-progs-recursive install-strip-progs-recursive \ -- uninstall-progs-recursive coverage.txt-progs-recursive: all-libs-recursive -- @for subdir in $(PROG_SUBDIRS); do \ -- if test -d $$subdir ; then \ -- target=`echo $@|$(SED) 's/-progs-recursive//'`; \ -- echo making $$target in $$subdir; \ -- (cd $$subdir && $(MAKE) $$target) || exit 1; \ -- fi ; \ -- done -+ uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive -+ -+ -+@ALL_CMT@all-progs-recursive install-progs-recursive install-strip-progs-recursive \ -+@ALL_CMT@ uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive -+@ALL_CMT@ @for subdir in $(PROG_SUBDIRS); do \ -+@ALL_CMT@ if test -d $$subdir ; then \ -+@ALL_CMT@ target=`echo $@|$(SED) 's/-progs-recursive//'`; \ -+@ALL_CMT@ echo making $$target in $$subdir; \ -+@ALL_CMT@ (cd $$subdir && $(MAKE) $$target) || exit 1; \ -+@ALL_CMT@ fi ; \ -+@ALL_CMT@ done - - all-libs-recursive install-libs-recursive install-strip-libs-recursive \ - uninstall-libs-recursive install-shlibs-libs-recursive \ - install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive \ -- coverage.txt-libs-recursive: -+ coverage.txt-libs-recursive:: - @for subdir in $(LIB_SUBDIRS); do \ - if test -d $$subdir ; then \ - target=`echo $@|$(SED) 's/-libs-recursive//'`; \ --- -cgit 1.2-0.3.lf.el7 - |