Migrate to EAPI=4 and fix static-libs handling #410251 by Fernando V.

Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64

3 files changed, 125 insertions, 6 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index 2991f695ee97..d91d5a453de0 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.141 2012/03/30 17:06:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.142 2012/03/30 21:40:27 vapier Exp $
+
+*xfsprogs-3.1.7-r1 (30 Mar 2012)
+
+  30 Mar 2012; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.1.7-r1.ebuild:
+  Migrate to EAPI=4 and fix static-libs handling #410251 by Fernando V.
 
   30 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org> xfsprogs-3.1.4.ebuild,
   xfsprogs-3.1.5.ebuild, xfsprogs-3.1.6.ebuild, xfsprogs-3.1.7.ebuild:
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 33fa9b79ef89..f7ea15bbe894 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -9,13 +9,24 @@ DIST xfsprogs-3.1.7.tar.gz 1401080 RMD160 2904c13eaf28b02ac6b81afd1d15fe751bc9a7
 EBUILD xfsprogs-3.1.4.ebuild 2843 RMD160 7fdb78a916c4baf5049ab0d9dbdcf02e422da155 SHA1 53a1a681c4c9093caf5fa321db83237bbdf0051c SHA256 1e2c69f700b451b38402bce579fae7f324750668d5a9efc0cb8edd47507b0fd7
 EBUILD xfsprogs-3.1.5.ebuild 2853 RMD160 a0501a6047b2b874a52b1c675f00da836698dc66 SHA1 45b9a47c11ddf480ab35f7ec83e8ade3bec35581 SHA256 18a0a2bac09bb67c88d42e5c8ff0a13dfd291201059a9093c05f02685f57e0f6
 EBUILD xfsprogs-3.1.6.ebuild 2853 RMD160 15a91b921e235d2e39678afee420f6fbe653f056 SHA1 4c1399f8ecfbc2e9892e88845d34d85dda23df70 SHA256 a311d243f4e8220e7350f31e393244cbcdaae245cd549ab9213bb51a8f1f13e8
+EBUILD xfsprogs-3.1.7-r1.ebuild 2769 RMD160 0006400f690f7a23720f5d0edd4892177ebad98f SHA1 967ce08a68db70a8b598df0c04f3245ac2c3c00c SHA256 e7bc1e4b4ac30fb9891b31d88945c3929a0394f1a1f328db4d20028d0505cc84
 EBUILD xfsprogs-3.1.7.ebuild 2847 RMD160 967f98334bce3ba15f63884b688cc62e1dbfabde SHA1 226def6e316c593f870c87adb47abc6f5357a9f2 SHA256 8d291edd8c0a966e2af6106b331fffc354c10222a1197c7d3d7b9fa98e418ab3
-MISC ChangeLog 22145 RMD160 fa4b715a4ad372efc151a48e51335b6005317d0c SHA1 04a2eab1fa2b071114d83789e6a2d2d7a6bc571b SHA256 b58d2ae5bb6312bbdc0f1ddf7cee89afc6f0e1978869575eee1340d8c793422c
+MISC ChangeLog 22326 RMD160 cd5c687baf0c1d25342779f796c29d6dcc375ead SHA1 4d5aef22a3611f92d2b734207516ee7e5ae63ce3 SHA256 919a21c25c41493ea35c8923b57d74478b566eb2c3892738b9fb65704d1e24b0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk916B4ACgkQAiZjviIA2Xjf5gCgsusfg1hvr9mlWJnG+GAtbLCO
-INwAoLKbQtfoNbGQOKoJUmlXimLV1IUM
-=J+hI
+iQIcBAEBAgAGBQJPdihaAAoJELEHsLL7fEFWyHYP/0NqwUG4VPu7IJ5MIKls2Dko
+wbZfZNjlNOCa3q8xItdk0vDLgEDtuBmkDZ7ynu2UJSJmb4W5844yayIWXYx+cez8
+SmeNCRYk5uTpLIKuZk54BeW0MT3jnfFoUFe3DxakEOBcFW0pIb0PL3JX3LneA36j
+a3l3wWFUWEq5GK1tE1dxui6Oi0ucPDfM/E+3XM/Bw/yMD95fqrTvwne6likFhnr7
+i7nDj1MYGTvF8WTwTlRlO7ihtJp4miHuW5Xq0ONtvSbkQgunEL9aI2EXQTyWa3+C
+9A4C4+JRtrO75/pbKwTouxZpuFf/kEgVwctlSzisxHieMXYsaGOVhlwXsQM2jPuI
+IFwpif/rGPTH9QiicNYfui1HSM8KUT1Wf2Cunm8+rYG1/Td9XpyVfq3au/FXWZIX
+jpQqcNVUsxWFNlX5lTmS1BOx1B9ql1Oyi4tB60EY2mB6J2aiLidmIAVOqpf9oXrx
+7ONHg5yzcnhHjzstqM4f4uQ4z5jNWfTeJuXBluIqF2Nb7vz07pr9PLQ/M0CWFONf
+JuONmbaywyMvtFi5y5lO8ZkMXG/62kBFJUNzIzDENNzXn0kQqKHZwMFzM4UUvlVF
+6qbLlrEKOoZURB3QhTLQswGfuKYM2zwxwWISZfV9b2LnexRdxb51tMXOY3w7XOCO
+GLxbZ50pg8NXYSZPk9YK
+=8ucs
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild
new file mode 100644
index 000000000000..d1368434a6d5
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild,v 1.1 2012/03/30 21:40:27 vapier Exp $
+
+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 ~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.1.1-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:$(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 readline ; then
+		myconf="--enable-readline --disable-editline"
+	elif use libedit ; then
+		myconf="--disable-readline --enable-editline"
+	else
+		myconf="--disable-readline --disable-editline"
+	fi
+
+	if use static || use static-libs ; then
+		myconf="${myconf} --enable-static"
+	else
+		myconf="${myconf} --disable-static"
+	fi
+
+	econf \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/$(get_libdir) \
+		$(use_enable nls gettext) \
+		${myconf}
+
+	MAKEOPTS+=" V=1"
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install install-dev
+
+	# 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
+}