From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 658391382C5 for ; Mon, 26 Feb 2018 10:01:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E2BAE0937; Mon, 26 Feb 2018 10:01:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1DF2E0937 for ; Mon, 26 Feb 2018 10:01:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 285CB335C09 for ; Mon, 26 Feb 2018 10:01:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 739CD1E8 for ; Mon, 26 Feb 2018 10:01:33 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1519639283.2517dd766cf84d251631f4324f7ec4bce912abb9.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/xfsprogs/Manifest sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild X-VCS-Directories: sys-fs/xfsprogs/ sys-fs/xfsprogs/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 2517dd766cf84d251631f4324f7ec4bce912abb9 X-VCS-Branch: master Date: Mon, 26 Feb 2018 10:01:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 06b75e6c-f88a-4724-bd95-6fed1b37b68b X-Archives-Hash: 177831ac3cf11dc55f2985f1324cbb06 commit: 2517dd766cf84d251631f4324f7ec4bce912abb9 Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 26 10:01:23 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 26 10:01:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2517dd76 sys-fs/xfsprogs: Bump to version 4.15.0 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-fs/xfsprogs/Manifest | 1 + sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch | 11 ++ .../files/xfsprogs-4.15.0-sharedlibs.patch | 114 +++++++++++++++++++++ sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild | 96 +++++++++++++++++ 4 files changed, 222 insertions(+) diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 522eafb116f..897ba826eb8 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,2 +1,3 @@ DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506 +DIST xfsprogs-4.15.0.tar.xz 1186416 BLAKE2B a7d8c74498231e63a0fe7c5a37366852ed8dbe1db6d2deff8c4500c8e113f2e5180e547cdeabc87629922d184982bacb4be40969b78b87fcc07c5c29f22972bd SHA512 78d67a603c45a0d2b69d2cd0f7400b1e2c7b8b9bca3fa78529b8558bebda082e24d683d275ca546bb63c6cfd53d3b6048109b815e9fc5ced34d1c32533c2e77f DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7 diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch new file mode 100644 index 00000000000..53ba3ec0f5d --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch @@ -0,0 +1,11 @@ +--- xfsprogs-4.15.0/scrub/Makefile ++++ xfsprogs-4.15.0/scrub/Makefile +@@ -25,7 +25,7 @@ + CRONTABS = xfs_scrub_all.cron + OPTIONAL_TARGETS += $(CRONTABS) + # Don't enable the crontab by default for now +-CROND_DIR = $(PKG_LIB_DIR)/$(PKG_NAME) ++CROND_DIR = $(PKG_DOC_DIR) + endif + + endif # scrub_prereqs diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch new file mode 100644 index 00000000000..1080e440094 --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch @@ -0,0 +1,114 @@ +--- 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/xfsprogs-4.15.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild new file mode 100644 index 00000000000..148d4aa1cf8 --- /dev/null +++ b/sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs multilib systemd + +DESCRIPTION="xfs filesystem utilities" +HOMEPAGE="http://oss.sgi.com/projects/xfs/" +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(+)]} ) + !=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 + use static-libs || find "${ED}" -name '*.la' -delete +}