Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/
Date: Fri, 29 Jun 2018 08:24:38
Message-Id: 1530260110.25309c4309721fb4dcfd35ef3250d667a3c8ca00.polynomial-c@gentoo
1 commit: 25309c4309721fb4dcfd35ef3250d667a3c8ca00
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 29 08:15:10 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 29 08:15:10 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25309c43
7
8 sys-fs/xfsprogs: Bump to version 4.17.0
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 sys-fs/xfsprogs/Manifest | 1 +
13 sys-fs/xfsprogs/xfsprogs-4.17.0.ebuild | 97 ++++++++++++++++++++++++++++++++++
14 2 files changed, 98 insertions(+)
15
16 diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
17 index 5dec96944b7..2204bd7af60 100644
18 --- a/sys-fs/xfsprogs/Manifest
19 +++ b/sys-fs/xfsprogs/Manifest
20 @@ -1,3 +1,4 @@
21 DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506
22 DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee
23 DIST xfsprogs-4.16.1.tar.xz 1199632 BLAKE2B 26448ce8ec691d117c0b41aebcb692994ad5a65418ac5af9631eab75191201a265ec9bce92d4076049a4182a879741329f20e5f54343afeef826cf1dfbfcf0d1 SHA512 d3cf3b07e07864341c351a078736ff7c721d86c177e65f131dc6e023cade74a5e07fecbc435d69946d76d587b138e66cddcd763954e15ed0dd17c056a83e2a19
24 +DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
25
26 diff --git a/sys-fs/xfsprogs/xfsprogs-4.17.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.17.0.ebuild
27 new file mode 100644
28 index 00000000000..275a8f8ef89
29 --- /dev/null
30 +++ b/sys-fs/xfsprogs/xfsprogs-4.17.0.ebuild
31 @@ -0,0 +1,97 @@
32 +# Copyright 1999-2018 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +
37 +inherit toolchain-funcs multilib systemd
38 +
39 +DESCRIPTION="xfs filesystem utilities"
40 +HOMEPAGE="https://xfs.wiki.kernel.org/"
41 +SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
42 +
43 +LICENSE="LGPL-2.1"
44 +SLOT="0"
45 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
46 +IUSE="libedit nls readline static static-libs"
47 +REQUIRED_USE="static? ( static-libs )"
48 +
49 +LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
50 + readline? ( sys-libs/readline:0=[static-libs(+)] )
51 + !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
52 +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
53 + !<sys-fs/xfsdump-3"
54 +DEPEND="${RDEPEND}
55 + static? (
56 + ${LIB_DEPEND}
57 + readline? ( sys-libs/ncurses:0=[static-libs] )
58 + )
59 + nls? ( sys-devel/gettext )"
60 +
61 +PATCHES=(
62 + "${FILESDIR}"/${PN}-4.9.0-underlinking.patch
63 + "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
64 + "${FILESDIR}"/${PN}-4.15.0-docdir.patch
65 +)
66 +
67 +pkg_setup() {
68 + if use readline && use libedit ; then
69 + ewarn "You have USE='readline libedit' but these are exclusive."
70 + ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
71 + fi
72 +}
73 +
74 +src_prepare() {
75 + default
76 +
77 + # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
78 + # Clear out -static from all flags since we want to link against dynamic xfs libs.
79 + sed -i \
80 + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
81 + -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
82 + include/builddefs.in || die
83 + find -name Makefile -exec \
84 + sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
85 +
86 + # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
87 + if use static && use readline ; then
88 + sed -i \
89 + -e 's|-lreadline|& -lncurses|' \
90 + -e 's|-lblkid|& -luuid|' \
91 + configure || die
92 + fi
93 +}
94 +
95 +src_configure() {
96 + export DEBUG=-DNDEBUG
97 + export OPTIMIZER=${CFLAGS}
98 + unset PLATFORM # if set in user env, this breaks configure
99 +
100 + local myconf=(
101 + --disable-lto #655638
102 + --with-crond-dir="${EPREFIX}/etc/cron.d"
103 + --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
104 + $(use_enable nls gettext)
105 + $(use_enable readline)
106 + $(usex readline --disable-editline $(use_enable libedit editline))
107 + )
108 + if use static || use static-libs ; then
109 + myconf+=( --enable-static )
110 + else
111 + myconf+=( --disable-static )
112 + fi
113 +
114 + econf "${myconf[@]}"
115 +
116 + MAKEOPTS+=" V=1"
117 +}
118 +
119 +src_install() {
120 + emake DIST_ROOT="${ED}" install
121 + # parallel install fails on this target for >=xfsprogs-3.2.0
122 + emake -j1 DIST_ROOT="${ED}" install-dev
123 +
124 + # handle is for xfsdump, the rest for xfsprogs
125 + gen_usr_ldscript -a handle xcmd xfs xlog frog
126 + # removing unnecessary .la files if not needed
127 + use static-libs || find "${ED}" -name '*.la' -delete
128 +}