1 |
commit: 13d18e1bacb8e4ac44574f0a9061d19fe946ec9d |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 28 12:36:27 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 28 12:37:53 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d18e1b |
7 |
|
8 |
sys-fs/e2fsprogs: Bump to version 1.45.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
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.2.ebuild | 144 +++++++++++++++++++++++++++++++ |
15 |
2 files changed, 145 insertions(+) |
16 |
|
17 |
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest |
18 |
index f5731d7097a..55947dbe229 100644 |
19 |
--- a/sys-fs/e2fsprogs/Manifest |
20 |
+++ b/sys-fs/e2fsprogs/Manifest |
21 |
@@ -3,3 +3,4 @@ DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024ed |
22 |
DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf |
23 |
DIST e2fsprogs-1.45.0.tar.xz 5520532 BLAKE2B de7c27b90e68e822a8157e99d103933d98afe094765016a58dbdce4d5bebda86493c94dbf3bd009aa25063edf34a0c8229cbc1045f1041a357448619aee55de8 SHA512 208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014 |
24 |
DIST e2fsprogs-1.45.1.tar.xz 5507236 BLAKE2B d454f0228df2079edd3b7f8ad406417ee48cacb5b62fc1c869eff21b35dafc9bbc4ffd80e6040629a8da1edac230beb3981bc43eb12b6feecf4225a9b9f335e6 SHA512 2e8974d30e92d7f194ccad7f152b495d2a6e41328b1532351f13af27ceaef5ee01d52963e17801cc7317f7b5208791bd20c9028f15a9859225f0e64d175be779 |
25 |
+DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e |
26 |
|
27 |
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..c0ce32929e1 |
30 |
--- /dev/null |
31 |
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild |
32 |
@@ -0,0 +1,144 @@ |
33 |
+# Copyright 1999-2019 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 |
39 |
+ |
40 |
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" |
41 |
+HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
42 |
+SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz |
43 |
+ mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz |
44 |
+ elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" |
45 |
+ |
46 |
+LICENSE="GPL-2 BSD" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" |
49 |
+IUSE="cron fuse nls static-libs elibc_FreeBSD" |
50 |
+ |
51 |
+RDEPEND="~sys-libs/${PN}-libs-${PV} |
52 |
+ >=sys-apps/util-linux-2.16 |
53 |
+ cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) |
54 |
+ fuse? ( sys-fs/fuse:0 ) |
55 |
+ nls? ( virtual/libintl )" |
56 |
+DEPEND="${RDEPEND}" |
57 |
+BDEPEND=" |
58 |
+ nls? ( sys-devel/gettext ) |
59 |
+ virtual/pkgconfig |
60 |
+ sys-apps/texinfo |
61 |
+" |
62 |
+ |
63 |
+PATCHES=( |
64 |
+ "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch |
65 |
+ "${FILESDIR}"/${PN}-1.40-fbsd.patch |
66 |
+ "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 |
67 |
+ |
68 |
+ # Upstream patches (can usually removed with next version bump) |
69 |
+) |
70 |
+ |
71 |
+src_prepare() { |
72 |
+ if [[ ${CHOST} == *-mint* ]] ; then |
73 |
+ PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) |
74 |
+ fi |
75 |
+ |
76 |
+ default |
77 |
+ |
78 |
+ cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" |
79 |
+ |
80 |
+ # Get rid of doc -- we don't use them. This also prevents a sandbox |
81 |
+ # violation due to mktexfmt invocation |
82 |
+ rm -r doc || die "Failed to remove doc dir" |
83 |
+ |
84 |
+ # blargh ... trick e2fsprogs into using e2fsprogs-libs |
85 |
+ sed -i -r \ |
86 |
+ -e 's:@LIBINTL@:@LTLIBINTL@:' \ |
87 |
+ -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ |
88 |
+ -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ |
89 |
+ MCONFIG.in || die "muck libs" #122368 |
90 |
+ sed -i -r \ |
91 |
+ -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
92 |
+ Makefile.in || die "remove subdirs" |
93 |
+ ln -s $(which mk_cmds) lib/ss/ || die |
94 |
+ |
95 |
+ # Avoid rebuild |
96 |
+ echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h |
97 |
+} |
98 |
+ |
99 |
+src_configure() { |
100 |
+ # Keep the package from doing silly things #261411 |
101 |
+ export VARTEXFONTS="${T}/fonts" |
102 |
+ |
103 |
+ # needs open64() prototypes and friends |
104 |
+ append-cppflags -D_GNU_SOURCE |
105 |
+ |
106 |
+ local myeconfargs=( |
107 |
+ --with-root-prefix="${EPREFIX}" |
108 |
+ $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") |
109 |
+ --with-systemd-unit-dir="$(systemd_get_systemunitdir)" |
110 |
+ --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" |
111 |
+ --enable-symlink-install |
112 |
+ --enable-elf-shlibs |
113 |
+ $(tc-has-tls || echo --disable-tls) |
114 |
+ --without-included-gettext |
115 |
+ $(use_enable fuse fuse2fs) |
116 |
+ $(use_enable nls) |
117 |
+ --disable-libblkid |
118 |
+ --disable-libuuid |
119 |
+ --disable-fsck |
120 |
+ --disable-uuidd |
121 |
+ ) |
122 |
+ ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" |
123 |
+ |
124 |
+ if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
125 |
+ eerror "INTL sanity check failed, aborting build." |
126 |
+ eerror "Please post your ${S}/config.log file as an" |
127 |
+ eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" |
128 |
+ die "Preventing included intl cruft from building" |
129 |
+ fi |
130 |
+} |
131 |
+ |
132 |
+src_compile() { |
133 |
+ emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds |
134 |
+ |
135 |
+ # Build the FreeBSD helper |
136 |
+ if use elibc_FreeBSD ; then |
137 |
+ cp "${FILESDIR}"/fsck_ext2fs.c . |
138 |
+ emake V=1 fsck_ext2fs |
139 |
+ fi |
140 |
+} |
141 |
+ |
142 |
+src_install() { |
143 |
+ # need to set root_libdir= manually as any --libdir options in the |
144 |
+ # econf above (i.e. multilib) will screw up the default #276465 |
145 |
+ emake \ |
146 |
+ STRIP=: \ |
147 |
+ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ |
148 |
+ DESTDIR="${D}" \ |
149 |
+ install install-libs |
150 |
+ |
151 |
+ einstalldocs |
152 |
+ |
153 |
+ insinto /etc |
154 |
+ doins "${FILESDIR}"/e2fsck.conf |
155 |
+ |
156 |
+ # Move shared libraries to /lib/, install static libraries to |
157 |
+ # /usr/lib/, and install linker scripts to /usr/lib/. |
158 |
+ gen_usr_ldscript -a e2p ext2fs |
159 |
+ |
160 |
+ # configure doesn't have an option to disable static libs :/ |
161 |
+ if ! use static-libs ; then |
162 |
+ find "${ED}" -name '*.a' -delete || die |
163 |
+ fi |
164 |
+ |
165 |
+ if use elibc_FreeBSD ; then |
166 |
+ # Install helpers for us |
167 |
+ into / |
168 |
+ dosbin "${S}"/fsck_ext2fs |
169 |
+ doman "${FILESDIR}"/fsck_ext2fs.8 |
170 |
+ |
171 |
+ # filefrag is linux only |
172 |
+ rm \ |
173 |
+ "${ED}"/usr/sbin/filefrag \ |
174 |
+ "${ED}"/usr/share/man/man8/filefrag.8 || die |
175 |
+ fi |
176 |
+} |