| 1 |
commit: 08d972ab1cc5219ad66dc4195dd4ff3264f58671 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 30 09:19:14 2018 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 30 09:19:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d972ab |
| 7 |
|
| 8 |
sys-fs/xfsprogs: Remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-fs/xfsprogs/Manifest | 1 - |
| 14 |
.../files/xfsprogs-4.12.0-sharedlibs.patch | 81 ------------------- |
| 15 |
.../files/xfsprogs-4.7.0-libxcmd-link.patch | 30 ------- |
| 16 |
sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild | 94 ---------------------- |
| 17 |
4 files changed, 206 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest |
| 20 |
index 2ab39b4d018..a244970c926 100644 |
| 21 |
--- a/sys-fs/xfsprogs/Manifest |
| 22 |
+++ b/sys-fs/xfsprogs/Manifest |
| 23 |
@@ -1,4 +1,3 @@ |
| 24 |
-DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506 |
| 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 |
DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58 |
| 28 |
|
| 29 |
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch |
| 30 |
deleted file mode 100644 |
| 31 |
index cb59d44a46b..00000000000 |
| 32 |
--- a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,81 +0,0 @@ |
| 35 |
---- xfsprogs-4.12.0/include/buildmacros |
| 36 |
-+++ xfsprogs-4.12.0/include/buildmacros |
| 37 |
-@@ -70,18 +70,9 @@ |
| 38 |
- # /usr/lib. |
| 39 |
- ifeq ($(ENABLE_SHARED),yes) |
| 40 |
- INSTALL_LTLIB_DEV = \ |
| 41 |
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \ |
| 42 |
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
| 43 |
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ |
| 44 |
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ |
| 45 |
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ |
| 46 |
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ |
| 47 |
-- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ |
| 48 |
-- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \ |
| 49 |
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ |
| 50 |
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ |
| 51 |
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ |
| 52 |
-- fi |
| 53 |
-+ set -e; cd $(TOPDIR)/$(LIBNAME); \ |
| 54 |
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
| 55 |
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la |
| 56 |
- else |
| 57 |
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) |
| 58 |
- endif |
| 59 |
---- xfsprogs-4.12.0/libhandle/Makefile |
| 60 |
-+++ xfsprogs-4.12.0/libhandle/Makefile |
| 61 |
-@@ -24,7 +24,6 @@ |
| 62 |
- include $(BUILDRULES) |
| 63 |
- |
| 64 |
- install: default |
| 65 |
-- $(INSTALL_LTLIB) |
| 66 |
- |
| 67 |
- install-dev: default |
| 68 |
- $(INSTALL_LTLIB_DEV) |
| 69 |
---- xfsprogs-4.12.0/libxcmd/Makefile |
| 70 |
-+++ xfsprogs-4.12.0/libxcmd/Makefile |
| 71 |
-@@ -34,6 +34,9 @@ |
| 72 |
- |
| 73 |
- include $(BUILDRULES) |
| 74 |
- |
| 75 |
--install install-dev: default |
| 76 |
-+install: default |
| 77 |
-+ |
| 78 |
-+install-dev: default |
| 79 |
-+ $(INSTALL_LTLIB_DEV) |
| 80 |
- |
| 81 |
- -include .ltdep |
| 82 |
---- xfsprogs-4.12.0/libxfs/Makefile |
| 83 |
-+++ xfsprogs-4.12.0/libxfs/Makefile |
| 84 |
-@@ -151,6 +151,7 @@ |
| 85 |
- |
| 86 |
- install-dev: install |
| 87 |
- $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR) |
| 88 |
-+ $(INSTALL_LTLIB_DEV) |
| 89 |
- |
| 90 |
- # We need to install the headers before building the dependencies. If we |
| 91 |
- # include the .ltdep file, the makefile decides that it needs to build the |
| 92 |
---- xfsprogs-4.12.0/libxlog/Makefile |
| 93 |
-+++ xfsprogs-4.12.0/libxlog/Makefile |
| 94 |
-@@ -19,6 +19,9 @@ |
| 95 |
- |
| 96 |
- include $(BUILDRULES) |
| 97 |
- |
| 98 |
--install install-dev: default |
| 99 |
-+install: default |
| 100 |
-+ |
| 101 |
-+install-dev: default |
| 102 |
-+ $(INSTALL_LTLIB_DEV) |
| 103 |
- |
| 104 |
- -include .ltdep |
| 105 |
---- xfsprogs-4.12.0/Makefile |
| 106 |
-+++ xfsprogs-4.12.0/Makefile |
| 107 |
-@@ -89,6 +89,8 @@ |
| 108 |
- copy: libxlog |
| 109 |
- mkfs: libxcmd |
| 110 |
- spaceman: libxcmd |
| 111 |
-+libxlog: libxfs |
| 112 |
-+libxlog-install-dev: libxfs-install-dev |
| 113 |
- |
| 114 |
- ifeq ($(HAVE_BUILDDEFS), yes) |
| 115 |
- include $(BUILDRULES) |
| 116 |
|
| 117 |
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch b/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch |
| 118 |
deleted file mode 100644 |
| 119 |
index 77ded5393d5..00000000000 |
| 120 |
--- a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch |
| 121 |
+++ /dev/null |
| 122 |
@@ -1,30 +0,0 @@ |
| 123 |
-From d01d3689fd512811b9d860598ddf26089bb5955c Mon Sep 17 00:00:00 2001 |
| 124 |
-From: Mike Frysinger <vapier@g.o> |
| 125 |
-Date: Tue, 9 Aug 2016 22:37:45 +0800 |
| 126 |
-Subject: [PATCH xfsprogs] libxcmd: link against used libs |
| 127 |
- |
| 128 |
-Since this lib uses symbols from libxfs (platform_findsizes) and many |
| 129 |
-symbols from libblkid, link against both. Otherwise, the resulting |
| 130 |
-shared lib has missing symbols which makes linking against annoying. |
| 131 |
- |
| 132 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
| 133 |
---- |
| 134 |
- libxcmd/Makefile | 2 ++ |
| 135 |
- 1 file changed, 2 insertions(+) |
| 136 |
- |
| 137 |
-diff --git a/libxcmd/Makefile b/libxcmd/Makefile |
| 138 |
-index aab8d6d63624..46ba138a37e2 100644 |
| 139 |
---- a/libxcmd/Makefile |
| 140 |
-+++ b/libxcmd/Makefile |
| 141 |
-@@ -12,6 +12,8 @@ LT_AGE = 0 |
| 142 |
- |
| 143 |
- CFILES = command.c input.c paths.c projects.c help.c quit.c topology.c |
| 144 |
- |
| 145 |
-+LTLIBS = $(LIBXFS) $(LIBBLKID) |
| 146 |
-+ |
| 147 |
- ifeq ($(HAVE_GETMNTENT),yes) |
| 148 |
- LCFLAGS += -DHAVE_GETMNTENT |
| 149 |
- endif |
| 150 |
--- |
| 151 |
-2.9.0 |
| 152 |
- |
| 153 |
|
| 154 |
diff --git a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild |
| 155 |
deleted file mode 100644 |
| 156 |
index 28a66180cfd..00000000000 |
| 157 |
--- a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild |
| 158 |
+++ /dev/null |
| 159 |
@@ -1,94 +0,0 @@ |
| 160 |
-# Copyright 1999-2018 Gentoo Foundation |
| 161 |
-# Distributed under the terms of the GNU General Public License v2 |
| 162 |
- |
| 163 |
-EAPI=6 |
| 164 |
- |
| 165 |
-inherit toolchain-funcs multilib |
| 166 |
- |
| 167 |
-DESCRIPTION="xfs filesystem utilities" |
| 168 |
-HOMEPAGE="https://xfs.wiki.kernel.org/" |
| 169 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" |
| 170 |
- |
| 171 |
-LICENSE="LGPL-2.1" |
| 172 |
-SLOT="0" |
| 173 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" |
| 174 |
-IUSE="libedit nls readline static static-libs" |
| 175 |
-REQUIRED_USE="static? ( static-libs )" |
| 176 |
- |
| 177 |
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] |
| 178 |
- readline? ( sys-libs/readline:0=[static-libs(+)] ) |
| 179 |
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" |
| 180 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
| 181 |
- !<sys-fs/xfsdump-3" |
| 182 |
-DEPEND="${RDEPEND} |
| 183 |
- static? ( |
| 184 |
- ${LIB_DEPEND} |
| 185 |
- readline? ( sys-libs/ncurses:0=[static-libs] ) |
| 186 |
- ) |
| 187 |
- nls? ( sys-devel/gettext )" |
| 188 |
- |
| 189 |
-PATCHES=( |
| 190 |
- "${FILESDIR}"/${PN}-4.12.0-sharedlibs.patch |
| 191 |
- "${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch |
| 192 |
- "${FILESDIR}"/${PN}-4.9.0-underlinking.patch |
| 193 |
-) |
| 194 |
- |
| 195 |
-pkg_setup() { |
| 196 |
- if use readline && use libedit ; then |
| 197 |
- ewarn "You have USE='readline libedit' but these are exclusive." |
| 198 |
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit." |
| 199 |
- fi |
| 200 |
-} |
| 201 |
- |
| 202 |
-src_prepare() { |
| 203 |
- default |
| 204 |
- |
| 205 |
- # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled. |
| 206 |
- # Clear out -static from all flags since we want to link against dynamic xfs libs. |
| 207 |
- sed -i \ |
| 208 |
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ |
| 209 |
- -e "1iLLDFLAGS += $(usex static '-all-static' '')" \ |
| 210 |
- include/builddefs.in || die |
| 211 |
- find -name Makefile -exec \ |
| 212 |
- sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} + |
| 213 |
- |
| 214 |
- # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part. |
| 215 |
- if use static && use readline ; then |
| 216 |
- sed -i \ |
| 217 |
- -e 's|-lreadline|& -lncurses|' \ |
| 218 |
- -e 's|-lblkid|& -luuid|' \ |
| 219 |
- configure || die |
| 220 |
- fi |
| 221 |
-} |
| 222 |
- |
| 223 |
-src_configure() { |
| 224 |
- export DEBUG=-DNDEBUG |
| 225 |
- export OPTIMIZER=${CFLAGS} |
| 226 |
- unset PLATFORM # if set in user env, this breaks configure |
| 227 |
- |
| 228 |
- local myconf=( |
| 229 |
- $(use_enable nls gettext) |
| 230 |
- $(use_enable readline) |
| 231 |
- $(usex readline --disable-editline $(use_enable libedit editline)) |
| 232 |
- ) |
| 233 |
- if use static || use static-libs ; then |
| 234 |
- myconf+=( --enable-static ) |
| 235 |
- else |
| 236 |
- myconf+=( --disable-static ) |
| 237 |
- fi |
| 238 |
- |
| 239 |
- econf "${myconf[@]}" |
| 240 |
- |
| 241 |
- MAKEOPTS+=" V=1" |
| 242 |
-} |
| 243 |
- |
| 244 |
-src_install() { |
| 245 |
- emake DIST_ROOT="${ED}" install |
| 246 |
- # parallel install fails on this target for >=xfsprogs-3.2.0 |
| 247 |
- emake -j1 DIST_ROOT="${ED}" install-dev |
| 248 |
- |
| 249 |
- # handle is for xfsdump, the rest for xfsprogs |
| 250 |
- gen_usr_ldscript -a handle xcmd xfs xlog |
| 251 |
- # removing unnecessary .la files if not needed |
| 252 |
- use static-libs || find "${ED}" -name '*.la' -delete |
| 253 |
-} |
Archives