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/
Date: Tue, 28 May 2019 12:38:04
Message-Id: 1559047074.e5dc429057d2210ca14206b2a027be1f71271498.polynomial-c@gentoo
1 commit: e5dc429057d2210ca14206b2a027be1f71271498
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 28 12:36:58 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue May 28 12:37:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5dc4290
7
8 sys-fs/e2fsprogs: Removed old.
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.13
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-fs/e2fsprogs/Manifest | 1 -
14 sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild | 141 ----------------------------
15 2 files changed, 142 deletions(-)
16
17 diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
18 index 55947dbe229..6b63f7c9eae 100644
19 --- a/sys-fs/e2fsprogs/Manifest
20 +++ b/sys-fs/e2fsprogs/Manifest
21 @@ -1,6 +1,5 @@
22 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
23 DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
24 DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf
25 -DIST e2fsprogs-1.45.0.tar.xz 5520532 BLAKE2B de7c27b90e68e822a8157e99d103933d98afe094765016a58dbdce4d5bebda86493c94dbf3bd009aa25063edf34a0c8229cbc1045f1041a357448619aee55de8 SHA512 208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014
26 DIST e2fsprogs-1.45.1.tar.xz 5507236 BLAKE2B d454f0228df2079edd3b7f8ad406417ee48cacb5b62fc1c869eff21b35dafc9bbc4ffd80e6040629a8da1edac230beb3981bc43eb12b6feecf4225a9b9f335e6 SHA512 2e8974d30e92d7f194ccad7f152b495d2a6e41328b1532351f13af27ceaef5ee01d52963e17801cc7317f7b5208791bd20c9028f15a9859225f0e64d175be779
27 DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
28
29 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild
30 deleted file mode 100644
31 index c87cb951ed5..00000000000
32 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild
33 +++ /dev/null
34 @@ -1,141 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI="6"
39 -
40 -inherit flag-o-matic systemd toolchain-funcs udev
41 -
42 -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
43 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
44 -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
45 - mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
46 - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
47 -
48 -LICENSE="GPL-2 BSD"
49 -SLOT="0"
50 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
51 -IUSE="fuse nls static-libs elibc_FreeBSD"
52 -
53 -RDEPEND="~sys-libs/${PN}-libs-${PV}
54 - >=sys-apps/util-linux-2.16
55 - fuse? ( sys-fs/fuse:0 )
56 - nls? ( virtual/libintl )"
57 -DEPEND="${RDEPEND}
58 - nls? ( sys-devel/gettext )
59 - virtual/pkgconfig
60 - sys-apps/texinfo"
61 -
62 -PATCHES=(
63 - "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
64 - "${FILESDIR}"/${PN}-1.40-fbsd.patch
65 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
66 -
67 - # Upstream patches (can usually removed with next version bump)
68 -)
69 -
70 -src_prepare() {
71 - if [[ ${CHOST} == *-mint* ]] ; then
72 - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
73 - fi
74 -
75 - default
76 -
77 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
78 -
79 - # Get rid of doc -- we don't use them. This also prevents a sandbox
80 - # violation due to mktexfmt invocation
81 - rm -r doc || die "Failed to remove doc dir"
82 -
83 - # blargh ... trick e2fsprogs into using e2fsprogs-libs
84 - sed -i -r \
85 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
86 - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
87 - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
88 - MCONFIG.in || die "muck libs" #122368
89 - sed -i -r \
90 - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
91 - Makefile.in || die "remove subdirs"
92 - ln -s $(which mk_cmds) lib/ss/ || die
93 -
94 - # Avoid rebuild
95 - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
96 -}
97 -
98 -src_configure() {
99 - # Keep the package from doing silly things #261411
100 - export VARTEXFONTS="${T}/fonts"
101 -
102 - # needs open64() prototypes and friends
103 - append-cppflags -D_GNU_SOURCE
104 -
105 - local myeconfargs=(
106 - --with-root-prefix="${EPREFIX%/}/"
107 - --with-crond-dir="${EPREFIX%/}/etc/cron.d"
108 - --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
109 - --with-udev-rules-dir="${EPREFIX%/}$(get_udevdir)/rules.d"
110 - --enable-symlink-install
111 - --enable-elf-shlibs
112 - $(tc-has-tls || echo --disable-tls)
113 - --without-included-gettext
114 - $(use_enable fuse fuse2fs)
115 - $(use_enable nls)
116 - --disable-libblkid
117 - --disable-libuuid
118 - --disable-fsck
119 - --disable-uuidd
120 - )
121 - ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
122 -
123 - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
124 - eerror "INTL sanity check failed, aborting build."
125 - eerror "Please post your ${S}/config.log file as an"
126 - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
127 - die "Preventing included intl cruft from building"
128 - fi
129 -}
130 -
131 -src_compile() {
132 - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
133 -
134 - # Build the FreeBSD helper
135 - if use elibc_FreeBSD ; then
136 - cp "${FILESDIR}"/fsck_ext2fs.c .
137 - emake V=1 fsck_ext2fs
138 - fi
139 -}
140 -
141 -src_install() {
142 - # need to set root_libdir= manually as any --libdir options in the
143 - # econf above (i.e. multilib) will screw up the default #276465
144 - emake \
145 - STRIP=: \
146 - root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
147 - DESTDIR="${D%/}" \
148 - install install-libs
149 -
150 - einstalldocs
151 -
152 - insinto /etc
153 - doins "${FILESDIR}"/e2fsck.conf
154 -
155 - # Move shared libraries to /lib/, install static libraries to
156 - # /usr/lib/, and install linker scripts to /usr/lib/.
157 - gen_usr_ldscript -a e2p ext2fs
158 -
159 - # configure doesn't have an option to disable static libs :/
160 - if ! use static-libs ; then
161 - find "${ED}" -name '*.a' -delete || die
162 - fi
163 -
164 - if use elibc_FreeBSD ; then
165 - # Install helpers for us
166 - into /
167 - dosbin "${S}"/fsck_ext2fs
168 - doman "${FILESDIR}"/fsck_ext2fs.8
169 -
170 - # filefrag is linux only
171 - rm \
172 - "${ED%/}"/usr/sbin/filefrag \
173 - "${ED%/}"/usr/share/man/man8/filefrag.8 || die
174 - fi
175 -}