Install extra headers for libxfs #486514 by Stefan Reimer. Rewrite shared lib installs to only use libtool to avoid rpath issues.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 226 insertions, 15 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index a99e7c311b80..493c5cf87cf0 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.166 2013/10/18 08:17:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.167 2013/12/25 08:49:36 vapier Exp $
+
+*xfsprogs-3.1.11-r1 (25 Dec 2013)
+
+  25 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/xfsprogs-3.1.11-sharedlibs.patch, +xfsprogs-3.1.11-r1.ebuild:
+  Install extra headers for libxfs #486514 by Stefan Reimer. Rewrite shared lib
+  installs to only use libtool to avoid rpath issues.
 
 *xfsprogs-3.1.11 (18 Oct 2013)
 
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 1b64fead9a2c..4417fa902a96 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,26 +2,28 @@
 Hash: SHA256
 
 AUX xfsprogs-3.1.10-sharedlibs.patch 3196 SHA256 1f43e032cb05286c14eed7afcbd91aa8071f0d6d5a88195910264df3529a6992 SHA512 34a0084b981923ebdc22b425d73663c18aa253a64a2f739d177ef09f21a040c18595341f3fb714221146dba5a3f6fac1add1d385099f4eb5f2a0fea6725e9181 WHIRLPOOL 7ef85484c992b20397335af85fdf5b7e9e4169c8c19aafe6782aa366971e71dc6fa27b934a5d0fc7f1887a7c557b4425872aae373944f379c82f0e1d295cba92
+AUX xfsprogs-3.1.11-sharedlibs.patch 2534 SHA256 a38ac3d02a16f5e836aa097096352bc5522f8570c40acd96f391a05612fc392d SHA512 75b33b79b1819d33f1a6a4fca6527f94eb4f37d98c468d6837c26183a9cdce8e62624494325ddca79b569cc7936f5749980e7e22d87c08cb8bb4eb77feb81640 WHIRLPOOL 9fa6e548928bcab9b9daa95c9c59b1f76682b029ca24290d9ee1c9a28a8fd3536b3a952c8648a5ccaee6e5ef800dc7f69e83dc5078c59ba7f649f1273a85e4ad
 DIST xfsprogs-3.1.10.tar.gz 1375721 SHA256 9ec8dc77bf3bc114c3ba89f87316a32e3097efb3e7fc44df23421614bb21aa6c SHA512 c5ff72978e13fc74e4b0e5294d2a7e2efffda088051cd39c7f71629bbc5f9f4c694c4aff6b50e57d60d3bd0c15a90ddd18afc3697336cd8d2429939cc82554bb WHIRLPOOL 9c0f9b36de3314e8add80a20a227ec36cd582cf4f98eafaf55ad5fe14521eceaf9d202c9ac46968f73ce1c97233cbec45d8c421127ff31819f72bf0f9f18276a
 DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a WHIRLPOOL d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962
 EBUILD xfsprogs-3.1.10.ebuild 2640 SHA256 079803cdd85bfa4a649eedfd0fe0f0922c628530fbbaea1912a050d9bbe314ed SHA512 a5ff440e9dd311385f0d33f8efbf029bbe18edd13c98df475e24063660d56e9464d9a29097695e2587f5c597976ecc996e6d02321552f9d3e54ba838563f357c WHIRLPOOL bb2dff75020ea1189186e562e766a3ae13ec8904343f11fa6603cfb54241ede2894bc3addce5ffc2aac7b320e1fc735c5400b52db772ca907c7757a25722cac6
+EBUILD xfsprogs-3.1.11-r1.ebuild 2658 SHA256 d4704ba307d50485ae01dffad7ff21bfe8c06736f5e004e051dd7278326c98dc SHA512 fc5052e0cc6656240323fc0c788cc0ccd6d9ebbd5be084b27534a359d2add6eee6f0a7b45bb18cd15137e715f419154be3256453935aab10a80f286074bbbdeb WHIRLPOOL bebf7ee4d86572e138fcaf23083accba353bcbb573933b33ed55cbfa55f038c235cf69e9374cb9e904fb81d3854139b5b47802c31e6a76b31dc2f2ac987067a7
 EBUILD xfsprogs-3.1.11.ebuild 2656 SHA256 da09485b146c80d2f8be9a84467507201b654cc4ce5384efb860ef5d66aee305 SHA512 6010d5287f89db8f6e8592964ab23eecd88890eaca3c225ca6be369e5f52a2f9b97d46cb31404f35178563a6932acbc47dfd0e00d3c949802c1fcd506dc37a18 WHIRLPOOL 8da29625304b43e20d902acd6b861b472271a99b4ef470ce58e9ef4f1b00ea27bc42428a63fe1534fe61c451a7a211a6bea2ffcc4c4d188685492c67ff9696fc
