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: Wed, 27 Sep 2017 23:17:21
Message-Id: 1506553430.f4055adc94e11d182033a71e32f97b357c034aff.polynomial-c@gentoo
1 commit: f4055adc94e11d182033a71e32f97b357c034aff
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 27 23:03:50 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 27 23:03:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4055adc
7
8 sys-fs/xfsprogs: Bump to version 4.13.1
9
10 Package-Manager: Portage-2.3.10, Repoman-2.3.3
11
12 sys-fs/xfsprogs/Manifest | 1 +
13 sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild | 94 ++++++++++++++++++++++++++++++++++
14 2 files changed, 95 insertions(+)
15
16 diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
17 index 015b4bf7de8..2dce71330a6 100644
18 --- a/sys-fs/xfsprogs/Manifest
19 +++ b/sys-fs/xfsprogs/Manifest
20 @@ -1,4 +1,5 @@
21 DIST xfsprogs-4.11.0.tar.xz 1113480 SHA256 c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 SHA512 2db59553e4442c999a718ccf712b01de80b1e3acd1c3e5f9f7f5dc59e6c9180aa1a42085363303fe454d441bc2f886e118fc2958320afa49c7a8886fcfb5d72c WHIRLPOOL df267970bbcbc3c8a05d02a5e334bdeb686acea74e647dee6e874bc083a64cecef7c45072619edfd4841856cf0b7c91056504207bbcd5f021b1a1b452ef794da
22 DIST xfsprogs-4.12.0.tar.xz 1128400 SHA256 b330ad8d737f4152ae511580102e2fc49212bb51dfb4b614084344abae46d0df SHA512 1dc4a0a5f40baf1d6398c8f07b4cb3ab796cf052c34b811d60b08c60a4700c2ced8d4d1adb878f8b85ba58cf3e1276db1477109de538fd427d3e359a52f59d4a WHIRLPOOL c18d3c9dfab8ccb877eb6fa9fa05be3c614a587c6cb616a9f18b52debb8ecacbd22056cb397ff9e69407c66e105d034458b41f0ba4275352f31398e64d303c02
23 +DIST xfsprogs-4.13.1.tar.xz 1133556 SHA256 8c64d349d191e24c84eeb1611be767e4a11b81016bd5b73f3a20a0bf39dd3536 SHA512 6c234a6c22aa3cabe0ea698c11175dca6c19d803989127ccb13b526ff6d34dcef9dd6e19ff0c4fb3903078f24210a8cfcd0508dac29d52fbee4dfed37d5888f3 WHIRLPOOL 89a84ce7b59fa52cd245493a28c6ad7f6e114dfe8044b2dad57b2cc626308ad1187ef812ace618085a083745acd3c37538903a6e2f935d9cd351c923559d9732
24 DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314 WHIRLPOOL 54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
25 DIST xfsprogs-4.9.0.tar.xz 1087940 SHA256 f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7 WHIRLPOOL a9b582a42967ce1e314cd0ac3518792c2e10f7bb1370151a68a09a8e21e40cc6818b9778dfdd248961c3a1a08a70424f0150219488a18bc5d60e5669702c472f
26
27 diff --git a/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
28 new file mode 100644
29 index 00000000000..a77ca48cb15
30 --- /dev/null
31 +++ b/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
32 @@ -0,0 +1,94 @@
33 +# Copyright 1999-2017 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=6
37 +
38 +inherit toolchain-funcs multilib
39 +
40 +DESCRIPTION="xfs filesystem utilities"
41 +HOMEPAGE="http://oss.sgi.com/projects/xfs/"
42 +SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
43 +
44 +LICENSE="LGPL-2.1"
45 +SLOT="0"
46 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
47 +IUSE="libedit nls readline static static-libs"
48 +REQUIRED_USE="static? ( static-libs )"
49 +
50 +LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
51 + readline? ( sys-libs/readline:0=[static-libs(+)] )
52 + !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
53 +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
54 + !<sys-fs/xfsdump-3"
55 +DEPEND="${RDEPEND}
56 + static? (
57 + ${LIB_DEPEND}
58 + readline? ( sys-libs/ncurses:0=[static-libs] )
59 + )
60 + nls? ( sys-devel/gettext )"
61 +
62 +PATCHES=(
63 + "${FILESDIR}"/${PN}-4.12.0-sharedlibs.patch
64 + "${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
65 + "${FILESDIR}"/${PN}-4.9.0-underlinking.patch
66 +)
67 +
68 +pkg_setup() {
69 + if use readline && use libedit ; then
70 + ewarn "You have USE='readline libedit' but these are exclusive."
71 + ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
72 + fi
73 +}
74 +
75 +src_prepare() {
76 + default
77 +
78 + # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
79 + # Clear out -static from all flags since we want to link against dynamic xfs libs.
80 + sed -i \
81 + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
82 + -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
83 + include/builddefs.in || die
84 + find -name Makefile -exec \
85 + sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
86 +
87 + # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
88 + if use static && use readline ; then
89 + sed -i \
90 + -e 's|-lreadline|& -lncurses|' \
91 + -e 's|-lblkid|& -luuid|' \
92 + configure || die
93 + fi
94 +}
95 +
96 +src_configure() {
97 + export DEBUG=-DNDEBUG
98 + export OPTIMIZER=${CFLAGS}
99 + unset PLATFORM # if set in user env, this breaks configure
100 +
101 + local myconf=(
102 + $(use_enable nls gettext)
103 + $(use_enable readline)
104 + $(usex readline --disable-editline $(use_enable libedit editline))
105 + )
106 + if use static || use static-libs ; then
107 + myconf+=( --enable-static )
108 + else
109 + myconf+=( --disable-static )
110 + fi
111 +
112 + econf "${myconf[@]}"
113 +
114 + MAKEOPTS+=" V=1"
115 +}
116 +
117 +src_install() {
118 + emake DIST_ROOT="${ED}" install
119 + # parallel install fails on this target for >=xfsprogs-3.2.0
120 + emake -j1 DIST_ROOT="${ED}" install-dev
121 +
122 + # handle is for xfsdump, the rest for xfsprogs
123 + gen_usr_ldscript -a handle xcmd xfs xlog
124 + # removing unnecessary .la files if not needed
125 + use static-libs || find "${ED}" -name '*.la' -delete
126 +}