Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/e2fsprogs-libs/files/, sys-libs/e2fsprogs-libs/, sys-fs/e2fsprogs/, ...
Date: Tue, 29 Mar 2016 00:45:18
Message-Id: 1459212299.00a607f1f48e9591ce0555cb0bd45a50e5985773.vapier@gentoo
1 commit: 00a607f1f48e9591ce0555cb0bd45a50e5985773
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 23:54:32 2016 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 29 00:44:59 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00a607f1
7
8 sys-libs/e2fsprogs-libs & sys-fs/e2fsprogs: drop old 1.42.12 versions
9
10 sys-fs/e2fsprogs/Manifest | 1 -
11 sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild | 126 ---------------------
12 ...gs-1.42.10-e2fsck-fix-makefile-dependency.patch | 28 -----
13 .../files/e2fsprogs-1.42.10-fix-build-cflags.patch | 13 ---
14 sys-libs/e2fsprogs-libs/Manifest | 1 -
15 .../e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild | 70 ------------
16 .../e2fsprogs-libs-1.42.10-fix-build-cflags.patch | 13 ---
17 7 files changed, 252 deletions(-)
18
19 diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
20 index ed319e2..80679d7 100644
21 --- a/sys-fs/e2fsprogs/Manifest
22 +++ b/sys-fs/e2fsprogs/Manifest
23 @@ -1,4 +1,3 @@
24 DIST e2fsprogs-1.41.7.tar.gz 4425159 SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c SHA512 c17c5f23feb7747941e7f019f197cca1cd4a84c067ad27d1a578ae213c7d7274aa79f3a64c7d69515f3f94db80df01ca71d4af83e9ea84c578a7257205395f7c WHIRLPOOL f760d7e658a1c78835ca470d077c7076a21f727f7d0a2411f5428363d12b7cd1676e2f221be9d9d1f5843c25320f7ef2f896ea47c9d4dc91190e0bc7df89ef36
25 -DIST e2fsprogs-1.42.12.tar.gz 6381695 SHA256 e17846d91a0edd89fa59b064bde8f8e5cec5851e35f587bcccb4014dbd63186c SHA512 a4b03470ed8f3e6c353250d80807070b8d5529ce219f7ec3076af89bd7cd674fbd443aab4d07dccff74606c9f620e349da32b451e3896a0635f6c700419f7cbf WHIRLPOOL 15f85fe969b174a99f06d875afafc83cc3e85cde0d8f1d833cb045c30259b3bfa9293ee84eeb793d9c60ece2cba4ca6bacbb8c861f11f3b56bd863ca1a2296f2
26 DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4 SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0 WHIRLPOOL 2b26e355ad8e378cc7402be5fd5f5abe0af2aa6a1214b357dca682b922aa07c97af427b369ef21ddb3ee731768234a5f5faf488b92a68b0175d07845dbe7783f
27 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7
28
29 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild
30 deleted file mode 100644
31 index bb428b3..0000000
32 --- a/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild
33 +++ /dev/null
34 @@ -1,126 +0,0 @@
35 -# Copyright 1999-2015 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=4
40 -
41 -case ${PV} in
42 -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
43 -*) UP_PV=${PV} ;;
44 -esac
45 -
46 -inherit eutils flag-o-matic multilib toolchain-funcs
47 -
48 -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
49 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
50 -SRC_URI="mirror://sourceforge/e2fsprogs/${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="nls static-libs elibc_FreeBSD"
57 -
58 -RDEPEND="~sys-libs/${PN}-libs-${PV}
59 - >=sys-apps/util-linux-2.16
60 - nls? ( virtual/libintl )"
61 -DEPEND="${RDEPEND}
62 - nls? ( sys-devel/gettext )
63 - virtual/pkgconfig
64 - sys-apps/texinfo"
65 -
66 -S=${WORKDIR}/${P%_pre*}
67 -
68 -src_prepare() {
69 - epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
70 - epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
71 - if [[ ${CHOST} == *-mint* ]] ; then
72 - epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch
73 - fi
74 - epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch #516854
75 -
76 - # blargh ... trick e2fsprogs into using e2fsprogs-libs
77 - rm -rf doc
78 - sed -i -r \
79 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
80 - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
81 - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
82 - MCONFIG.in || die "muck libs" #122368
83 - sed -i -r \
84 - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
85 - Makefile.in || die "remove subdirs"
86 - ln -s $(which mk_cmds) lib/ss/ || die
87 -
88 - # Avoid rebuild
89 - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
90 -}
91 -
92 -src_configure() {
93 - # Keep the package from doing silly things #261411
94 - export VARTEXFONTS=${T}/fonts
95 -
96 - # needs open64() prototypes and friends
97 - append-cppflags -D_GNU_SOURCE
98 -
99 - ac_cv_path_LDCONFIG=: \
100 - econf \
101 - --with-root-prefix="${EPREFIX}/" \
102 - --enable-symlink-install \
103 - $(tc-is-static-only || echo --enable-elf-shlibs) \
104 - $(tc-has-tls || echo --disable-tls) \
105 - --without-included-gettext \
106 - $(use_enable nls) \
107 - --disable-libblkid \
108 - --disable-libuuid \
109 - --disable-quota \
110 - --disable-fsck \
111 - --disable-uuidd
112 - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
113 - eerror "INTL sanity check failed, aborting build."
114 - eerror "Please post your ${S}/config.log file as an"
115 - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
116 - die "Preventing included intl cruft from building"
117 - fi
118 -}
119 -
120 -src_compile() {
121 - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
122 -
123 - # Build the FreeBSD helper
124 - if use elibc_FreeBSD ; then
125 - cp "${FILESDIR}"/fsck_ext2fs.c .
126 - emake V=1 fsck_ext2fs
127 - fi
128 -}
129 -
130 -src_install() {
131 - # need to set root_libdir= manually as any --libdir options in the
132 - # econf above (i.e. multilib) will screw up the default #276465
133 - emake \
134 - STRIP=: \
135 - root_libdir="${EPREFIX}/usr/$(get_libdir)" \
136 - DESTDIR="${D}" \
137 - install install-libs
138 - dodoc README RELEASE-NOTES
139 -
140 - insinto /etc
141 - doins "${FILESDIR}"/e2fsck.conf
142 -
143 - # Move shared libraries to /lib/, install static libraries to
144 - # /usr/lib/, and install linker scripts to /usr/lib/.
145 - gen_usr_ldscript -a e2p ext2fs
146 - # configure doesn't have an option to disable static libs :/
147 - use static-libs || find "${D}" -name '*.a' -delete
148 -
149 - if use elibc_FreeBSD ; then
150 - # Install helpers for us
151 - into /
152 - dosbin "${S}"/fsck_ext2fs
153 - doman "${FILESDIR}"/fsck_ext2fs.8
154 -
155 - # filefrag is linux only
156 - rm \
157 - "${ED}"/usr/sbin/filefrag \
158 - "${ED}"/usr/share/man/man8/filefrag.8 || die
159 - fi
160 -}
161
162 diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch
163 deleted file mode 100644
164 index 0330847..0000000
165 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch
166 +++ /dev/null
167 @@ -1,28 +0,0 @@
168 -From 5c15bf5f978bae01f1ca3cbe6414ab1d355a6adf Mon Sep 17 00:00:00 2001
169 -From: Theodore Ts'o <tytso@×××.edu>
170 -Date: Thu, 22 May 2014 18:52:27 -0400
171 -Subject: e2fsck: fix Makefile dependency for quota.o
172 -
173 -Signed-off-by: "Theodore Ts'o" <tytso@×××.edu>
174 -
175 -diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
176 -index 4b10f6f..f773fea 100644
177 ---- a/e2fsck/Makefile.in
178 -+++ b/e2fsck/Makefile.in
179 -@@ -552,3 +552,13 @@ logfile.o: $(srcdir)/logfile.c $(top_builddir)/lib/config.h \
180 - $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
181 - $(top_srcdir)/lib/../e2fsck/dict.h
182 - prof_err.o: prof_err.c
183 -+quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \
184 -+ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \
185 -+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
186 -+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
187 -+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
188 -+ $(top_builddir)/lib/ext2fs/ext2_err.h \
189 -+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
190 -+ $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \
191 -+ $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
192 -+ $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/problem.h
193 ---
194 -cgit v0.10.1
195 -
196
197 diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch
198 deleted file mode 100644
199 index 69e6f35..0000000
200 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch
201 +++ /dev/null
202 @@ -1,13 +0,0 @@
203 -https://bugs.gentoo.org/516854
204 -
205 ---- a/e2fsprogs-libs-1.42.10/configure
206 -+++ b/e2fsprogs-libs-1.42.10/configure
207 -@@ -1328,7 +1328,7 @@
208 - BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
209 - BUILD_LDFLAGS="$LDFLAGS"
210 - else
211 -- BUILD_CFLAGS=
212 -+ BUILD_CFLAGS="$INCLUDES"
213 - BUILD_LDFLAGS=
214 - fi
215 -
216
217 diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
218 index f289e0b..1fba44d 100644
219 --- a/sys-libs/e2fsprogs-libs/Manifest
220 +++ b/sys-libs/e2fsprogs-libs/Manifest
221 @@ -1,3 +1,2 @@
222 DIST e2fsprogs-libs-1.41.7.tar.gz 494463 SHA256 b6d9c9ec405ad1d644cf35d57f0f1e878fa6af6ad45b97683de847ff49cbdf84 SHA512 01bf6571efc3b63b985bb45190553cbf0e486ddcf022715a2bdf36eb3e45ffada603ed52bf17d6920b9dc3e98ffc6758d2481a83b68bbf5d946c76173f7d14a8 WHIRLPOOL 058fc1278ff2427d956728ad2d132652e80b60570c20c904c6d6e2a15c4a9d00ec13340ad56114f82dd703ee87cd576c2f69eb3d40f1f16743430476c3e383b1
223 -DIST e2fsprogs-libs-1.42.12.tar.gz 604947 SHA256 ca0a562b9b35f340d849f68977d1158ac9d92d9e77d97e2a85b8383e949dcd7b SHA512 2de9e828b5f123236505ae83cbfef906ca23f875dd15f5b7d8cbac9f59722e31c7304e5a92a326b42b71186ea5eb18550aac2986c45e70176047a5b1774b260a WHIRLPOOL 177ef831b978ea5febce5b87c98216843463df5a292705f93129dd8609f6ada345b45910c85248f1f70685b073d95531c63512366e4e407158bf1467781c9f24
224 DIST e2fsprogs-libs-1.42.13.tar.gz 605222 SHA256 79ad28c14ffd12083d8c4efea04cff7d175faf070de03d29bc580b5f1b669a14 SHA512 803ec87f9b3926c1f423cac424dc7fe2bfbaa3237a93023fe0213b88e35b933090299304be1c47d876d9d14487acadea3e8b9a926dab24733dbe6ee3f1d846e0 WHIRLPOOL 0adb43e1dd0ea476729dfd455430d1b803e96985c6a190ec518e57f628da6c9a85e2389f877026492f3b757db2d470a175e54db9d608ec586536854e21c7462f
225
226 diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild
227 deleted file mode 100644
228 index 1c268c2..0000000
229 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild
230 +++ /dev/null
231 @@ -1,70 +0,0 @@
232 -# Copyright 1999-2015 Gentoo Foundation
233 -# Distributed under the terms of the GNU General Public License v2
234 -# $Id$
235 -
236 -EAPI="4"
237 -
238 -case ${PV} in
239 -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
240 -*) UP_PV=${PV} ;;
241 -esac
242 -
243 -inherit toolchain-funcs eutils multilib-minimal
244 -
245 -DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
246 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
247 -SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
248 -
249 -LICENSE="GPL-2"
250 -SLOT="0"
251 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
252 -IUSE="nls static-libs"
253 -
254 -RDEPEND="!sys-libs/com_err
255 - !sys-libs/ss
256 - !<sys-fs/e2fsprogs-1.41.8
257 - abi_x86_32? (
258 - !<=app-emulation/emul-linux-x86-baselibs-20130224-r12
259 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
260 - )"
261 -DEPEND="nls? ( sys-devel/gettext )
262 - virtual/pkgconfig"
263 -
264 -S=${WORKDIR}/${P%_pre*}
265 -
266 -src_prepare() {
267 - printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
268 - epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
269 - epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch #516854
270 -}
271 -
272 -multilib_src_configure() {
273 - local myconf=()
274 - # we use blkid/uuid from util-linux now
275 - if use kernel_linux ; then
276 - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
277 - myconf+=( --disable-lib{blkid,uuid} )
278 - fi
279 - ac_cv_path_LDCONFIG=: \
280 - ECONF_SOURCE="${S}" \
281 - CC="$(tc-getCC)" \
282 - BUILD_CC="$(tc-getBUILD_CC)" \
283 - BUILD_LD="$(tc-getBUILD_LD)" \
284 - econf \
285 - --disable-quota \
286 - $(tc-is-static-only || echo --enable-elf-shlibs) \
287 - $(tc-has-tls || echo --disable-tls) \
288 - $(use_enable nls) \
289 - "${myconf[@]}"
290 -}
291 -
292 -multilib_src_compile() {
293 - emake V=1
294 -}
295 -
296 -multilib_src_install() {
297 - emake V=1 STRIP=: DESTDIR="${D}" install || die
298 - multilib_is_native_abi && gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
299 - # configure doesn't have an option to disable static libs :/
300 - use static-libs || find "${ED}" -name '*.a' -delete
301 -}
302
303 diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
304 deleted file mode 100644
305 index 69e6f35..0000000
306 --- a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
307 +++ /dev/null
308 @@ -1,13 +0,0 @@
309 -https://bugs.gentoo.org/516854
310 -
311 ---- a/e2fsprogs-libs-1.42.10/configure
312 -+++ b/e2fsprogs-libs-1.42.10/configure
313 -@@ -1328,7 +1328,7 @@
314 - BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
315 - BUILD_LDFLAGS="$LDFLAGS"
316 - else
317 -- BUILD_CFLAGS=
318 -+ BUILD_CFLAGS="$INCLUDES"
319 - BUILD_LDFLAGS=
320 - fi
321 -