-MISC ChangeLog 25466 SHA256 94a1267ca2d55bc5f008782ab21755f454f02a97d362d4408e7f41ed21dab622 SHA512 674ebccdbb8504e575ced8774a7f686ae64816ef2a96752f90c67fc91898bf054a7440dedb7a1808fc687f49dbee8d52630033626af6ca27a882014b6182ffee WHIRLPOOL 254ab1b3af5f097722540961b1599d04bda39e5903ff76f5f96224fa52be980a1b6649d825ca34da99bc45303e81c71f33dbd0de21209c9f2025c2325fa58591
+MISC ChangeLog 25751 SHA256 bf2b71f28f58aa895c2827b7110503309739abb73072c1a24db0613639185a44 SHA512 8e2e1a475876f0b5fb878547819c2d11056d60ed254a04fdb36a57990b34e8ca65309db57e8ec2f30b8fa8a1f2a332ae784aa3084e8533743d9a2bca11e0ee4d WHIRLPOOL aa08419e7c84ae3d80c828f2997123e1ad4226d0bf04f90698b6447f5148740209201e9faa5e56f7e233ea781f469e779fcc9c1a00b864cbd4629d19334a3d55
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSYO6pAAoJEPiazRVxLXTFzdUP/iXb811JfWdvSeWVCfqMQgM0
-8EtuY3CphNECwq7EDGW20yYWhTl/YeYtxM47iUfPrJhBIg2VsAw82lM3duvSVFbN
-Sq2sgkzfJ6sMVohn93UokpYf8SmH3N3DT3M4Ys9p2t0yvhChVFB5E5ImrZpsaJJJ
-oHf4cwFpWBZuRkGLEiTdLLSY8mOo3w5AXVsNmPl5Bl2uEVhm/vBhsWJUL3QetIqd
-IDvSaNnn2MuJH5y/aLGwjOHzTldf1h4TlrtC8xQ8yjukIJH6F+9sCn1vu0bX2N7u
-4CTKtUtGzH+5oZWzVsGnyIOYLFSObJhljw1ryODoHimnSR6sBGDFES6jtIJbpuyQ
-6NZHzjwYs+6RZkRus/GqqndB8rFUmQHMp6Ok6yg+gSjD/u41exDYLVsXE5/Ecg3S
-B4xE2EwSfeX36FPnhmWECIkUb+0WRiyYGJL5lcH46ykRmjxlPrzgfEMHTPiunnSA
-zD4zRY6PczynI6K72A3tPVUrzMfGXzlp01YIDHsMczmZ3qJk4hsCey8F5D5bOmEQ
-uOHvpAtv8U+oLpSP5H7+PireHfCQXDaiiD5onOBrxcqwfL4ASpmyZkCRmNQ6r4fU
-vZZI5mGwP+vvDENpfdqb66IWPQV5g14ifM2rILS71mKP5ZSNqBIZ0cZsY7CfR6Q2
-DRnkZ7oVmSklJ/CAK5rx
-=aJ1A
+iQIcBAEBCAAGBQJSupwhAAoJELEHsLL7fEFWI0oQAINv7oMKwAaG/r796XH5uxgR
+McjdQIPqBedaYjZwSwcpeu1C/T9TulhbzlGardwKOoEgorgo4ZInV8ZJ1M2iseDy
+XtUnFanumErc6uFTNgR7RzKadpFrMxRKMH9ZAQTnVTgcy+if13iDk4gA3VzVSaFl
+gZGUH2EzePDskqhQoWwnJ4TkG07jjv62N4h2kgCs2pmxozHYOF2s6WcSARgwk1aH
+Re+OSkt/uVm3BNxfDec8FrHsQR7Xav0LUxuSle84gpH8FLi3eq/+9rm2ymMOnY+Q
+CW+yZxbShRJe1J9XWtE1q/ONly26Euc0sP3KLUErn/W8Pd2TDlcZLz3IOxJmnk0r
+bWgdVmg0h3MFPZ/gyojCYfzPR9uPyrEYlmmq8TIVG27IX9MNEM2XjKWdDZX+MZF5
+jpiPxRACGwQ50V0RtBOQzxk5Jjo7EQVw3WtFTI6RvZo5ugrQFlNoB+t4HwgboMb0
+ivoLdlL7d9QqLMx59YJPzCbfjZ09XpblFmCFSu5e08WgvIjDCtmIP++ddDqRyDIP
+Eg9Z0U32/JNF3JEezij4gxKHPI+THUhZzhs7Lwj7NrotuZiAluhhew3ljfSldmrK
+R4/rS4M5XcWBK3dGZL1koFad/dE7j4wadBuUpqaHyiOfZy3NJf1wrASb3D18COt1
+VpLfPbTi56yeV3sGEIEd
+=3kfN
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.11-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.11-sharedlibs.patch
new file mode 100644
index 000000000000..38599bd651fa
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-3.1.11-sharedlibs.patch
@@ -0,0 +1,106 @@
+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.
+
+--- a/libdisk/Makefile
++++ b/libdisk/Makefile
+@@ -25,6 +25,7 @@
+ install: default
+ 
+ install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ install-qa: install-dev
+ 
+--- a/libhandle/Makefile
++++ b/libhandle/Makefile
+@@ -20,7 +20,6 @@
+ include $(BUILDRULES)
+ 
+ install: default
+-	$(INSTALL_LTLIB)
+ 
+ install-dev: default
+ 	$(INSTALL_LTLIB_DEV)
+--- a/libxcmd/Makefile
++++ b/libxcmd/Makefile
+@@ -32,6 +32,11 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev install-qa: default
++install: default
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
++
++install-qa: default
+ 
+ -include .dep
+--- a/libxfs/Makefile
++++ b/libxfs/Makefile
+@@ -41,5 +41,6 @@
+ install: default
+ 
+ install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ install-qa: default
+--- a/libxlog/Makefile
++++ b/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 .dep
+--- a/Makefile
++++ b/Makefile
+@@ -66,6 +66,8 @@
+ mkfs: libxfs
+ quota: libxcmd
+ repair: libxfs libxlog
++libxlog: libxfs
++libxlog-install-dev: libxfs-install-dev
+ 
+ ifneq ($(ENABLE_BLKID), yes)
+ mkfs: libdisk
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -71,17 +71,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 test "x$(PKG_LIB_DIR)" != "x$(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
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild
new file mode 100644
index 000000000000..ab4e2f5f9a64
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild,v 1.1 2013/12/25 08:49:36 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 ~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.1.11-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 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 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
+}