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: Wed, 06 Mar 2019 11:59:20
Message-Id: 1551873488.4ba2fd24ad2f8969d484649170ab599ca75f0c30.polynomial-c@gentoo
1 commit: 4ba2fd24ad2f8969d484649170ab599ca75f0c30
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 6 11:58:08 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 6 11:58:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba2fd24
7
8 sys-fs/e2fsprogs: Removed old.
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-fs/e2fsprogs/Manifest | 2 -
14 sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild | 135 ------------------------------
15 sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild | 138 -------------------------------
16 3 files changed, 275 deletions(-)
17
18 diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
19 index 3df408c4347..c7ea7502daa 100644
20 --- a/sys-fs/e2fsprogs/Manifest
21 +++ b/sys-fs/e2fsprogs/Manifest
22 @@ -1,6 +1,4 @@
23 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
24 -DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66
25 DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b
26 -DIST e2fsprogs-1.44.4.tar.xz 5363496 BLAKE2B 8c7216bd63dbba0660c7383d6ed068be0a7016b50235d22f855283bb57d3355a3ea5bfa47294b71b67fcc5d4af28219abeb9cf4a6429595a43680d3d787bdf1a SHA512 52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f
27 DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
28 DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf
29
30 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
31 deleted file mode 100644
32 index 92b21222d8c..00000000000
33 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
34 +++ /dev/null
35 @@ -1,135 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -case ${PV} in
42 -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
43 -*) UP_PV=${PV} ;;
44 -esac
45 -
46 -inherit eutils flag-o-matic multilib toolchain-funcs
47 -
48 -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
49 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
50 -SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
51 - mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
52 - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
53 -
54 -LICENSE="GPL-2 BSD"
55 -SLOT="0"
56 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
57 -IUSE="fuse nls static-libs elibc_FreeBSD"
58 -
59 -RDEPEND="~sys-libs/${PN}-libs-${PV}
60 - >=sys-apps/util-linux-2.16
61 - fuse? ( sys-fs/fuse:0 )
62 - nls? ( virtual/libintl )"
63 -DEPEND="${RDEPEND}
64 - nls? ( sys-devel/gettext )
65 - virtual/pkgconfig
66 - sys-apps/texinfo"
67 -
68 -S="${WORKDIR}/${P%_pre*}"
69 -
70 -PATCHES=(
71 - "${FILESDIR}"/${PN}-1.41.8-makefile.patch
72 - "${FILESDIR}"/${PN}-1.40-fbsd.patch
73 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
74 -
75 - # Upstream patches (can usually removed with next version bump)
76 -)
77 -
78 -src_prepare() {
79 - if [[ ${CHOST} == *-mint* ]] ; then
80 - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
81 - fi
82 -
83 - default
84 -
85 - # blargh ... trick e2fsprogs into using e2fsprogs-libs
86 - rm -rf doc
87 - sed -i -r \
88 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
89 - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
90 - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
91 - MCONFIG.in || die "muck libs" #122368
92 - sed -i -r \
93 - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
94 - Makefile.in || die "remove subdirs"
95 - ln -s $(which mk_cmds) lib/ss/ || die
96 -
97 - # Avoid rebuild
98 - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
99 -}
100 -
101 -src_configure() {
102 - # Keep the package from doing silly things #261411
103 - export VARTEXFONTS="${T}/fonts"
104 -
105 - # needs open64() prototypes and friends
106 - append-cppflags -D_GNU_SOURCE
107 -
108 - local myeconfargs=(
109 - --with-root-prefix="${EPREFIX}/"
110 - --enable-symlink-install
111 - $(tc-is-static-only || echo --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 - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
123 - eerror "INTL sanity check failed, aborting build."
124 - eerror "Please post your ${S}/config.log file as an"
125 - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
126 - die "Preventing included intl cruft from building"
127 - fi
128 -}
129 -
130 -src_compile() {
131 - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
132 -
133 - # Build the FreeBSD helper
134 - if use elibc_FreeBSD ; then
135 - cp "${FILESDIR}"/fsck_ext2fs.c .
136 - emake V=1 fsck_ext2fs
137 - fi
138 -}
139 -
140 -src_install() {
141 - # need to set root_libdir= manually as any --libdir options in the
142 - # econf above (i.e. multilib) will screw up the default #276465
143 - emake \
144 - STRIP=: \
145 - root_libdir="${EPREFIX}/usr/$(get_libdir)" \
146 - DESTDIR="${D}" \
147 - install install-libs
148 - dodoc README RELEASE-NOTES
149 -
150 - insinto /etc
151 - doins "${FILESDIR}"/e2fsck.conf
152 -
153 - # Move shared libraries to /lib/, install static libraries to
154 - # /usr/lib/, and install linker scripts to /usr/lib/.
155 - gen_usr_ldscript -a e2p ext2fs
156 - # configure doesn't have an option to disable static libs :/
157 - use static-libs || find "${D}" -name '*.a' -delete
158 -
159 - if use elibc_FreeBSD ; then
160 - # Install helpers for us
161 - into /
162 - dosbin "${S}"/fsck_ext2fs
163 - doman "${FILESDIR}"/fsck_ext2fs.8
164 -
165 - # filefrag is linux only
166 - rm \
167 - "${ED%/}"/usr/sbin/filefrag \
168 - "${ED%/}"/usr/share/man/man8/filefrag.8 || die
169 - fi
170 -}
171
172 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild
173 deleted file mode 100644
174 index 256963ab46d..00000000000
175 --- a/sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild
176 +++ /dev/null
177 @@ -1,138 +0,0 @@
178 -# Copyright 1999-2018 Gentoo Foundation
179 -# Distributed under the terms of the GNU General Public License v2
180 -
181 -EAPI="6"
182 -
183 -inherit flag-o-matic multilib toolchain-funcs
184 -
185 -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
186 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
187 -SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
188 - mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
189 - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
190 -
191 -LICENSE="GPL-2 BSD"
192 -SLOT="0"
193 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
194 -IUSE="fuse nls static-libs elibc_FreeBSD"
195 -
196 -RDEPEND="~sys-libs/${PN}-libs-${PV}
197 - >=sys-apps/util-linux-2.16
198 - fuse? ( sys-fs/fuse:0 )
199 - nls? ( virtual/libintl )"
200 -DEPEND="${RDEPEND}
201 - nls? ( sys-devel/gettext )
202 - virtual/pkgconfig
203 - sys-apps/texinfo"
204 -
205 -PATCHES=(
206 - "${FILESDIR}"/${PN}-1.41.8-makefile.patch
207 - "${FILESDIR}"/${PN}-1.40-fbsd.patch
208 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
209 -
210 - # Upstream patches (can usually removed with next version bump)
211 -)
212 -
213 -src_prepare() {
214 - if [[ ${CHOST} == *-mint* ]] ; then
215 - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
216 - fi
217 -
218 - default
219 -
220 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
221 -
222 - # Get rid of doc -- we don't use them. This also prevents a sandbox
223 - # violation due to mktexfmt invocation
224 - rm -r doc || die "Failed to remove doc dir"
225 -
226 - # blargh ... trick e2fsprogs into using e2fsprogs-libs
227 - sed -i -r \
228 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
229 - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
230 - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
231 - MCONFIG.in || die "muck libs" #122368
232 - sed -i -r \
233 - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
234 - Makefile.in || die "remove subdirs"
235 - ln -s $(which mk_cmds) lib/ss/ || die
236 -
237 - # Avoid rebuild
238 - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
239 -}
240 -
241 -src_configure() {
242 - # Keep the package from doing silly things #261411
243 - export VARTEXFONTS="${T}/fonts"
244 -
245 - # needs open64() prototypes and friends
246 - append-cppflags -D_GNU_SOURCE
247 -
248 - local myeconfargs=(
249 - --with-root-prefix="${EPREFIX%/}/"
250 - --enable-symlink-install
251 - --enable-elf-shlibs
252 - $(tc-has-tls || echo --disable-tls)
253 - --without-included-gettext
254 - $(use_enable fuse fuse2fs)
255 - $(use_enable nls)
256 - --disable-libblkid
257 - --disable-libuuid
258 - --disable-fsck
259 - --disable-uuidd
260 - )
261 - ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
262 -
263 - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
264 - eerror "INTL sanity check failed, aborting build."
265 - eerror "Please post your ${S}/config.log file as an"
266 - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
267 - die "Preventing included intl cruft from building"
268 - fi
269 -}
270 -
271 -src_compile() {
272 - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
273 -
274 - # Build the FreeBSD helper
275 - if use elibc_FreeBSD ; then
276 - cp "${FILESDIR}"/fsck_ext2fs.c .
277 - emake V=1 fsck_ext2fs
278 - fi
279 -}
280 -
281 -src_install() {
282 - # need to set root_libdir= manually as any --libdir options in the
283 - # econf above (i.e. multilib) will screw up the default #276465
284 - emake \
285 - STRIP=: \
286 - root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
287 - DESTDIR="${D%/}" \
288 - install install-libs
289 -
290 - einstalldocs
291 -
292 - insinto /etc
293 - doins "${FILESDIR}"/e2fsck.conf
294 -
295 - # Move shared libraries to /lib/, install static libraries to
296 - # /usr/lib/, and install linker scripts to /usr/lib/.
297 - gen_usr_ldscript -a e2p ext2fs
298 -
299 - # configure doesn't have an option to disable static libs :/
300 - if ! use static-libs ; then
301 - find "${D}" -name '*.a' -delete || die
302 - fi
303 -
304 - if use elibc_FreeBSD ; then
305 - # Install helpers for us
306 - into /
307 - dosbin "${S}"/fsck_ext2fs
308 - doman "${FILESDIR}"/fsck_ext2fs.8
309 -
310 - # filefrag is linux only
311 - rm \
312 - "${ED%/}"/usr/sbin/filefrag \
313 - "${ED%/}"/usr/share/man/man8/filefrag.8 || die
314 - fi
315 -}