1 |
commit: 42c4ea829970554a3d015568756837de5a275d13 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 2 07:58:16 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 2 08:07:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c4ea82 |
7 |
|
8 |
sys-fs/e2fsprogs: Bump to version 1.43.2 |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-fs/e2fsprogs/Manifest | 1 + |
14 |
sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild | 134 +++++++++++++++++++++++++++++++ |
15 |
2 files changed, 135 insertions(+) |
16 |
|
17 |
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest |
18 |
index 409df31..cdf0548 100644 |
19 |
--- a/sys-fs/e2fsprogs/Manifest |
20 |
+++ b/sys-fs/e2fsprogs/Manifest |
21 |
@@ -1,4 +1,5 @@ |
22 |
DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4 SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0 WHIRLPOOL 2b26e355ad8e378cc7402be5fd5f5abe0af2aa6a1214b357dca682b922aa07c97af427b369ef21ddb3ee731768234a5f5faf488b92a68b0175d07845dbe7783f |
23 |
DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7 |
24 |
DIST e2fsprogs-1.43.1.tar.xz 5078696 SHA256 97e36a029224e2606baa6e9ea693b04a4d192ccd714572a1b50a2df9c687b23d SHA512 5bc9c8f992519acaadf44925357ddb03569801e65d889de4bb40a85b61a8d78c9d97bd33fb9c099d3dac8039e837f7c525a84053e17b6c9b296948a39f6f60fd WHIRLPOOL 034d393487fbadabf6e8a75a7a647bfc55f1c762143f2add7e90cd41954350f2f02cf0d6e90ae6ed5034de266420d63e41f713f3b27eac5e9f2a0545b5509e7d |
25 |
+DIST e2fsprogs-1.43.2.tar.gz 7389995 SHA256 20085fd43d52b8f81bda259a7df5c2b1a7a745b6fd3d082a2915965dd77f5365 SHA512 4a008f2200024685df37d5fb5c01097ca005d335c7bb2b0c6b2f13db71d9046da7dbbd367ef25800e0e16312bbfdbab603d78ac675581bb39610234002756be4 WHIRLPOOL f6d193b14e1a6b8160d419e78f43981176b1ddcb8edc6d5a2daac12647565948006eb415b332be19b3e8c3e29ea7b4f8583dce1fa9002d9f0968327b2542432d |
26 |
DIST e2fsprogs-1.43.tar.xz 5086756 SHA256 d027eec0282e169eb55229beefca258c425c9d96f65292e2c004012d5353cd38 SHA512 f5f2d9331ebbec6530c9f41ce9c2e2296454f76b125e61802a36b8fe1f0d0f71f036275d7ff2d29bb0555b9daa6be8ac925d38192eb5085d3427ff6003d4bb78 WHIRLPOOL 4bcf553285e8cb4b347e3edc22e0d3cac206be1aa50196be5356561aabed57568f2cb6ef56988dba5c305bf801723b2cd15fc2fc907ba2f0373a16ef19ff765e |
27 |
|
28 |
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000..0db6702 |
31 |
--- /dev/null |
32 |
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild |
33 |
@@ -0,0 +1,134 @@ |
34 |
+# Copyright 1999-2016 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+# $Id$ |
37 |
+ |
38 |
+EAPI="5" |
39 |
+ |
40 |
+case ${PV} in |
41 |
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; |
42 |
+*) UP_PV=${PV} ;; |
43 |
+esac |
44 |
+ |
45 |
+inherit eutils flag-o-matic multilib toolchain-funcs |
46 |
+ |
47 |
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" |
48 |
+HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
49 |
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz |
50 |
+ mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz |
51 |
+ elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" |
52 |
+ |
53 |
+LICENSE="GPL-2 BSD" |
54 |
+SLOT="0" |
55 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" |
56 |
+IUSE="fuse nls static-libs elibc_FreeBSD" |
57 |
+ |
58 |
+RDEPEND="~sys-libs/${PN}-libs-${PV} |
59 |
+ >=sys-apps/util-linux-2.16 |
60 |
+ fuse? ( sys-fs/fuse ) |
61 |
+ nls? ( virtual/libintl )" |
62 |
+DEPEND="${RDEPEND} |
63 |
+ nls? ( sys-devel/gettext ) |
64 |
+ virtual/pkgconfig |
65 |
+ sys-apps/texinfo" |
66 |
+ |
67 |
+S=${WORKDIR}/${P%_pre*} |
68 |
+ |
69 |
+PATCHES=( |
70 |
+ "${FILESDIR}"/${PN}-1.41.8-makefile.patch |
71 |
+ "${FILESDIR}"/${PN}-1.40-fbsd.patch |
72 |
+ "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 |
73 |
+ "${FILESDIR}"/${PN}-1.43-sysmacros.patch |
74 |
+) |
75 |
+ |
76 |
+src_prepare() { |
77 |
+ if [[ ${CHOST} == *-mint* ]] ; then |
78 |
+ PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) |
79 |
+ fi |
80 |
+ |
81 |
+ epatch "${PATCHES[@]}" |
82 |
+ |
83 |
+ # blargh ... trick e2fsprogs into using e2fsprogs-libs |
84 |
+ rm -rf doc |
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 |
+ ac_cv_path_LDCONFIG=: \ |
107 |
+ econf \ |
108 |
+ --with-root-prefix="${EPREFIX}/" \ |
109 |
+ --enable-symlink-install \ |
110 |
+ $(tc-is-static-only || echo --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 |
+ if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
120 |
+ eerror "INTL sanity check failed, aborting build." |
121 |
+ eerror "Please post your ${S}/config.log file as an" |
122 |
+ eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" |
123 |
+ die "Preventing included intl cruft from building" |
124 |
+ fi |
125 |
+} |
126 |
+ |
127 |
+src_compile() { |
128 |
+ emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds |
129 |
+ |
130 |
+ # Build the FreeBSD helper |
131 |
+ if use elibc_FreeBSD ; then |
132 |
+ cp "${FILESDIR}"/fsck_ext2fs.c . |
133 |
+ emake V=1 fsck_ext2fs |
134 |
+ fi |
135 |
+} |
136 |
+ |
137 |
+src_install() { |
138 |
+ # need to set root_libdir= manually as any --libdir options in the |
139 |
+ # econf above (i.e. multilib) will screw up the default #276465 |
140 |
+ emake \ |
141 |
+ STRIP=: \ |
142 |
+ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ |
143 |
+ DESTDIR="${D}" \ |
144 |
+ install install-libs |
145 |
+ dodoc README RELEASE-NOTES |
146 |
+ |
147 |
+ insinto /etc |
148 |
+ doins "${FILESDIR}"/e2fsck.conf |
149 |
+ |
150 |
+ # Move shared libraries to /lib/, install static libraries to |
151 |
+ # /usr/lib/, and install linker scripts to /usr/lib/. |
152 |
+ gen_usr_ldscript -a e2p ext2fs |
153 |
+ # configure doesn't have an option to disable static libs :/ |
154 |
+ use static-libs || find "${D}" -name '*.a' -delete |
155 |
+ |
156 |
+ if use elibc_FreeBSD ; then |
157 |
+ # Install helpers for us |
158 |
+ into / |
159 |
+ dosbin "${S}"/fsck_ext2fs |
160 |
+ doman "${FILESDIR}"/fsck_ext2fs.8 |
161 |
+ |
162 |
+ # filefrag is linux only |
163 |
+ rm \ |
164 |
+ "${ED}"/usr/sbin/filefrag \ |
165 |
+ "${ED}"/usr/share/man/man8/filefrag.8 || die |
166 |
+ fi |
167 |
+} |