Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/
Date: Fri, 31 Dec 2021 17:50:16
Message-Id: 1640972990.772677495760059946931917020583157e273fb1.soap@gentoo
1 commit: 772677495760059946931917020583157e273fb1
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 31 17:49:50 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 31 17:49:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77267749
7
8 sys-fs/e2fsprogs: drop 1.46.4-r51
9
10 Closes: https://github.com/gentoo/gentoo/pull/23594
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild | 191 ---------------------------
14 1 file changed, 191 deletions(-)
15
16 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
17 deleted file mode 100644
18 index c5aa51404248..000000000000
19 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
20 +++ /dev/null
21 @@ -1,191 +0,0 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=7
26 -
27 -inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
28 -
29 -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
30 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
31 -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
32 - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
33 -
34 -LICENSE="GPL-2 BSD"
35 -SLOT="0"
36 -# Unkeyworded for testing unsplitting of e2fsprogs-libs, bug #806875
37 -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
38 -IUSE="cron fuse lto nls static-libs +threads +tools elibc_FreeBSD"
39 -
40 -RDEPEND="!sys-libs/com_err
41 - !sys-libs/ss
42 - !sys-libs/${PN}-libs
43 - cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
44 - fuse? ( sys-fs/fuse:0 )
45 - nls? ( virtual/libintl )
46 - tools? ( >=sys-apps/util-linux-2.16 )"
47 -DEPEND="${RDEPEND}"
48 -BDEPEND="virtual/pkgconfig
49 - sys-apps/texinfo
50 - nls? ( sys-devel/gettext )"
51 -
52 -PATCHES=(
53 - "${FILESDIR}"/${PN}-1.40-fbsd.patch
54 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
55 -
56 - # Upstream patches (can usually removed with next version bump)
57 -)
58 -
59 -pkg_setup() {
60 - if use tools ; then
61 - MULTILIB_WRAPPED_HEADERS=(
62 - /usr/include/ext2fs/ext2_types.h
63 - )
64 - fi
65 -}
66 -
67 -src_prepare() {
68 - if [[ ${CHOST} == *-mint* ]] ; then
69 - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
70 - fi
71 -
72 - default
73 -
74 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
75 -
76 - # Get rid of doc -- we don't use them. This also prevents a sandbox
77 - # violation due to mktexfmt invocation
78 - rm -r doc || die "Failed to remove doc dir"
79 -
80 - # prevent included intl cruft from building #81096
81 - sed -i -r \
82 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
83 - MCONFIG.in || die 'intl cruft'
84 -}
85 -
86 -multilib_src_configure() {
87 - # Keep the package from doing silly things #261411
88 - export VARTEXFONTS="${T}/fonts"
89 -
90 - # needs open64() prototypes and friends
91 - append-cppflags -D_GNU_SOURCE
92 -
93 - local myeconfargs=(
94 - --with-root-prefix="${EPREFIX}"
95 - $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
96 - --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
97 - --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
98 - --enable-symlink-install
99 - --enable-elf-shlibs
100 - $(tc-has-tls || echo --disable-tls)
101 - $(multilib_native_use_enable fuse fuse2fs)
102 - $(use_enable nls)
103 - $(multilib_native_use_enable tools e2initrd-helper)
104 - --disable-fsck
105 - --disable-uuidd
106 - $(use_enable lto)
107 - $(use_with threads pthread)
108 - )
109 -
110 - # we use blkid/uuid from util-linux now
111 - if use kernel_linux ; then
112 - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
113 - myeconfargs+=( --disable-lib{blkid,uuid} )
114 - fi
115 -
116 - ac_cv_path_LDCONFIG=: \
117 - ECONF_SOURCE="${S}" \
118 - CC="$(tc-getCC)" \
119 - BUILD_CC="$(tc-getBUILD_CC)" \
120 - BUILD_LD="$(tc-getBUILD_LD)" \
121 - 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 -multilib_src_compile() {
132 - if ! multilib_is_native_abi || ! use tools ; then
133 - emake -C lib/et V=1
134 - emake -C lib/ss V=1
135 - if use tools ; then
136 - emake -C lib/ext2fs V=1
137 - emake -C lib/e2p V=1
138 - fi
139 - return 0
140 - fi
141 -
142 - emake V=1
143 -
144 - # Build the FreeBSD helper
145 - if use elibc_FreeBSD ; then
146 - cp "${FILESDIR}"/fsck_ext2fs.c . || die
147 - emake V=1 fsck_ext2fs
148 - fi
149 -}
150 -
151 -multilib_src_test() {
152 - if multilib_is_native_abi ; then
153 - emake V=1 check
154 - else
155 - # For non-native, there's no binaries to test. Just libraries.
156 - emake -C lib/et V=1 check
157 - emake -C lib/ss V=1 check
158 - fi
159 -}
160 -
161 -multilib_src_install() {
162 - if ! multilib_is_native_abi || ! use tools ; then
163 - emake -C lib/et V=1 DESTDIR="${D}" install
164 - emake -C lib/ss V=1 DESTDIR="${D}" install
165 -
166 - if use tools ; then
167 - emake -C lib/ext2fs V=1 DESTDIR="${D}" install
168 - emake -C lib/e2p V=1 DESTDIR="${D}" install
169 - fi
170 - else
171 - emake \
172 - STRIP=: \
173 - DESTDIR="${D}" \
174 - install
175 -
176 - # Move shared libraries to /lib/, install static libraries to
177 - # /usr/lib/, and install linker scripts to /usr/lib/.
178 - gen_usr_ldscript -a e2p ext2fs
179 -
180 - if use elibc_FreeBSD ; then
181 - # Install helpers for us
182 - into /
183 - dosbin "${S}"/fsck_ext2fs
184 - fi
185 - fi
186 -
187 - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
188 -
189 - # configure doesn't have an option to disable static libs :/
190 - if ! use static-libs ; then
191 - find "${ED}" -name '*.a' -delete || die
192 - fi
193 -}
194 -
195 -multilib_src_install_all() {
196 - einstalldocs
197 -
198 - if use tools ; then
199 - insinto /etc
200 - doins "${FILESDIR}"/e2fsck.conf
201 -
202 - if use elibc_FreeBSD ; then
203 - into /
204 - doman "${FILESDIR}"/fsck_ext2fs.8
205 -
206 - # filefrag is linux only
207 - rm \
208 - "${ED}"/usr/sbin/filefrag \
209 - "${ED}"/usr/share/man/man8/filefrag.8 || die
210 - fi
211 - fi
212 -}