1 |
commit: 5d537e13506d3741445cb2f0b5c57c19fcb00a20 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 30 20:38:17 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 30 20:38:29 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d537e13 |
7 |
|
8 |
sys-fs/e2fsprogs: Bump to version 1.46.5 |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
sys-fs/e2fsprogs/Manifest | 1 + |
13 |
sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 143 +++++++++++++++++++++++++++++++ |
14 |
2 files changed, 144 insertions(+) |
15 |
|
16 |
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest |
17 |
index 0fe82b8dc06c..6a975975148c 100644 |
18 |
--- a/sys-fs/e2fsprogs/Manifest |
19 |
+++ b/sys-fs/e2fsprogs/Manifest |
20 |
@@ -1,2 +1,3 @@ |
21 |
DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc |
22 |
DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d |
23 |
+DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa |
24 |
|
25 |
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild |
26 |
new file mode 100644 |
27 |
index 000000000000..963bf42ad0c5 |
28 |
--- /dev/null |
29 |
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild |
30 |
@@ -0,0 +1,143 @@ |
31 |
+# Copyright 1999-2021 Gentoo Authors |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+ |
34 |
+EAPI=7 |
35 |
+ |
36 |
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript |
37 |
+ |
38 |
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" |
39 |
+HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
40 |
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz |
41 |
+ elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" |
42 |
+ |
43 |
+LICENSE="GPL-2 BSD" |
44 |
+SLOT="0" |
45 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
46 |
+IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD" |
47 |
+ |
48 |
+RDEPEND="~sys-libs/${PN}-libs-${PV} |
49 |
+ >=sys-apps/util-linux-2.16 |
50 |
+ cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) |
51 |
+ fuse? ( sys-fs/fuse:0 ) |
52 |
+ nls? ( virtual/libintl )" |
53 |
+DEPEND="${RDEPEND}" |
54 |
+BDEPEND=" |
55 |
+ nls? ( sys-devel/gettext ) |
56 |
+ virtual/pkgconfig |
57 |
+ sys-apps/texinfo |
58 |
+" |
59 |
+ |
60 |
+PATCHES=( |
61 |
+ "${FILESDIR}"/${PN}-1.40-fbsd.patch |
62 |
+ "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 |
63 |
+ |
64 |
+ # Upstream patches (can usually removed with next version bump) |
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 |
+ # blargh ... trick e2fsprogs into using e2fsprogs-libs |
81 |
+ sed -i -r \ |
82 |
+ -e 's:@LIBINTL@:@LTLIBINTL@:' \ |
83 |
+ -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ |
84 |
+ -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ |
85 |
+ MCONFIG.in || die "muck libs" #122368 |
86 |
+ sed -i -r \ |
87 |
+ -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
88 |
+ Makefile.in || die "remove subdirs" |
89 |
+ ln -s $(which mk_cmds) lib/ss/ || die |
90 |
+ |
91 |
+ # Avoid rebuild |
92 |
+ echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h |
93 |
+} |
94 |
+ |
95 |
+src_configure() { |
96 |
+ # Keep the package from doing silly things #261411 |
97 |
+ export VARTEXFONTS="${T}/fonts" |
98 |
+ |
99 |
+ # needs open64() prototypes and friends |
100 |
+ append-cppflags -D_GNU_SOURCE |
101 |
+ |
102 |
+ local myeconfargs=( |
103 |
+ --with-root-prefix="${EPREFIX}" |
104 |
+ $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") |
105 |
+ --with-systemd-unit-dir="$(systemd_get_systemunitdir)" |
106 |
+ --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" |
107 |
+ --enable-symlink-install |
108 |
+ --enable-elf-shlibs |
109 |
+ $(tc-has-tls || echo --disable-tls) |
110 |
+ $(use_enable fuse fuse2fs) |
111 |
+ $(use_enable nls) |
112 |
+ --disable-libblkid |
113 |
+ --disable-libuuid |
114 |
+ --disable-fsck |
115 |
+ --disable-uuidd |
116 |
+ $(use_enable lto) |
117 |
+ $(use_with threads pthread) |
118 |
+ ) |
119 |
+ ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" |
120 |
+ |
121 |
+ if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
122 |
+ eerror "INTL sanity check failed, aborting build." |
123 |
+ eerror "Please post your ${S}/config.log file as an" |
124 |
+ eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" |
125 |
+ die "Preventing included intl cruft from building" |
126 |
+ fi |
127 |
+} |
128 |
+ |
129 |
+src_compile() { |
130 |
+ emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds |
131 |
+ |
132 |
+ # Build the FreeBSD helper |
133 |
+ if use elibc_FreeBSD ; then |
134 |
+ cp "${FILESDIR}"/fsck_ext2fs.c . |
135 |
+ emake V=1 fsck_ext2fs |
136 |
+ fi |
137 |
+} |
138 |
+ |
139 |
+src_install() { |
140 |
+ # need to set root_libdir= manually as any --libdir options in the |
141 |
+ # econf above (i.e. multilib) will screw up the default #276465 |
142 |
+ emake \ |
143 |
+ STRIP=: \ |
144 |
+ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ |
145 |
+ DESTDIR="${D}" \ |
146 |
+ install |
147 |
+ |
148 |
+ einstalldocs |
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 |
+ |
157 |
+ # configure doesn't have an option to disable static libs :/ |
158 |
+ if ! use static-libs ; then |
159 |
+ find "${ED}" -name '*.a' -delete || die |
160 |
+ fi |
161 |
+ |
162 |
+ if use elibc_FreeBSD ; then |
163 |
+ # Install helpers for us |
164 |
+ into / |
165 |
+ dosbin "${S}"/fsck_ext2fs |
166 |
+ doman "${FILESDIR}"/fsck_ext2fs.8 |
167 |
+ |
168 |
+ # filefrag is linux only |
169 |
+ rm \ |
170 |
+ "${ED}"/usr/sbin/filefrag \ |
171 |
+ "${ED}"/usr/share/man/man8/filefrag.8 || die |
172 |
+ fi |
173 |
+} |