commit: 743bdcf27df692d54fa1d879b25e51384777c39e Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sun Jan 8 20:21:44 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sun Jan 8 20:22:02 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743bdcf2
sys-fs/xfsprogs: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-fs/xfsprogs/Manifest | 1 - .../xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch | 108 --------------------- sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild | 98 ------------------- 3 files changed, 207 deletions(-) diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 4ef4635..19da7ac 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,4 +1,3 @@ -DIST xfsprogs-3.2.4.tar.gz 1482424 SHA256 dde65ead82d3cbfa9b4ded9796b6d22095d7d759a22d41ae6f1a4ec458bb0465 SHA512 fb1ea5beb933b86970cac198fa4e296457f0f5b30bd72fda54452644730277929dee28f11f35a154910e4a19857455ecffdd21b3df456023e0da95e2fd0aa0eb WHIRLPOOL dec87905b5a5af053e71e88f1670470c00b94a758dbb77773adbc601db61b4efaaba306f344a4334b11680973d5153fcc7f8b5d59c4698f21d654570e8355fe9 DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314 WHIRLPOOL 54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469 DIST xfsprogs-4.7.0.tar.gz 1534909 SHA256 88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7 SHA512 5184f1dbc3989f3c1f1b103d5cbd70462db107cfe113424166581ebcfaad4041c9c78f5d038f4bd4728ff99a2f9705219582ba9bfd10745354a1cab0b7dfe613 WHIRLPOOL 8157b2e8df5946acacc22ed761e38b382ef464f4984971148069b2f215418f4e23ac142721394439c041c236cbd460e0b56ff071d1c10e343070147709f42af3 DIST xfsprogs-4.8.0.tar.xz 1088376 SHA256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 SHA512 9c83763ae4925980969e66827edef41774e4dc09ae42637630167b5e0329675517ea7b50de751fcb9485fbcf8e470d24dd20b51475bcb56723dae6ee9fb140c7 WHIRLPOOL dc9f9b5c0b4e9b61f023fb972137126f22909c77908990e1beb391689fe6512a7810d9bd1ccfc0cfe4cd5379d99c123ddc9d0b6194e0a81e946e2304f964f180 diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch deleted file mode 100644 index 118874a..00000000 --- a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch +++ /dev/null @@ -1,108 +0,0 @@ -use libtool to do all installing. do not use the manual file install as -that'll copy files directly from the .libs/ subdir which might have rpaths -that we do not want. - ---- xfsprogs-3.2.2/include/buildmacros -+++ xfsprogs-3.2.2/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-3.2.2/libdisk/Makefile -+++ xfsprogs-3.2.2/libdisk/Makefile -@@ -31,6 +31,7 @@ - install: default - - install-dev: default -+ $(INSTALL_LTLIB_DEV) - - install-qa: install-dev - ---- xfsprogs-3.2.2/libhandle/Makefile -+++ xfsprogs-3.2.2/libhandle/Makefile -@@ -20,7 +20,6 @@ - include $(BUILDRULES) - - install: default -- $(INSTALL_LTLIB) - - install-dev: default - $(INSTALL_LTLIB_DEV) ---- xfsprogs-3.2.2/libxcmd/Makefile -+++ xfsprogs-3.2.2/libxcmd/Makefile -@@ -34,6 +34,11 @@ - - include $(BUILDRULES) - --install install-dev install-qa: default -+install: default -+ -+ install-dev: default -+ $(INSTALL_LTLIB_DEV) -+ -+install-qa: default - - -include .ltdep ---- xfsprogs-3.2.2/libxfs/Makefile -+++ xfsprogs-3.2.2/libxfs/Makefile -@@ -86,6 +86,7 @@ - install: default - - install-dev: default -+ $(INSTALL_LTLIB_DEV) - - install-qa: default - ---- xfsprogs-3.2.2/libxlog/Makefile -+++ xfsprogs-3.2.2/libxlog/Makefile -@@ -12,6 +12,8 @@ - - CFILES = xfs_log_recover.c util.c - -+LTLIBS = $(LIBUUID) $(LIBXFS) -+ - # don't want to link xfs_repair with a debug libxlog. - DEBUG = -DNDEBUG - -@@ -19,6 +21,11 @@ - - include $(BUILDRULES) - --install install-dev install-qa: default -+install: default -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) -+ -+install-qa: default - - -include .ltdep ---- xfsprogs-3.2.2/Makefile -+++ xfsprogs-3.2.2/Makefile -@@ -63,6 +63,8 @@ - mkfs: libxfs - quota: libxcmd - repair: libxfs libxlog -+libxlog: libxfs -+libxlog-install-dev: libxfs-install-dev - - ifneq ($(ENABLE_BLKID), yes) - mkfs: libdisk diff --git a/sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild b/sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild deleted file mode 100644 index f94f010..00000000 --- a/sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/"; -SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz - ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm 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[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[static-libs] ) - ) - nls? ( sys-devel/gettext )" - -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() { - epatch "${FILESDIR}"/${PN}-3.2.2-sharedlibs.patch - - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in || die - sed -i \ - -e '1iLLDFLAGS = -static' \ - {estimate,fsr}/Makefile || die - sed -i \ - -e "/LLDFLAGS/s:-static-libtool-libs:$(use static && echo -all-static):" \ - $(find -name Makefile) || die - - # libdisk has broken blkid conditional checking - sed -i \ - -e '/LIB_SUBDIRS/s:libdisk::' \ - Makefile || die - - # TODO: write a patch for configure.in to use pkg-config for the uuid-part - if use static && use readline ; then - sed -i \ - -e 's|-lreadline|\0 -lncurses|' \ - -e 's|-lblkid|\0 -luuid|' \ - configure || die - fi -} - -src_configure() { - export DEBUG=-DNDEBUG - export OPTIMIZER=${CFLAGS} - unset PLATFORM # if set in user env, this breaks configure - - local myconf - if use static || use static-libs ; then - myconf+=" --enable-static" - else - myconf+=" --disable-static" - fi - - econf \ - --bindir=/usr/bin \ - --libexecdir=/usr/$(get_libdir) \ - $(use_enable nls gettext) \ - $(use_enable readline) \ - $(usex readline --disable-editline $(use_enable libedit editline)) \ - ${myconf} - - MAKEOPTS+=" V=1" -} - -src_install() { - emake DIST_ROOT="${ED}" install - # parallel install fails on these targets for >=xfsprogs-3.2.0 - emake -j1 DIST_ROOT="${ED}" install-{dev,qa} - - # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript -a xfs xlog - # removing unnecessary .la files if not needed - use static-libs || find "${ED}" -name '*.la' -delete -}
