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, 27 Apr 2018 09:07:12
Message-Id: 1524820022.268589c18e867dda82cd877b52460df427149609.polynomial-c@gentoo
1 commit: 268589c18e867dda82cd877b52460df427149609
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 27 08:33:38 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 27 09:07:02 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268589c1
7
8 sys-fs/xfsprogs: Removed old.
9
10 Package-Manager: Portage-2.3.31, Repoman-2.3.9
11
12 sys-fs/xfsprogs/Manifest | 1 -
13 sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild | 96 ----------------------------------
14 2 files changed, 97 deletions(-)
15
16 diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
17 index 560a6188b3c..8c4ee431ca4 100644
18 --- a/sys-fs/xfsprogs/Manifest
19 +++ b/sys-fs/xfsprogs/Manifest
20 @@ -1,5 +1,4 @@
21 DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506
22 -DIST xfsprogs-4.15.0.tar.xz 1186416 BLAKE2B a7d8c74498231e63a0fe7c5a37366852ed8dbe1db6d2deff8c4500c8e113f2e5180e547cdeabc87629922d184982bacb4be40969b78b87fcc07c5c29f22972bd SHA512 78d67a603c45a0d2b69d2cd0f7400b1e2c7b8b9bca3fa78529b8558bebda082e24d683d275ca546bb63c6cfd53d3b6048109b815e9fc5ced34d1c32533c2e77f
23 DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee
24 DIST xfsprogs-4.16.0.tar.xz 1199088 BLAKE2B 1de05747164eb695c10644f05845507b0a2daf55563af13b3177588af4114d40c0e72bbfee4cc47aaf86840f648d4fc34837797975aed3490321a1122f86e277 SHA512 0ca0cb3347ccc103f92f496016beaf5e5742fea2a4ca8515f6e340537e446df09483d9d30ce159789eb05a73430f8d517e57d1a8548029f1e73c108484b4e6e8
25 DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
26
27 diff --git a/sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild
28 deleted file mode 100644
29 index 148d4aa1cf8..00000000000
30 --- a/sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild
31 +++ /dev/null
32 @@ -1,96 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit toolchain-funcs multilib systemd
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.9.0-underlinking.patch
64 - "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
65 - "${FILESDIR}"/${PN}-4.15.0-docdir.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 - --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 -}