Version bump (bug #311109), added deps for readline/libedit, added static-libs use flag, changed dependency from e2fsprogs to util-linux, thanks to Hendrik Leppkes for the updated patch.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 240 insertions, 12 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index e0106b378f88..a159016241a0 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.123 2010/05/11 20:50:42 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.124 2010/06/03 21:25:55 dev-zero Exp $
+
+*xfsprogs-3.1.2 (03 Jun 2010)
+
+  03 Jun 2010; Tiziano Müller <dev-zero@gentoo.org>
+  +files/xfsprogs-3.1.1-sharedlibs.patch, +xfsprogs-3.1.2.ebuild:
+  Version bump (bug #311109), added deps for readline/libedit, added
+  static-libs use flag, changed dependency from e2fsprogs to util-linux,
+  thanks to Hendrik Leppkes for the updated patch.
 
   11 May 2010; Joseph Jezak <josejx@gentoo.org> xfsprogs-3.0.3.ebuild:
   Marked ppc/ppc64 stable for bug #311381.
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 425bac30573d..39c098d3353e 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,14 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xfsprogs-2.10.1-headers.patch 185 RMD160 74ac7ac38b5f5a8b2b303495d85414029a908630 SHA1 13a793d7382273918599066667672a2c75d155bd SHA256 3adf0282b07533e0bec9d4789f650ab5c700d5fb3a937a276d10021014c5011f
 AUX xfsprogs-2.10.1-parallelmake.patch 755 RMD160 cc4a37bc62b9b190982200d0aa34568bc1caaa86 SHA1 f20e87d5094e65193a264ba0cbe628505e9461c8 SHA256 0f973731856e95e645eba9ddea2978c97cab8714242ac1dffa1a569934dc07e2
 AUX xfsprogs-2.8.18-symlinks.patch 339 RMD160 8e2026b0b5c8be70dfcaba94f53ac9211ac6b1a2 SHA1 d7b9387d71556e18ebd6f65fd3a52bc323162844 SHA256 e1b168babbce2e4e18757827b6f53248408fa299ea345def0fb650b8f79f2d16
 AUX xfsprogs-3.0.0-parallel-build.patch 884 RMD160 8421d1817db6fe00562772fd0026c2fc20f76682 SHA1 a2009c0f03baa6717b544c9317511bead0cc0881 SHA256 fde2124871cd690d9da10cbc3e9c28c56ff2c982e448bf8b0864ebe80a9a7925
 AUX xfsprogs-3.0.1-sharedlibs.patch 2453 RMD160 782f49a1842586d7319872730810c92e967b8a2e SHA1 109f89f130d46a8044c7676976d34c183db12f28 SHA256 57152260aa118159533133e7c1e0e20181237c428ce282f6c70f3c9767cd058b
+AUX xfsprogs-3.1.1-sharedlibs.patch 2893 RMD160 e3cbbf4a55f60a5968a084942e65e546c398b174 SHA1 0d7cbb29ece10589311e602d5c511007d69438a5 SHA256 8d29620f5992572a25ec3c0759c0efe289151ac7b0d8fb87ce2f031f9ca2fd77
 DIST xfsprogs-3.0.0.tar.gz 975597 RMD160 2b8d55571340e0aaedbc1e4327f7296ef89a4a3f SHA1 b0054e309ed15972ab7d90096789f1c2cb958b96 SHA256 d7a3e8e6919859c9bb5a6786ecafc3183d2d64ca3935d0cff6fdc66c40503396
 DIST xfsprogs-3.0.1.tar.gz 1270775 RMD160 4fc46697268c0459cfa2481e5d1b9f43d821fbcd SHA1 0961049eb2756765dd926c3ed13cb0b5bf8268d0 SHA256 19f75133a720f3b3736c90f05adf514db3f0ac10c8cd0422878d700f8ffecb38
 DIST xfsprogs-3.0.3.tar.gz 1336000 RMD160 ae7195e176b02b4ec0c54b32599aec69f267d52c SHA1 621653d73227c5c273f0dd8972998b4c8dad3eb1 SHA256 58b33a4b19ee85eb14d5c3908fa60ce822d1eccc89f1a9b7839171ab576c0d95
+DIST xfsprogs-3.1.2.tar.gz 1375497 RMD160 9ac4a99df3e97928e3b991f236eecab03401d80b SHA1 e96465819b496adf0156bb53313fc1ad884debc6 SHA256 9128046ea978a65560b0e87406af9646a283fa0b54eab1801b971d8a89086ddd
 DIST xfsprogs_2.10.1-1.tar.gz 1005228 RMD160 c68bd6eeaca88a94ee0898bef15c1d6b8d624539 SHA1 10cea2e56d202990a621a9b5b80061abab3aeb37 SHA256 2c0b17e594729b5b77d1ca90b4fa7e4a4da751324736fdb3a0c742252f929c0a
 DIST xfsprogs_2.10.2-1.tar.gz 1004686 RMD160 8877f36d16ec236bf826aa3e84a9413bfed3fbdc SHA1 86e5a42a21b0ba78638e16b75d99dadc49e97cce SHA256 220a9911153f9b51d4417188ee751d2ee2e1f112427e52402d05b46f235763cf
 EBUILD xfsprogs-2.10.1.ebuild 1701 RMD160 d22ebed4348bce617bb776f16613bce7efbaf28a SHA1 765fcfc43fc2801595bfc7e01814bca1075e14ae SHA256 2cd933911eea6a6879830d8f818b4db8ed306ae2f63f6333e22cb3dc14a5cd0a
@@ -16,12 +15,6 @@ EBUILD xfsprogs-2.10.2.ebuild 1781 RMD160 cd515a142ab9f62b1ab6a06b75f667ce434ea6
 EBUILD xfsprogs-3.0.0.ebuild 1325 RMD160 2d32d671cc4bd9a1206c658b045646e30958420c SHA1 0cd586c40a4bda93910ec597fae06203bbc53940 SHA256 4bde79cb29ef148f72463c7f355754be5e667c63f8187560e2732b1a55277373
 EBUILD xfsprogs-3.0.1-r1.ebuild 1533 RMD160 4870e8f96bb2d45f05f83040fec8d4b697a33d5d SHA1 1fa14067534d640fe1a1650539904370fbf7a69e SHA256 904504f0e138a917316f971d0a3622bebd94888451b6ba8b3123f57cd03a52f9
 EBUILD xfsprogs-3.0.3.ebuild 1526 RMD160 1384dad6ab5a2caafce5bdaa02537e5d9f374207 SHA1 d8dc3f723755d285e22945448c08aded90b6e1f4 SHA256 47e74e9f9db9864f8e77f536809157d3fe8a0d526c4eb827e6b396735d04b5c9
-MISC ChangeLog 19515 RMD160 1afe575f056ae3bcd2464bb540ad8add4b0def8b SHA1 e0b42ab0b7cbfbdfb386079427fd759a04003242 SHA256 e09cb8b5790ba3d02690f04a1d17514ab9996d7e787b759c08de9accef9e0b8e
+EBUILD xfsprogs-3.1.2.ebuild 3196 RMD160 0e67e0c7e8cea5641282d7056f3736ec474f0408 SHA1 61db588dbde0c14dca6a13d395f0cdbd1db910b1 SHA256 824a49e63d9641a9fbaa445c7ca79a11f032cdc10d56e2192be8245c95133441
+MISC ChangeLog 19861 RMD160 596bf246acffe5f832f480028c181d4e27d06254 SHA1 7cf5b2dd22363e82f2a7d79f1f6412d4d2ca4b4d SHA256 d72c8e003c98afb839606e3e624c9b1e6eb4a236abe7e382db604af7b4601db0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvpwv8ACgkQcsIHjyDViGR9SgCcDejPDyNmeFSJ80nw8+aE6Jry
-6E8AoNHvc/KIMWbuBxHBBTIpW7sOsED3
-=Ov9B
------END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
new file mode 100644
index 000000000000..4e16dd9f477a
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
@@ -0,0 +1,112 @@
+diff --git a/Makefile b/Makefile
+index 83d1b0a..3e4217d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -66,6 +66,7 @@ io: libxcmd libhandle
+ mkfs: libxfs
+ quota: libxcmd
+ repair: libxfs libxlog
++libxlog: libxfs
+ 
+ ifneq ($(ENABLE_BLKID), yes)
+ mkfs: libdisk
+diff --git a/include/buildmacros b/include/buildmacros
+index 62babca..0a3c5ba 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -71,17 +71,9 @@ endif
+ # /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
++	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/libdisk/Makefile b/libdisk/Makefile
+index 32416a5..7a144c0 100644
+--- a/libdisk/Makefile
++++ b/libdisk/Makefile
+@@ -25,8 +25,10 @@ default: ltdepend $(LTLIBRARY)
+ include $(BUILDRULES)
+ 
+ install: default
++	$(INSTALL_LTLIB)
+ 
+ install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ install-qa: install-dev
+ 
+diff --git a/libxcmd/Makefile b/libxcmd/Makefile
+index 60b6f9e..38e53a6 100644
+--- a/libxcmd/Makefile
++++ b/libxcmd/Makefile
+@@ -32,6 +32,12 @@ default: ltdepend $(LTLIBRARY)
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev install-qa: default
++install: default
++	$(INSTALL_LTLIB)
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
++
++install-qa: default
+ 
+ -include .dep
+diff --git a/libxfs/Makefile b/libxfs/Makefile
+index 8f80cdc..fcba668 100644
+--- a/libxfs/Makefile
++++ b/libxfs/Makefile
+@@ -41,8 +41,10 @@ default: ltdepend $(LTLIBRARY)
+ include $(BUILDRULES)
+ 
+ install: default
++	$(INSTALL_LTLIB)
+ 
+ install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ install-qa: default
+ 
+diff --git a/libxlog/Makefile b/libxlog/Makefile
+index 7358fb1..666ea77 100644
+--- a/libxlog/Makefile
++++ b/libxlog/Makefile
+@@ -12,6 +12,8 @@ LT_AGE = 0
+ 
+ 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,12 @@ default: ltdepend $(LTLIBRARY)
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev install-qa: default
++install: default
++	$(INSTALL_LTLIB)
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
++
++install-qa: default
+ 
+ -include .dep
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild
new file mode 100644
index 000000000000..d824d7f74a89
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild,v 1.1 2010/06/03 21:25:55 dev-zero 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? (
+		!libedit? ( sys-libs/readline
+			static? ( sys-libs/ncurses )
+		)
+	)
+	libedit? ( dev-libs/libedit )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "You enabled both readline and libedit support but only one can be supported"
+		ewarn "Using libedit. Please disable the libedit USE flag if you want readline."
+	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 include/builddefs.in failed"
+	sed -i \
+		-e '1iLLDFLAGS = -static' \
+		{estimate,fsr}/Makefile || die "sed failed"
+
+	sed -i \
+		-e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
+		$(find -name Makefile) || die "sed failed"
+
+	# 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 "sed failed"
+	fi
+}
+
+src_configure() {
+	export DEBUG="-DNDEBUG"
+	export OPTIMIZER="${CFLAGS}"
+	unset PLATFORM # if set in user env, this breaks configure
+
+	local myconf=""
+
+	if use libedit ; then
+		myconf="--disable-readline --enable-editline"
+	elif use readline ; then
+		myconf="--enable-readline --disable-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 static-libs static) \
+		$(use_enable nls gettext) \
+		${myconf}
+
+	MAKEOPTS="${MAKEOPTS} V=1"
+}
+
+src_install() {
+	# TODO: there is a seldomly triggered parallel install problem where
+	# libxfs.so doesn't get installed before rdeps causing the relink to fail
+	emake -j1 DIST_ROOT="${D}" install install-dev || die "emake install failed"
+
+	dosym libxfs.so.0 /$(get_libdir)/libxfs.so
+	dosym libxlog.so.0 /$(get_libdir)/libxlog.so
+
+	# removing duplicated libraries
+	rm "${D}"/lib*/lib{handle,xcmd}.* "${D}"/usr/lib*/lib{xfs,xlog}.so*
+
+	# removing unnecessary .la files if not needed
+	( use static || use static-libs ) || rm -rf "${D}"/usr/lib*/*.la
+
+	# handle is for xfsdump, the rest for xfsprogs
+	gen_usr_ldscript libxfs.so libxlog.so
+	prepalldocs
+}
+