sys-fs/xfsprogs: Remove old
authorAndreas K. Hüttel <dilfridge@gentoo.org>
Sun, 30 Dec 2018 09:19:14 +0000 (10:19 +0100)
committerAndreas K. Hüttel <dilfridge@gentoo.org>
Sun, 30 Dec 2018 09:19:38 +0000 (10:19 +0100)
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
sys-fs/xfsprogs/Manifest
sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch [deleted file]
sys-fs/xfsprogs/files/xfsprogs-4.7.0-libxcmd-link.patch [deleted file]
sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild [deleted file]

index 2ab39b4d018230d5e71410d8b223ccba7d894582..a244970c9260ae29153b22cf9782a6325004ce1a 100644 (file)
@@ -1,4 +1,3 @@
-DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506
 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
 DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2 SHA512 0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be
 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch
deleted file mode 100644 (file)
index cb59d44..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
---- xfsprogs-4.12.0/include/buildmacros
-+++ xfsprogs-4.12.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
--      cd $(TOPDIR)/$(LIBNAME)/.libs; \
--      ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--      ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
--      ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
--      ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
--      ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
--      if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
--           "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
--              ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
--              ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
--              ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
--      fi
-+      set -e; cd $(TOPDIR)/$(LIBNAME); \
-+      $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+      env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-4.12.0/libhandle/Makefile
-+++ xfsprogs-4.12.0/libhandle/Makefile
-@@ -24,7 +24,6 @@
- include $(BUILDRULES)
- install: default
--      $(INSTALL_LTLIB)
- install-dev: default
-       $(INSTALL_LTLIB_DEV)
---- xfsprogs-4.12.0/libxcmd/Makefile
-+++ xfsprogs-4.12.0/libxcmd/Makefile
-@@ -34,6 +34,9 @@
- include $(BUILDRULES)
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+      $(INSTALL_LTLIB_DEV)
- -include .ltdep
---- xfsprogs-4.12.0/libxfs/Makefile
-+++ xfsprogs-4.12.0/libxfs/Makefile
-@@ -151,6 +151,7 @@
- install-dev: install
-       $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+      $(INSTALL_LTLIB_DEV)
- # We need to install the headers before building the dependencies.  If we
- # include the .ltdep file, the makefile decides that it needs to build the
---- xfsprogs-4.12.0/libxlog/Makefile
-+++ xfsprogs-4.12.0/libxlog/Makefile
-@@ -19,6 +19,9 @@
- include $(BUILDRULES)
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+      $(INSTALL_LTLIB_DEV)
- -include .ltdep
---- xfsprogs-4.12.0/Makefile
-+++ xfsprogs-4.12.0/Makefile
-@@ -89,6 +89,8 @@
- copy: libxlog
- mkfs: libxcmd
- spaceman: libxcmd
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
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
deleted file mode 100644 (file)
index 77ded53..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From d01d3689fd512811b9d860598ddf26089bb5955c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 9 Aug 2016 22:37:45 +0800
-Subject: [PATCH xfsprogs] libxcmd: link against used libs
-
-Since this lib uses symbols from libxfs (platform_findsizes) and many
-symbols from libblkid, link against both.  Otherwise, the resulting
-shared lib has missing symbols which makes linking against annoying.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libxcmd/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libxcmd/Makefile b/libxcmd/Makefile
-index aab8d6d63624..46ba138a37e2 100644
---- a/libxcmd/Makefile
-+++ b/libxcmd/Makefile
-@@ -12,6 +12,8 @@ LT_AGE = 0
- CFILES = command.c input.c paths.c projects.c help.c quit.c topology.c
-+LTLIBS = $(LIBXFS) $(LIBBLKID)
-+
- ifeq ($(HAVE_GETMNTENT),yes)
- LCFLAGS += -DHAVE_GETMNTENT
- endif
--- 
-2.9.0
-
diff --git a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
deleted file mode 100644 (file)
index 28a6618..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-       readline? ( sys-libs/readline:0=[static-libs(+)] )
-       !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-       !<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-       static? (
-               ${LIB_DEPEND}
-               readline? ( sys-libs/ncurses:0=[static-libs] )
-       )
-       nls? ( sys-devel/gettext )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-4.12.0-sharedlibs.patch
-       "${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
-       "${FILESDIR}"/${PN}-4.9.0-underlinking.patch
-)
-
-pkg_setup() {
-       if use readline && use libedit ; then
-               ewarn "You have USE='readline libedit' but these are exclusive."
-               ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-       fi
-}
-
-src_prepare() {
-       default
-
-       # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
-       # Clear out -static from all flags since we want to link against dynamic xfs libs.
-       sed -i \
-               -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-               -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
-               include/builddefs.in || die
-       find -name Makefile -exec \
-               sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
-       # TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
-       if use static && use readline ; then
-               sed -i \
-                       -e 's|-lreadline|& -lncurses|' \
-                       -e 's|-lblkid|& -luuid|' \
-                       configure || die
-       fi
-}
-
-src_configure() {
-       export DEBUG=-DNDEBUG
-       export OPTIMIZER=${CFLAGS}
-       unset PLATFORM # if set in user env, this breaks configure
-
-       local myconf=(
-               $(use_enable nls gettext)
-               $(use_enable readline)
-               $(usex readline --disable-editline $(use_enable libedit editline))
-       )
-       if use static || use static-libs ; then
-               myconf+=( --enable-static )
-       else
-               myconf+=( --disable-static )
-       fi
-
-       econf "${myconf[@]}"
-
-       MAKEOPTS+=" V=1"
-}
-
-src_install() {
-       emake DIST_ROOT="${ED}" install
-       # parallel install fails on this target for >=xfsprogs-3.2.0
-       emake -j1 DIST_ROOT="${ED}" install-dev
-
-       # handle is for xfsdump, the rest for xfsprogs
-       gen_usr_ldscript -a handle xcmd xfs xlog
-       # removing unnecessary .la files if not needed
-       use static-libs || find "${ED}" -name '*.la' -delete
-}