Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/, sys-fs/e2fsprogs/files/
Date: Tue, 07 Jan 2020 19:49:24
Message-Id: 1578426555.9a9f189ba107066df0293bdde6afba63bfe21a75.polynomial-c@gentoo
1 commit: 9a9f189ba107066df0293bdde6afba63bfe21a75
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 7 19:48:20 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 7 19:49:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9f189b
7
8 sys-fs/e2fsprogs: Removed old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-fs/e2fsprogs/Manifest | 3 -
14 sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild | 140 --------------------
15 sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild | 144 ---------------------
16 sys-fs/e2fsprogs/e2fsprogs-1.45.3.ebuild | 144 ---------------------
17 .../files/e2fsprogs-1.41.8-makefile.patch | 10 --
18 ...sprogs-1.44.4-fix_make_install_for_subset.patch | 59 ---------
19 6 files changed, 500 deletions(-)
20
21 diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
22 index 53560cae3a4..28e9bc63877 100644
23 --- a/sys-fs/e2fsprogs/Manifest
24 +++ b/sys-fs/e2fsprogs/Manifest
25 @@ -1,6 +1,3 @@
26 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
27 -DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
28 -DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
29 -DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94f93d2e921472c34da7913cdb2d60f998fa154c98f6ba4f9e598de152006a0fdb63a9006bbf3bb1847166d9342a29f SHA512 9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52
30 DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
31 DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
32
33 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
34 deleted file mode 100644
35 index 62549675f71..00000000000
36 --- a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
37 +++ /dev/null
38 @@ -1,140 +0,0 @@
39 -# Copyright 1999-2019 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI="6"
43 -
44 -inherit flag-o-matic multilib toolchain-funcs usr-ldscript
45 -
46 -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
47 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
48 -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
49 - https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
50 - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
51 -
52 -LICENSE="GPL-2 BSD"
53 -SLOT="0"
54 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
55 -IUSE="fuse nls static-libs elibc_FreeBSD"
56 -
57 -RDEPEND="~sys-libs/${PN}-libs-${PV}
58 - >=sys-apps/util-linux-2.16
59 - fuse? ( sys-fs/fuse:0 )
60 - nls? ( virtual/libintl )"
61 -DEPEND="${RDEPEND}
62 - nls? ( sys-devel/gettext )
63 - virtual/pkgconfig
64 - sys-apps/texinfo"
65 -
66 -PATCHES=(
67 - "${FILESDIR}"/${PN}-1.41.8-makefile.patch
68 - "${FILESDIR}"/${PN}-1.40-fbsd.patch
69 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
70 -
71 - # Upstream patches (can usually removed with next version bump)
72 -)
73 -
74 -src_prepare() {
75 - if [[ ${CHOST} == *-mint* ]] ; then
76 - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
77 - fi
78 -
79 - default
80 -
81 - eapply -R "${FILESDIR}"/${PN}-1.44.4-fix_make_install_for_subset.patch
82 -
83 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
84 -
85 - # Get rid of doc -- we don't use them. This also prevents a sandbox
86 - # violation due to mktexfmt invocation
87 - rm -r doc || die "Failed to remove doc dir"
88 -
89 - # blargh ... trick e2fsprogs into using e2fsprogs-libs
90 - sed -i -r \
91 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
92 - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
93 - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
94 - MCONFIG.in || die "muck libs" #122368
95 - sed -i -r \
96 - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
97 - Makefile.in || die "remove subdirs"
98 - ln -s $(which mk_cmds) lib/ss/ || die
99 -
100 - # Avoid rebuild
101 - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
102 -}
103 -
104 -src_configure() {
105 - # Keep the package from doing silly things #261411
106 - export VARTEXFONTS="${T}/fonts"
107 -
108 - # needs open64() prototypes and friends
109 - append-cppflags -D_GNU_SOURCE
110 -
111 - local myeconfargs=(
112 - --with-root-prefix="${EPREFIX%/}/"
113 - --enable-symlink-install
114 - --enable-elf-shlibs
115 - $(tc-has-tls || echo --disable-tls)
116 - --without-included-gettext
117 - $(use_enable fuse fuse2fs)
118 - $(use_enable nls)
119 - --disable-libblkid
120 - --disable-libuuid
121 - --disable-fsck
122 - --disable-uuidd
123 - )
124 - ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
125 -
126 - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
127 - eerror "INTL sanity check failed, aborting build."
128 - eerror "Please post your ${S}/config.log file as an"
129 - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
130 - die "Preventing included intl cruft from building"
131 - fi
132 -}
133 -
134 -src_compile() {
135 - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
136 -
137 - # Build the FreeBSD helper
138 - if use elibc_FreeBSD ; then
139 - cp "${FILESDIR}"/fsck_ext2fs.c .
140 - emake V=1 fsck_ext2fs
141 - fi
142 -}
143 -
144 -src_install() {
145 - # need to set root_libdir= manually as any --libdir options in the
146 - # econf above (i.e. multilib) will screw up the default #276465
147 - emake \
148 - STRIP=: \
149 - root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
150 - DESTDIR="${D%/}" \
151 - install install-libs
152 -
153 - einstalldocs
154 -
155 - insinto /etc
156 - doins "${FILESDIR}"/e2fsck.conf
157 -
158 - # Move shared libraries to /lib/, install static libraries to
159 - # /usr/lib/, and install linker scripts to /usr/lib/.
160 - gen_usr_ldscript -a e2p ext2fs
161 -
162 - # configure doesn't have an option to disable static libs :/
163 - if ! use static-libs ; then
164 - find "${ED}" -name '*.a' -delete || die
165 - fi
166 -
167 - if use elibc_FreeBSD ; then
168 - # Install helpers for us
169 - into /
170 - dosbin "${S}"/fsck_ext2fs
171 - doman "${FILESDIR}"/fsck_ext2fs.8
172 -
173 - # filefrag is linux only
174 - rm \
175 - "${ED%/}"/usr/sbin/filefrag \
176 - "${ED%/}"/usr/share/man/man8/filefrag.8 || die
177 - fi
178 -}
179
180 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
181 deleted file mode 100644
182 index 901d0170ae2..00000000000
183 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
184 +++ /dev/null
185 @@ -1,144 +0,0 @@
186 -# Copyright 1999-2019 Gentoo Authors
187 -# Distributed under the terms of the GNU General Public License v2
188 -
189 -EAPI=7
190 -
191 -inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
192 -
193 -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
194 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
195 -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
196 - https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
197 - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
198 -
199 -LICENSE="GPL-2 BSD"
200 -SLOT="0"
201 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
202 -IUSE="cron fuse nls static-libs elibc_FreeBSD"
203 -
204 -RDEPEND="~sys-libs/${PN}-libs-${PV}
205 - >=sys-apps/util-linux-2.16
206 - cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
207 - fuse? ( sys-fs/fuse:0 )
208 - nls? ( virtual/libintl )"
209 -DEPEND="${RDEPEND}"
210 -BDEPEND="
211 - nls? ( sys-devel/gettext )
212 - virtual/pkgconfig
213 - sys-apps/texinfo
214 -"
215 -
216 -PATCHES=(
217 - "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
218 - "${FILESDIR}"/${PN}-1.40-fbsd.patch
219 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
220 -
221 - # Upstream patches (can usually removed with next version bump)
222 -)
223 -
224 -src_prepare() {
225 - if [[ ${CHOST} == *-mint* ]] ; then
226 - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
227 - fi
228 -
229 - default
230 -
231 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
232 -
233 - # Get rid of doc -- we don't use them. This also prevents a sandbox
234 - # violation due to mktexfmt invocation
235 - rm -r doc || die "Failed to remove doc dir"
236 -
237 - # blargh ... trick e2fsprogs into using e2fsprogs-libs
238 - sed -i -r \
239 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
240 - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
241 - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
242 - MCONFIG.in || die "muck libs" #122368
243 - sed -i -r \
244 - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
245 - Makefile.in || die "remove subdirs"
246 - ln -s $(which mk_cmds) lib/ss/ || die
247 -
248 - # Avoid rebuild
249 - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
250 -}
251 -
252 -src_configure() {
253 - # Keep the package from doing silly things #261411
254 - export VARTEXFONTS="${T}/fonts"
255 -
256 - # needs open64() prototypes and friends
257 - append-cppflags -D_GNU_SOURCE
258 -
259 - local myeconfargs=(
260 - --with-root-prefix="${EPREFIX}"
261 - $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
262 - --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
263 - --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
264 - --enable-symlink-install
265 - --enable-elf-shlibs
266 - $(tc-has-tls || echo --disable-tls)
267 - --without-included-gettext
268 - $(use_enable fuse fuse2fs)
269 - $(use_enable nls)
270 - --disable-libblkid
271 - --disable-libuuid
272 - --disable-fsck
273 - --disable-uuidd
274 - )
275 - ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
276 -
277 - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
278 - eerror "INTL sanity check failed, aborting build."
279 - eerror "Please post your ${S}/config.log file as an"
280 - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
281 - die "Preventing included intl cruft from building"
282 - fi
283 -}
284 -
285 -src_compile() {
286 - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
287 -
288 - # Build the FreeBSD helper
289 - if use elibc_FreeBSD ; then
290 - cp "${FILESDIR}"/fsck_ext2fs.c .
291 - emake V=1 fsck_ext2fs
292 - fi
293 -}
294 -
295 -src_install() {
296 - # need to set root_libdir= manually as any --libdir options in the
297 - # econf above (i.e. multilib) will screw up the default #276465
298 - emake \
299 - STRIP=: \
300 - root_libdir="${EPREFIX}/usr/$(get_libdir)" \
301 - DESTDIR="${D}" \
302 - install install-libs
303 -
304 - einstalldocs
305 -
306 - insinto /etc
307 - doins "${FILESDIR}"/e2fsck.conf
308 -
309 - # Move shared libraries to /lib/, install static libraries to
310 - # /usr/lib/, and install linker scripts to /usr/lib/.
311 - gen_usr_ldscript -a e2p ext2fs
312 -
313 - # configure doesn't have an option to disable static libs :/
314 - if ! use static-libs ; then
315 - find "${ED}" -name '*.a' -delete || die
316 - fi
317 -
318 - if use elibc_FreeBSD ; then
319 - # Install helpers for us
320 - into /
321 - dosbin "${S}"/fsck_ext2fs
322 - doman "${FILESDIR}"/fsck_ext2fs.8
323 -
324 - # filefrag is linux only
325 - rm \
326 - "${ED}"/usr/sbin/filefrag \
327 - "${ED}"/usr/share/man/man8/filefrag.8 || die
328 - fi
329 -}
330
331 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.3.ebuild
332 deleted file mode 100644
333 index 5d69f41bdf9..00000000000
334 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.3.ebuild
335 +++ /dev/null
336 @@ -1,144 +0,0 @@
337 -# Copyright 1999-2019 Gentoo Authors
338 -# Distributed under the terms of the GNU General Public License v2
339 -
340 -EAPI=7
341 -
342 -inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
343 -
344 -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
345 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
346 -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
347 - https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
348 - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
349 -
350 -LICENSE="GPL-2 BSD"
351 -SLOT="0"
352 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
353 -IUSE="cron fuse nls static-libs elibc_FreeBSD"
354 -
355 -RDEPEND="~sys-libs/${PN}-libs-${PV}
356 - >=sys-apps/util-linux-2.16
357 - cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
358 - fuse? ( sys-fs/fuse:0 )
359 - nls? ( virtual/libintl )"
360 -DEPEND="${RDEPEND}"
361 -BDEPEND="
362 - nls? ( sys-devel/gettext )
363 - virtual/pkgconfig
364 - sys-apps/texinfo
365 -"
366 -
367 -PATCHES=(
368 - "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
369 - "${FILESDIR}"/${PN}-1.40-fbsd.patch
370 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
371 -
372 - # Upstream patches (can usually removed with next version bump)
373 -)
374 -
375 -src_prepare() {
376 - if [[ ${CHOST} == *-mint* ]] ; then
377 - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
378 - fi
379 -
380 - default
381 -
382 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
383 -
384 - # Get rid of doc -- we don't use them. This also prevents a sandbox
385 - # violation due to mktexfmt invocation
386 - rm -r doc || die "Failed to remove doc dir"
387 -
388 - # blargh ... trick e2fsprogs into using e2fsprogs-libs
389 - sed -i -r \
390 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
391 - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
392 - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
393 - MCONFIG.in || die "muck libs" #122368
394 - sed -i -r \
395 - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
396 - Makefile.in || die "remove subdirs"
397 - ln -s $(which mk_cmds) lib/ss/ || die
398 -
399 - # Avoid rebuild
400 - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
401 -}
402 -
403 -src_configure() {
404 - # Keep the package from doing silly things #261411
405 - export VARTEXFONTS="${T}/fonts"
406 -
407 - # needs open64() prototypes and friends
408 - append-cppflags -D_GNU_SOURCE
409 -
410 - local myeconfargs=(
411 - --with-root-prefix="${EPREFIX}"
412 - $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
413 - --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
414 - --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
415 - --enable-symlink-install
416 - --enable-elf-shlibs
417 - $(tc-has-tls || echo --disable-tls)
418 - --without-included-gettext
419 - $(use_enable fuse fuse2fs)
420 - $(use_enable nls)
421 - --disable-libblkid
422 - --disable-libuuid
423 - --disable-fsck
424 - --disable-uuidd
425 - )
426 - ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
427 -
428 - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
429 - eerror "INTL sanity check failed, aborting build."
430 - eerror "Please post your ${S}/config.log file as an"
431 - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
432 - die "Preventing included intl cruft from building"
433 - fi
434 -}
435 -
436 -src_compile() {
437 - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
438 -
439 - # Build the FreeBSD helper
440 - if use elibc_FreeBSD ; then
441 - cp "${FILESDIR}"/fsck_ext2fs.c .
442 - emake V=1 fsck_ext2fs
443 - fi
444 -}
445 -
446 -src_install() {
447 - # need to set root_libdir= manually as any --libdir options in the
448 - # econf above (i.e. multilib) will screw up the default #276465
449 - emake \
450 - STRIP=: \
451 - root_libdir="${EPREFIX}/usr/$(get_libdir)" \
452 - DESTDIR="${D}" \
453 - install install-libs
454 -
455 - einstalldocs
456 -
457 - insinto /etc
458 - doins "${FILESDIR}"/e2fsck.conf
459 -
460 - # Move shared libraries to /lib/, install static libraries to
461 - # /usr/lib/, and install linker scripts to /usr/lib/.
462 - gen_usr_ldscript -a e2p ext2fs
463 -
464 - # configure doesn't have an option to disable static libs :/
465 - if ! use static-libs ; then
466 - find "${ED}" -name '*.a' -delete || die
467 - fi
468 -
469 - if use elibc_FreeBSD ; then
470 - # Install helpers for us
471 - into /
472 - dosbin "${S}"/fsck_ext2fs
473 - doman "${FILESDIR}"/fsck_ext2fs.8
474 -
475 - # filefrag is linux only
476 - rm \
477 - "${ED}"/usr/sbin/filefrag \
478 - "${ED}"/usr/share/man/man8/filefrag.8 || die
479 - fi
480 -}
481
482 diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch
483 deleted file mode 100644
484 index b7d3d96856b..00000000000
485 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch
486 +++ /dev/null
487 @@ -1,10 +0,0 @@
488 ---- e2fsprogs-1.41.5/Makefile.in
489 -+++ e2fsprogs-1.41.5/Makefile.in
490 -@@ -281,6 +66,7 @@
491 - uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
492 -
493 - install-libs: install-libs-recursive
494 -+install-libs-recursive: | install-shlibs-libs-recursive
495 -
496 - uninstall-libs: uninstall-libs-recursive
497 -
498
499 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
500 deleted file mode 100644
501 index 222366f6c01..00000000000
502 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch
503 +++ /dev/null
504 @@ -1,59 +0,0 @@
505 -From ed07fd93056a2d2c03affe3255d3d5747deaab21 Mon Sep 17 00:00:00 2001
506 -From: Theodore Ts'o <tytso@×××.edu>
507 -Date: Wed, 22 Aug 2018 13:42:23 -0400
508 -Subject: Fix "make install" for configure --enable-subset
509 -
510 -Signed-off-by: Theodore Ts'o <tytso@×××.edu>
511 ----
512 - Makefile.in | 24 ++++++++++++++----------
513 - 1 file changed, 14 insertions(+), 10 deletions(-)
514 -
515 -diff --git a/Makefile.in b/Makefile.in
516 -index 745e8590..80ab2994 100644
517 ---- a/Makefile.in
518 -+++ b/Makefile.in
519 -@@ -42,7 +42,7 @@ subs: $(DEP_SUBSTITUTE)
520 -
521 - progs: all-progs-recursive
522 - libs: all-libs-recursive
523 --all-progs-recursive all-libs-recursive: subs
524 -+all-progs-recursive all-libs-recursive:: subs
525 -
526 - rpm:
527 - sh contrib/build-rpm
528 -@@ -91,19 +91,23 @@ TAGS clean-recursive distclean-recursive depend-recursive fullcheck-recursive \
529 - done
530 -
531 - all-progs-recursive install-progs-recursive install-strip-progs-recursive \
532 -- uninstall-progs-recursive coverage.txt-progs-recursive: all-libs-recursive
533 -- @for subdir in $(PROG_SUBDIRS); do \
534 -- if test -d $$subdir ; then \
535 -- target=`echo $@|$(SED) 's/-progs-recursive//'`; \
536 -- echo making $$target in $$subdir; \
537 -- (cd $$subdir && $(MAKE) $$target) || exit 1; \
538 -- fi ; \
539 -- done
540 -+ uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
541 -+
542 -+
543 -+@ALL_CMT@all-progs-recursive install-progs-recursive install-strip-progs-recursive \
544 -+@ALL_CMT@ uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
545 -+@ALL_CMT@ @for subdir in $(PROG_SUBDIRS); do \
546 -+@ALL_CMT@ if test -d $$subdir ; then \
547 -+@ALL_CMT@ target=`echo $@|$(SED) 's/-progs-recursive//'`; \
548 -+@ALL_CMT@ echo making $$target in $$subdir; \
549 -+@ALL_CMT@ (cd $$subdir && $(MAKE) $$target) || exit 1; \
550 -+@ALL_CMT@ fi ; \
551 -+@ALL_CMT@ done
552 -
553 - all-libs-recursive install-libs-recursive install-strip-libs-recursive \
554 - uninstall-libs-recursive install-shlibs-libs-recursive \
555 - install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive \
556 -- coverage.txt-libs-recursive:
557 -+ coverage.txt-libs-recursive::
558 - @for subdir in $(LIB_SUBDIRS); do \
559 - if test -d $$subdir ; then \
560 - target=`echo $@|$(SED) 's/-libs-recursive//'`; \
561 ---
562 -cgit 1.2-0.3.lf.el7
563 -