[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/

[Lars Wendler]

commit:     956ccb6f1f4040f7011825b75c4c5070cc1dceef
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 16:31:21 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 16:32:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956ccb6f

sys-fs/xfsprogs: Bump to version 4.8.0 (bug #601086).

Package-Manager: portage-2.3.2

 sys-fs/xfsprogs/Manifest              |  1 +
 sys-fs/xfsprogs/xfsprogs-4.8.0.ebuild | 95 +++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 5a40814..318a5f4 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,3 +1,4 @@
 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/xfsprogs-4.8.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.8.0.ebuild
new file mode 100644
index 00000000..600fdc7
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-4.8.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="http://oss.sgi.com/projects/xfs/"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+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: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.7.0-sharedlibs.patch
+	"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
+	"${FILESDIR}"/${PN}-4.3.0-cross-compile.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() {
+	epatch "${PATCHES[@]}"
+
+	# 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
+	if use static || use static-libs ; then
+		myconf+=" --enable-static"
+	else
+		myconf+=" --disable-static"
+	fi
+
+	econf \
+		$(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 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
+}