Version bump.

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

3 files changed, 119 insertions, 6 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index 93aa201a0c98..e63a527add36 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.133 2011/04/12 17:25:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.134 2011/11/06 04:56:17 vapier Exp $
+
+*xfsprogs-3.1.6 (06 Nov 2011)
+
+  06 Nov 2011; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.1.6.ebuild:
+  Version bump.
 
 *xfsprogs-3.1.5 (12 Apr 2011)
 
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 15329d4da942..7cda44d2c0db 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX xfsprogs-3.1.1-sharedlibs.patch 3155 RMD160 50be1dfe1ce5bfca949cb9ca350398a9a9140c44 SHA1 731bd98af57ca163dba9c55e0cdfd36ed8dfeb96 SHA256 4faf261ea393421297a15745fcda184aa088ec5b1456f0fdf92c2053070ebf00
 DIST xfsprogs-3.1.4.tar.gz 1377412 RMD160 8085c82cfaa8f2efa1496fa851d22c53866cb59d SHA1 54472812ecf2f0e5e3addcdef639895dd80081f8 SHA256 1cdceb890622dbe7b9d42b9b81f37bb9f7d380b44606db138cf7c4676ad0a1a6
 DIST xfsprogs-3.1.5.tar.gz 1403198 RMD160 c1886836aa4fe09e0883d586ede232e1e404575c SHA1 2d25b54bed63e46330aeae72f3272a667ec8946e SHA256 13347de43203c4575bca7a72efb344c7caf8a86fa216bbd69bf1980f2fb2f37f
+DIST xfsprogs-3.1.6.tar.gz 1405389 RMD160 c92777600a7db55d3ebdf7837dab04a4e67f73bd SHA1 a1e5ab75919e80ada991f42d078363cba2f0f689 SHA256 a34ff643fda76f97a8e0842ae87cc86e70fb801f0388f5265e46d2ec3a0f20aa
 EBUILD xfsprogs-3.1.4.ebuild 2745 RMD160 ae8061f23e58c3d5dad6781ae757183d3b7beb91 SHA1 770d6145e38642c2a4a927797d939d911d686ecf SHA256 19799432858cce4b66e13d259b6a5f9e8c76d8dc70ad2be2ae544ac3878598fc
 EBUILD xfsprogs-3.1.5.ebuild 2758 RMD160 f36582108312bd4533357aeb8f0643ac5ad440cb SHA1 bf79dc33ac2af54e99a4f20c3f853e5ae1e3975a SHA256 6dea1e610221a7c1c328a90ed054ee254ff2d4b383988e581ac30c35e2a5fc6e
-MISC ChangeLog 21114 RMD160 f9022ee286ac02a34825fc557d52844727a6fa9b SHA1 e019fc1894833c4ae93982d9b0710e2b40e111aa SHA256 d3bf36fb76a44566dfae1becadd81b2102ec7d17c42e80c0734bd0c79c77b0d5
+EBUILD xfsprogs-3.1.6.ebuild 2758 RMD160 3844c757b3645d749f5b5f17a6461d384b69e380 SHA1 82408ac221f1076329ab0be6ce878b28094326f0 SHA256 f92815871e724609d5c8c5da5d256ea9244ee6226524615f9b1e8e017cca314b
+MISC ChangeLog 21236 RMD160 f0d6e79cd2f77c46d3876bf89f4dc064b01a4c8d SHA1 860cbb5ee3c1eeaf89d995316a15469ec3c9c6a4 SHA256 c66180098381c7f6b42867e9370dc59f7f2b73c30b95fda01f8f4d83eb2e7372
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk2kiwYACgkQaC/OocHi7JagOgD+NK9vZErI60Su8nEN8VqHvMDq
-8Z/9zjHONp62WKT9jSEBAJxV27ZSB5IB8SvPakdNvyYqCCvF6hF6PQjR20vMjt+i
-=nPIe
+iF4EAREIAAYFAk62E4EACgkQaC/OocHi7JaTvQD/biOoNuYnkXKM75B0ARFiFuhD
+fHUgDY2qZ5qB4gwGngMA/0Yc+svas5kp51F7nAhBmBxRsMAEWtB0vXcdOk/liPdL
+=18kh
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild
new file mode 100644
index 000000000000..52ac7d0799b2
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild,v 1.1 2011/11/06 04:56:18 vapier Exp $
+
+EAPI="3"
+
+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"
+
+RDEPEND=">=sys-apps/util-linux-2.17.2
+	!<sys-fs/xfsdump-3
+	readline? (
+		sys-libs/readline
+		static? ( sys-libs/ncurses )
+	)
+	!readline? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+	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
+
+	if use static && use !static-libs ; then
+		ewarn "Can't build a static variant of the executables without static-libs."
+		ewarn "Static libs will also be built."
+	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="${D}" install install-dev || die
+	prepalldocs
+
+	# handle is for xfsdump, the rest for xfsprogs
+	gen_usr_ldscript -a xfs xlog
+	# removing unnecessary .la files if not needed
+	use static-libs || rm -f "${D}"/usr/lib*/*.la
+}