commit: 95019a23e7017c39f743c844db0c66b925b7e780 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Jul 25 08:55:13 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Jul 25 08:55:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95019a23
sys-fs/xfsprogs: Removed old Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-fs/xfsprogs/Manifest | 2 - .../files/xfsprogs-4.15.0-sharedlibs.patch | 114 --------------------- .../files/xfsprogs-4.9.0-underlinking.patch | 30 ------ sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild | 85 --------------- sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild | 113 -------------------- 5 files changed, 344 deletions(-) diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 1c99a4902bc..6794193a2a9 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,5 +1,3 @@ -DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58 DIST xfsprogs-5.4.0.tar.xz 1248688 BLAKE2B dd00083b62a4989ca94d117eabad3905dc487c3e6d4f20bbe855399e99e2195c1a45f2be3b117048e2a7f2374c7e6258e7c1edd63d12a405c88f4c9fa6cd5e8e SHA512 c0973fcf97e2666385b46c80cd1398728702cb34fd7e0f89e2a63686300573405d09a81d3ae43d79c2e9710ccf6b6bd6ed1c3f3f831c75cd0916f094f203aaa7 -DIST xfsprogs-5.5.0.tar.xz 1252760 BLAKE2B 8099d019e66be4fc8856a22be94ab94cbc78bb81137cb2f065d058b39c4048dbeca7378106047e16dc26e8307463d834bb03bcb9473af192d29b414e7fe715d8 SHA512 1169765e9a003f9618f020eb190dc0a692e7017cf1ec2a9329a8db0f07ef6a48cb250fc326fb9168714259c8d5f2195cc6fd41e01bbbdc9a5857e53f145b6815 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231 diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch deleted file mode 100644 index 1080e440094..00000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- xfsprogs-4.15.0/include/buildmacros -+++ xfsprogs-4.15.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.15.0/libfrog/Makefile -+++ xfsprogs-4.15.0/libfrog/Makefile -@@ -5,6 +5,8 @@ - TOPDIR = .. - include $(TOPDIR)/include/builddefs - -+LTLIBS = $(LIBXFS) $(LIBBLKID) -+ - LTLIBRARY = libfrog.la - LT_CURRENT = 0 - LT_REVISION = 0 -@@ -34,6 +36,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep ---- xfsprogs-4.15.0/libhandle/Makefile -+++ xfsprogs-4.15.0/libhandle/Makefile -@@ -24,7 +24,6 @@ - include $(BUILDRULES) - - install: default -- $(INSTALL_LTLIB) - - install-dev: default - $(INSTALL_LTLIB_DEV) ---- xfsprogs-4.15.0/libxcmd/Makefile -+++ xfsprogs-4.15.0/libxcmd/Makefile -@@ -12,6 +12,8 @@ - - CFILES = command.c input.c help.c quit.c - -+LTLIBS = $(LIBXFS) $(LIBBLKID) -+ - ifeq ($(ENABLE_READLINE),yes) - LCFLAGS += -DENABLE_READLINE - LTLIBS += $(LIBREADLINE) $(LIBTERMCAP) -@@ -26,6 +28,9 @@ - - include $(BUILDRULES) - --install install-dev: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) - - -include .ltdep ---- xfsprogs-4.15.0/libxfs/Makefile -+++ xfsprogs-4.15.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.15.0/libxlog/Makefile -+++ xfsprogs-4.15.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.15.0/Makefile -+++ xfsprogs-4.15.0/Makefile -@@ -92,6 +92,10 @@ - mkfs: libxcmd - spaceman: libxcmd - scrub: libhandle libxcmd -+libfrog: libxfs -+libfrog-install-dev: libxfs-install-dev -+libxlog: libxfs -+libxlog-install-dev: libxfs-install-dev - - ifeq ($(HAVE_BUILDDEFS), yes) - include $(BUILDRULES) diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch deleted file mode 100644 index e6904a53bc2..00000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch +++ /dev/null @@ -1,30 +0,0 @@ - libxfs/Makefile | 2 +- - libxlog/Makefile | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libxfs/Makefile b/libxfs/Makefile -index 6499731..00447c4 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c - - FCFLAGS = -I. - --LTLIBS = $(LIBPTHREAD) $(LIBRT) -+LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID) - - # don't try linking xfs_repair with a debug libxfs. - DEBUG = -DNDEBUG -diff --git a/libxlog/Makefile b/libxlog/Makefile -index 3417eed..fda1343 100644 ---- a/libxlog/Makefile -+++ b/libxlog/Makefile -@@ -12,6 +12,8 @@ LT_AGE = 0 - - CFILES = xfs_log_recover.c util.c - -+LTLIBS = $(LIBUUID) -+ - # don't want to link xfs_repair with a debug libxlog. - DEBUG = -DNDEBUG - diff --git a/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild deleted file mode 100644 index fcf8ea0503d..00000000000 --- a/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multilib systemd usr-ldscript - -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 sparc x86" -IUSE="icu libedit nls readline static-libs" - -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - icu? ( dev-libs/icu:=[static-libs(+)] ) - readline? ( sys-libs/readline:0=[static-libs(+)] ) - !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="${LIB_DEPEND//\[static-libs(+)]} - !<sys-fs/xfsdump-3" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.9.0-underlinking.patch - "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch - "${FILESDIR}"/${PN}-4.15.0-docdir.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 - - # 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}:" \ - include/builddefs.in || die - # Don't install compressed docs - sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die - find -name Makefile -exec \ - sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} + -} - -src_configure() { - export DEBUG=-DNDEBUG - export OPTIMIZER=${CFLAGS} - unset PLATFORM # if set in user env, this breaks configure - - local myconf=( - --disable-lto #655638 - --enable-blkid - --with-crond-dir="${EPREFIX}/etc/cron.d" - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - $(use_enable icu libicu) - $(use_enable nls gettext) - $(use_enable readline) - $(usex readline --disable-editline $(use_enable libedit editline)) - $(use_enable static-libs static) - ) - - 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 frog - # removing unnecessary .la files if not needed - if ! use static-libs ; then - find "${ED}" -name '*.la' -delete || die - fi -} diff --git a/sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild deleted file mode 100644 index 662d88603be..00000000000 --- a/sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs systemd usr-ldscript - -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 ~sparc ~x86" -IUSE="icu libedit nls readline" - -LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] - icu? ( dev-libs/icu:=[static-libs(+)] ) - readline? ( sys-libs/readline:0=[static-libs(+)] ) - !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" -RDEPEND="${LIB_DEPEND//\[static-libs(+)]} - !<sys-fs/xfsdump-3" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.15.0-docdir.patch - "${FILESDIR}"/${PN}-5.3.0-libdir.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 - - # Fix doc dir - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in || die - - # Don't install compressed docs - sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die -} - -src_configure() { - # include/builddefs.in will add FCFLAGS to CFLAGS which will - # unnecessarily clutter CFLAGS (and fortran isn't used) - unset FCFLAGS - - export DEBUG=-DNDEBUG - - # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. - # However, we have to provide an empty value to avoid default - # flags. - export OPTIMIZER=" " - - unset PLATFORM # if set in user env, this breaks configure - - # Avoid automagic on libdevmapper, #709694 - export ac_cv_search_dm_task_create=no - - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 - - # Upstream does NOT support --disable-static anymore, - # https://www.spinics.net/lists/linux-xfs/msg30185.html - # https://www.spinics.net/lists/linux-xfs/msg30272.html - local myconf=( - --enable-blkid - --with-crond-dir="${EPREFIX}/etc/cron.d" - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - $(use_enable icu libicu) - $(use_enable nls gettext) - $(use_enable readline) - $(usex readline --disable-editline $(use_enable libedit editline)) - ) - - if is-flagq -fno-lto ; then - einfo "LTO disabled via {C,CXX,F,FC}FLAGS" - myconf+=( --disable-lto ) - else - if is-flagq -flto ; then - einfo "LTO forced via {C,CXX,F,FC}FLAGS" - myconf+=( --enable-lto ) - elif use amd64 || use x86 ; then - # match upstream default - myconf+=( --enable-lto ) - else - # LTO can cause problems on some architectures, bug 655638 - myconf+=( --disable-lto ) - fi - fi - - econf "${myconf[@]}" -} - -src_compile() { - emake V=1 -} - -src_install() { - emake DIST_ROOT="${ED}" install - emake DIST_ROOT="${ED}" install-dev - - gen_usr_ldscript -a handle -}
