1 |
commit: afd4474abf7a2a1bcfe842438862fa2412dea4b8 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 10 10:34:16 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 10 13:11:56 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afd4474a |
7 |
|
8 |
sys-fs/e2fsprogs: Bump to version 1.46.1 |
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.46.1.ebuild | 143 +++++++++++++++++++++++++++++++ |
15 |
2 files changed, 144 insertions(+) |
16 |
|
17 |
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest |
18 |
index 3ff83d7d77f..0a60d89e153 100644 |
19 |
--- a/sys-fs/e2fsprogs/Manifest |
20 |
+++ b/sys-fs/e2fsprogs/Manifest |
21 |
@@ -2,3 +2,4 @@ DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d |
22 |
DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84 |
23 |
DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763 |
24 |
DIST e2fsprogs-1.46.0.tar.xz 7007144 BLAKE2B d902028a0e538a62428e18e3c2a0a917a73351afc7d8eec804ddac459a1b8c2e11d104201235fb64170acc78942d2c9d5a45039f770cf5ce537cdba18cd559e6 SHA512 c865360e532da42264200934229aa9cfc88c3342fc4e206e82d1fe2a908b0fd3b58f2e9a4796f2ecdeafe1ace9f9ee444ea5b2e3efd488cb934f9a22af6a8f7e |
25 |
+DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69 SHA512 fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c |
26 |
|
27 |
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.1.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..963bf42ad0c |
30 |
--- /dev/null |
31 |
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.1.ebuild |
32 |
@@ -0,0 +1,143 @@ |
33 |
+# Copyright 1999-2021 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 lto nls static-libs +threads 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 |
+ $(use_enable fuse fuse2fs) |
113 |
+ $(use_enable nls) |
114 |
+ --disable-libblkid |
115 |
+ --disable-libuuid |
116 |
+ --disable-fsck |
117 |
+ --disable-uuidd |
118 |
+ $(use_enable lto) |
119 |
+ $(use_with threads pthread) |
120 |
+ ) |
121 |
+ ac_cv_path_LDCONFIG=: 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 |
+src_compile() { |
132 |
+ emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds |
133 |
+ |
134 |
+ # Build the FreeBSD helper |
135 |
+ if use elibc_FreeBSD ; then |
136 |
+ cp "${FILESDIR}"/fsck_ext2fs.c . |
137 |
+ emake V=1 fsck_ext2fs |
138 |
+ fi |
139 |
+} |
140 |
+ |
141 |
+src_install() { |
142 |
+ # need to set root_libdir= manually as any --libdir options in the |
143 |
+ # econf above (i.e. multilib) will screw up the default #276465 |
144 |
+ emake \ |
145 |
+ STRIP=: \ |
146 |
+ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ |
147 |
+ DESTDIR="${D}" \ |
148 |
+ install |
149 |
+ |
150 |
+ einstalldocs |
151 |
+ |
152 |
+ insinto /etc |
153 |
+ doins "${FILESDIR}"/e2fsck.conf |
154 |
+ |
155 |
+ # Move shared libraries to /lib/, install static libraries to |
156 |
+ # /usr/lib/, and install linker scripts to /usr/lib/. |
157 |
+ gen_usr_ldscript -a e2p ext2fs |
158 |
+ |
159 |
+ # configure doesn't have an option to disable static libs :/ |
160 |
+ if ! use static-libs ; then |
161 |
+ find "${ED}" -name '*.a' -delete || die |
162 |
+ fi |
163 |
+ |
164 |
+ if use elibc_FreeBSD ; then |
165 |
+ # Install helpers for us |
166 |
+ into / |
167 |
+ dosbin "${S}"/fsck_ext2fs |
168 |
+ doman "${FILESDIR}"/fsck_ext2fs.8 |
169 |
+ |
170 |
+ # filefrag is linux only |
171 |
+ rm \ |
172 |
+ "${ED}"/usr/sbin/filefrag \ |
173 |
+ "${ED}"/usr/share/man/man8/filefrag.8 || die |
174 |
+ fi |
175 |
+} |