1 |
commit: 8c746ccd0cbaa66f161ed4b21618983fee9b3d51 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 25 18:46:47 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 25 19:05:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c746ccd |
7 |
|
8 |
sys-fs/xfsprogs: Remvoed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
11 |
|
12 |
sys-fs/xfsprogs/Manifest | 2 - |
13 |
sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild | 96 ---------------------------- |
14 |
sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild | 100 ------------------------------ |
15 |
3 files changed, 198 deletions(-) |
16 |
|
17 |
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest |
18 |
index 1a243b97786..eb808d7e3e5 100644 |
19 |
--- a/sys-fs/xfsprogs/Manifest |
20 |
+++ b/sys-fs/xfsprogs/Manifest |
21 |
@@ -1,5 +1,3 @@ |
22 |
DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506 |
23 |
-DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee |
24 |
-DIST xfsprogs-4.16.1.tar.xz 1199632 BLAKE2B 26448ce8ec691d117c0b41aebcb692994ad5a65418ac5af9631eab75191201a265ec9bce92d4076049a4182a879741329f20e5f54343afeef826cf1dfbfcf0d1 SHA512 d3cf3b07e07864341c351a078736ff7c721d86c177e65f131dc6e023cade74a5e07fecbc435d69946d76d587b138e66cddcd763954e15ed0dd17c056a83e2a19 |
25 |
DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400 |
26 |
DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2 SHA512 0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be |
27 |
|
28 |
diff --git a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 4ea572db8e0..00000000000 |
31 |
--- a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,96 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit toolchain-funcs multilib systemd |
40 |
- |
41 |
-DESCRIPTION="xfs filesystem utilities" |
42 |
-HOMEPAGE="https://xfs.wiki.kernel.org/" |
43 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" |
44 |
- |
45 |
-LICENSE="LGPL-2.1" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
48 |
-IUSE="libedit nls readline static static-libs" |
49 |
-REQUIRED_USE="static? ( static-libs )" |
50 |
- |
51 |
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] |
52 |
- readline? ( sys-libs/readline:0=[static-libs(+)] ) |
53 |
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" |
54 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
55 |
- !<sys-fs/xfsdump-3" |
56 |
-DEPEND="${RDEPEND} |
57 |
- static? ( |
58 |
- ${LIB_DEPEND} |
59 |
- readline? ( sys-libs/ncurses:0=[static-libs] ) |
60 |
- ) |
61 |
- nls? ( sys-devel/gettext )" |
62 |
- |
63 |
-PATCHES=( |
64 |
- "${FILESDIR}"/${PN}-4.9.0-underlinking.patch |
65 |
- "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch |
66 |
- "${FILESDIR}"/${PN}-4.15.0-docdir.patch |
67 |
-) |
68 |
- |
69 |
-pkg_setup() { |
70 |
- if use readline && use libedit ; then |
71 |
- ewarn "You have USE='readline libedit' but these are exclusive." |
72 |
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit." |
73 |
- fi |
74 |
-} |
75 |
- |
76 |
-src_prepare() { |
77 |
- default |
78 |
- |
79 |
- # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled. |
80 |
- # Clear out -static from all flags since we want to link against dynamic xfs libs. |
81 |
- sed -i \ |
82 |
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ |
83 |
- -e "1iLLDFLAGS += $(usex static '-all-static' '')" \ |
84 |
- include/builddefs.in || die |
85 |
- find -name Makefile -exec \ |
86 |
- sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} + |
87 |
- |
88 |
- # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part. |
89 |
- if use static && use readline ; then |
90 |
- sed -i \ |
91 |
- -e 's|-lreadline|& -lncurses|' \ |
92 |
- -e 's|-lblkid|& -luuid|' \ |
93 |
- configure || die |
94 |
- fi |
95 |
-} |
96 |
- |
97 |
-src_configure() { |
98 |
- export DEBUG=-DNDEBUG |
99 |
- export OPTIMIZER=${CFLAGS} |
100 |
- unset PLATFORM # if set in user env, this breaks configure |
101 |
- |
102 |
- local myconf=( |
103 |
- --with-crond-dir="${EPREFIX}/etc/cron.d" |
104 |
- --with-systemd-unit-dir="$(systemd_get_systemunitdir)" |
105 |
- $(use_enable nls gettext) |
106 |
- $(use_enable readline) |
107 |
- $(usex readline --disable-editline $(use_enable libedit editline)) |
108 |
- ) |
109 |
- if use static || use static-libs ; then |
110 |
- myconf+=( --enable-static ) |
111 |
- else |
112 |
- myconf+=( --disable-static ) |
113 |
- fi |
114 |
- |
115 |
- econf "${myconf[@]}" |
116 |
- |
117 |
- MAKEOPTS+=" V=1" |
118 |
-} |
119 |
- |
120 |
-src_install() { |
121 |
- emake DIST_ROOT="${ED}" install |
122 |
- # parallel install fails on this target for >=xfsprogs-3.2.0 |
123 |
- emake -j1 DIST_ROOT="${ED}" install-dev |
124 |
- |
125 |
- # handle is for xfsdump, the rest for xfsprogs |
126 |
- gen_usr_ldscript -a handle xcmd xfs xlog frog |
127 |
- # removing unnecessary .la files if not needed |
128 |
- use static-libs || find "${ED}" -name '*.la' -delete |
129 |
-} |
130 |
|
131 |
diff --git a/sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild |
132 |
deleted file mode 100644 |
133 |
index 273db91aea0..00000000000 |
134 |
--- a/sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild |
135 |
+++ /dev/null |
136 |
@@ -1,100 +0,0 @@ |
137 |
-# Copyright 1999-2018 Gentoo Foundation |
138 |
-# Distributed under the terms of the GNU General Public License v2 |
139 |
- |
140 |
-EAPI=6 |
141 |
- |
142 |
-inherit toolchain-funcs multilib systemd |
143 |
- |
144 |
-DESCRIPTION="xfs filesystem utilities" |
145 |
-HOMEPAGE="https://xfs.wiki.kernel.org/" |
146 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" |
147 |
- |
148 |
-LICENSE="LGPL-2.1" |
149 |
-SLOT="0" |
150 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
151 |
-IUSE="icu libedit nls readline static static-libs" |
152 |
-REQUIRED_USE="static? ( static-libs )" |
153 |
- |
154 |
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] |
155 |
- icu? ( dev-libs/icu:=[static-libs(+)] ) |
156 |
- readline? ( sys-libs/readline:0=[static-libs(+)] ) |
157 |
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" |
158 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
159 |
- !<sys-fs/xfsdump-3" |
160 |
-DEPEND="${RDEPEND} |
161 |
- static? ( |
162 |
- ${LIB_DEPEND} |
163 |
- readline? ( sys-libs/ncurses:0=[static-libs] ) |
164 |
- ) |
165 |
- nls? ( sys-devel/gettext )" |
166 |
- |
167 |
-PATCHES=( |
168 |
- "${FILESDIR}"/${PN}-4.9.0-underlinking.patch |
169 |
- "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch |
170 |
- "${FILESDIR}"/${PN}-4.15.0-docdir.patch |
171 |
-) |
172 |
- |
173 |
-pkg_setup() { |
174 |
- if use readline && use libedit ; then |
175 |
- ewarn "You have USE='readline libedit' but these are exclusive." |
176 |
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit." |
177 |
- fi |
178 |
-} |
179 |
- |
180 |
-src_prepare() { |
181 |
- default |
182 |
- |
183 |
- # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled. |
184 |
- # Clear out -static from all flags since we want to link against dynamic xfs libs. |
185 |
- sed -i \ |
186 |
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ |
187 |
- -e "1iLLDFLAGS += $(usex static '-all-static' '')" \ |
188 |
- include/builddefs.in || die |
189 |
- find -name Makefile -exec \ |
190 |
- sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} + |
191 |
- |
192 |
- # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part. |
193 |
- if use static && use readline ; then |
194 |
- sed -i \ |
195 |
- -e 's|-lreadline|& -lncurses|' \ |
196 |
- -e 's|-lblkid|& -luuid|' \ |
197 |
- configure || die |
198 |
- fi |
199 |
-} |
200 |
- |
201 |
-src_configure() { |
202 |
- export DEBUG=-DNDEBUG |
203 |
- export OPTIMIZER=${CFLAGS} |
204 |
- unset PLATFORM # if set in user env, this breaks configure |
205 |
- |
206 |
- local myconf=( |
207 |
- --disable-lto #655638 |
208 |
- --enable-blkid |
209 |
- --with-crond-dir="${EPREFIX}/etc/cron.d" |
210 |
- --with-systemd-unit-dir="$(systemd_get_systemunitdir)" |
211 |
- $(use_enable icu libicu) |
212 |
- $(use_enable nls gettext) |
213 |
- $(use_enable readline) |
214 |
- $(usex readline --disable-editline $(use_enable libedit editline)) |
215 |
- ) |
216 |
- if use static || use static-libs ; then |
217 |
- myconf+=( --enable-static ) |
218 |
- else |
219 |
- myconf+=( --disable-static ) |
220 |
- fi |
221 |
- |
222 |
- econf "${myconf[@]}" |
223 |
- |
224 |
- MAKEOPTS+=" V=1" |
225 |
-} |
226 |
- |
227 |
-src_install() { |
228 |
- emake DIST_ROOT="${ED}" install |
229 |
- # parallel install fails on this target for >=xfsprogs-3.2.0 |
230 |
- emake -j1 DIST_ROOT="${ED}" install-dev |
231 |
- |
232 |
- # handle is for xfsdump, the rest for xfsprogs |
233 |
- gen_usr_ldscript -a handle xcmd xfs xlog frog |
234 |
- # removing unnecessary .la files if not needed |
235 |
- use static-libs || find "${ED}" -name '*.la' -delete |
236 |
-} |