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: Fri, 29 Jan 2021 09:55:52
Message-Id: 1611914145.e52b26c2edac838476acaa8f813f790f40666082.polynomial-c@gentoo
1 commit: e52b26c2edac838476acaa8f813f790f40666082
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 29 09:53:06 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 29 09:55:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52b26c2
7
8 sys-fs/e2fsprogs: Removed old
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
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.5.ebuild | 142 -------------------------------
15 2 files changed, 143 deletions(-)
16
17 diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
18 index d05222baa1b..7802ac56570 100644
19 --- a/sys-fs/e2fsprogs/Manifest
20 +++ b/sys-fs/e2fsprogs/Manifest
21 @@ -1,4 +1,3 @@
22 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
23 -DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
24 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
25 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
26
27 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
28 deleted file mode 100644
29 index 03c5ed1ace2..00000000000
30 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
31 +++ /dev/null
32 @@ -1,142 +0,0 @@
33 -# Copyright 1999-2020 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
39 -
40 -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
41 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
42 -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
43 - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
44 -
45 -LICENSE="GPL-2 BSD"
46 -SLOT="0"
47 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
48 -IUSE="cron fuse nls static-libs elibc_FreeBSD"
49 -
50 -RDEPEND="~sys-libs/${PN}-libs-${PV}
51 - >=sys-apps/util-linux-2.16
52 - cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
53 - fuse? ( sys-fs/fuse:0 )
54 - nls? ( virtual/libintl )"
55 -DEPEND="${RDEPEND}"
56 -BDEPEND="
57 - nls? ( sys-devel/gettext )
58 - virtual/pkgconfig
59 - sys-apps/texinfo
60 -"
61 -
62 -PATCHES=(
63 - "${FILESDIR}"/${PN}-1.40-fbsd.patch
64 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
65 -
66 - # Upstream patches (can usually removed with next version bump)
67 -)
68 -
69 -src_prepare() {
70 - if [[ ${CHOST} == *-mint* ]] ; then
71 - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
72 - fi
73 -
74 - default
75 -
76 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
77 -
78 - # Get rid of doc -- we don't use them. This also prevents a sandbox
79 - # violation due to mktexfmt invocation
80 - rm -r doc || die "Failed to remove doc dir"
81 -
82 - # blargh ... trick e2fsprogs into using e2fsprogs-libs
83 - sed -i -r \
84 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
85 - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
86 - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
87 - MCONFIG.in || die "muck libs" #122368
88 - sed -i -r \
89 - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
90 - Makefile.in || die "remove subdirs"
91 - ln -s $(which mk_cmds) lib/ss/ || die
92 -
93 - # Avoid rebuild
94 - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
95 -}
96 -
97 -src_configure() {
98 - # Keep the package from doing silly things #261411
99 - export VARTEXFONTS="${T}/fonts"
100 -
101 - # needs open64() prototypes and friends
102 - append-cppflags -D_GNU_SOURCE
103 -
104 - local myeconfargs=(
105 - --with-root-prefix="${EPREFIX}"
106 - $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
107 - --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
108 - --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
109 - --enable-symlink-install
110 - --enable-elf-shlibs
111 - $(tc-has-tls || echo --disable-tls)
112 - --without-included-gettext
113 - $(use_enable fuse fuse2fs)
114 - $(use_enable nls)
115 - --disable-libblkid
116 - --disable-libuuid
117 - --disable-fsck
118 - --disable-uuidd
119 - )
120 - ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
121 -
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
148 -
149 - einstalldocs
150 -
151 - insinto /etc
152 - doins "${FILESDIR}"/e2fsck.conf
153 -
154 - # Move shared libraries to /lib/, install static libraries to
155 - # /usr/lib/, and install linker scripts to /usr/lib/.
156 - gen_usr_ldscript -a e2p ext2fs
157 -
158 - # configure doesn't have an option to disable static libs :/
159 - if ! use static-libs ; then
160 - find "${ED}" -name '*.a' -delete || die
161 - fi
162 -
163 - if use elibc_FreeBSD ; then
164 - # Install helpers for us
165 - into /
166 - dosbin "${S}"/fsck_ext2fs
167 - doman "${FILESDIR}"/fsck_ext2fs.8
168 -
169 - # filefrag is linux only
170 - rm \
171 - "${ED}"/usr/sbin/filefrag \
172 - "${ED}"/usr/share/man/man8/filefrag.8 || die
173 - fi
174 -}