1 |
commit: b018a4f7e6817fa54d3fe6672dd4f48131003ff5 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 28 06:30:06 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 28 06:31:33 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b018a4f7 |
7 |
|
8 |
sys-fs/e2fsprogs: Bump to version 1.46.3 |
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.3.ebuild | 143 +++++++++++++++++++++++++++++++ |
14 |
2 files changed, 144 insertions(+) |
15 |
|
16 |
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest |
17 |
index bce1a9e8801..d24f0b90c6c 100644 |
18 |
--- a/sys-fs/e2fsprogs/Manifest |
19 |
+++ b/sys-fs/e2fsprogs/Manifest |
20 |
@@ -3,3 +3,4 @@ DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fed |
21 |
DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763 |
22 |
DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69 SHA512 fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c |
23 |
DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d |
24 |
+DIST e2fsprogs-1.46.3.tar.xz 7024896 BLAKE2B 86f65cf9997f09aa7a27be35b2f38d6385f565de565b1c4cda710dbbea8312312ff77d92beb2b579a3caffa7ce82ee6b2726eb8f97daf41bba46379a94198c8f SHA512 27da6e38d3463e7a283dacfb88a3210dd6d8c63f4d990db879f63bdf503aaa5c447ef0ccc566b71526c12a8ab0a7a6529014b1010be300ad56a6ad5ce9066196 |
25 |
|
26 |
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.3.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..963bf42ad0c |
29 |
--- /dev/null |
30 |
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.3.ebuild |
31 |
@@ -0,0 +1,143 @@ |
32 |
+# Copyright 1999-2021 Gentoo Authors |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=7 |
36 |
+ |
37 |
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript |
38 |
+ |
39 |
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" |
40 |
+HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
41 |
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz |
42 |
+ elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" |
43 |
+ |
44 |
+LICENSE="GPL-2 BSD" |
45 |
+SLOT="0" |
46 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
47 |
+IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD" |
48 |
+ |
49 |
+RDEPEND="~sys-libs/${PN}-libs-${PV} |
50 |
+ >=sys-apps/util-linux-2.16 |
51 |
+ cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) |
52 |
+ fuse? ( sys-fs/fuse:0 ) |
53 |
+ nls? ( virtual/libintl )" |
54 |
+DEPEND="${RDEPEND}" |
55 |
+BDEPEND=" |
56 |
+ nls? ( sys-devel/gettext ) |
57 |
+ virtual/pkgconfig |
58 |
+ sys-apps/texinfo |
59 |
+" |
60 |
+ |
61 |
+PATCHES=( |
62 |
+ "${FILESDIR}"/${PN}-1.40-fbsd.patch |
63 |
+ "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 |
64 |
+ |
65 |
+ # Upstream patches (can usually removed with next version bump) |
66 |
+) |
67 |
+ |
68 |
+src_prepare() { |
69 |
+ if [[ ${CHOST} == *-mint* ]] ; then |
70 |
+ PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) |
71 |
+ fi |
72 |
+ |
73 |
+ default |
74 |
+ |
75 |
+ cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" |
76 |
+ |
77 |
+ # Get rid of doc -- we don't use them. This also prevents a sandbox |
78 |
+ # violation due to mktexfmt invocation |
79 |
+ rm -r doc || die "Failed to remove doc dir" |
80 |
+ |
81 |
+ # blargh ... trick e2fsprogs into using e2fsprogs-libs |
82 |
+ sed -i -r \ |
83 |
+ -e 's:@LIBINTL@:@LTLIBINTL@:' \ |
84 |
+ -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ |
85 |
+ -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ |
86 |
+ MCONFIG.in || die "muck libs" #122368 |
87 |
+ sed -i -r \ |
88 |
+ -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
89 |
+ Makefile.in || die "remove subdirs" |
90 |
+ ln -s $(which mk_cmds) lib/ss/ || die |
91 |
+ |
92 |
+ # Avoid rebuild |
93 |
+ echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h |
94 |
+} |
95 |
+ |
96 |
+src_configure() { |
97 |
+ # Keep the package from doing silly things #261411 |
98 |
+ export VARTEXFONTS="${T}/fonts" |
99 |
+ |
100 |
+ # needs open64() prototypes and friends |
101 |
+ append-cppflags -D_GNU_SOURCE |
102 |
+ |
103 |
+ local myeconfargs=( |
104 |
+ --with-root-prefix="${EPREFIX}" |
105 |
+ $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") |
106 |
+ --with-systemd-unit-dir="$(systemd_get_systemunitdir)" |
107 |
+ --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" |
108 |
+ --enable-symlink-install |
109 |
+ --enable-elf-shlibs |
110 |
+ $(tc-has-tls || echo --disable-tls) |
111 |
+ $(use_enable fuse fuse2fs) |
112 |
+ $(use_enable nls) |
113 |
+ --disable-libblkid |
114 |
+ --disable-libuuid |
115 |
+ --disable-fsck |
116 |
+ --disable-uuidd |
117 |
+ $(use_enable lto) |
118 |
+ $(use_with threads pthread) |
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 |
+} |