Clean up library install and prefer readline over editline like upstream #311109.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 94 insertions, 196 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index a159016241a0..e568baf682ee 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.124 2010/06/03 21:25:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.125 2010/08/17 13:14:59 vapier Exp $
+
+  17 Aug 2010; Mike Frysinger <vapier@gentoo.org> -xfsprogs-3.0.0.ebuild,
+  -xfsprogs-3.0.1-r1.ebuild, files/xfsprogs-3.1.1-sharedlibs.patch,
+  xfsprogs-3.1.2.ebuild:
+  Clean up library install and prefer readline over editline like upstream
+  #311109.
 
 *xfsprogs-3.1.2 (03 Jun 2010)
 
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
index 4e16dd9f477a..8d63ccdb3a24 100644
--- a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
+++ b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
@@ -1,45 +1,8 @@
-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)
+ripped from PLD Linux
+
+--- xfsprogs-3.1.2/libdisk/Makefile
++++ xfsprogs-3.1.2/libdisk/Makefile
+@@ -25,8 +25,10 @@
  include $(BUILDRULES)
  
  install: default
@@ -50,11 +13,9 @@ index 32416a5..7a144c0 100644
  
  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)
+--- xfsprogs-3.1.2/libxcmd/Makefile
++++ xfsprogs-3.1.2/libxcmd/Makefile
+@@ -32,6 +32,12 @@
  
  include $(BUILDRULES)
  
@@ -68,26 +29,21 @@ index 60b6f9e..38e53a6 100644
 +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)
+--- xfsprogs-3.1.2/libxfs/Makefile
++++ xfsprogs-3.1.2/libxfs/Makefile
+@@ -41,7 +41,9 @@
  include $(BUILDRULES)
  
  install: default
-+	$(INSTALL_LTLIB)
++	$(INSTALL_LTLIB_ROOT)
  
  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
+--- xfsprogs-3.1.2/libxlog/Makefile
++++ xfsprogs-3.1.2/libxlog/Makefile
+@@ -12,6 +12,8 @@
  
  CFILES = xfs_log_recover.c util.c
  
@@ -96,13 +52,13 @@ index 7358fb1..666ea77 100644
  # don't want to link xfs_repair with a debug libxlog.
  DEBUG = -DNDEBUG
  
-@@ -19,6 +21,12 @@ default: ltdepend $(LTLIBRARY)
+@@ -19,6 +21,12 @@
  
  include $(BUILDRULES)
  
 -install install-dev install-qa: default
 +install: default
-+	$(INSTALL_LTLIB)
++	$(INSTALL_LTLIB_ROOT)
 +
 +install-dev: default
 +	$(INSTALL_LTLIB_DEV)
@@ -110,3 +66,54 @@ index 7358fb1..666ea77 100644
 +install-qa: default
  
  -include .dep
+--- xfsprogs-3.1.2/Makefile
++++ xfsprogs-3.1.2/Makefile
+@@ -66,6 +66,7 @@
+ mkfs: libxfs
+ quota: libxcmd
+ repair: libxfs libxlog
++libxlog: libxfs
+ 
+ ifneq ($(ENABLE_BLKID), yes)
+ mkfs: libdisk
+--- xfsprogs-3.1.2/include/buildmacros
++++ xfsprogs-3.1.2/include/buildmacros
+@@ -56,11 +56,13 @@
+ endif
+ 
+ ifeq ($(ENABLE_SHARED),yes)
+-INSTALL_LTLIB = \
++_INSTALL_LTLIB = \
+ 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
++	../$(INSTALL) -m 755 -d $(1); \
++	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(1); \
++	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(1)
++INSTALL_LTLIB_ROOT = $(call _INSTALL_LTLIB,$(PKG_ROOT_LIB_DIR))
++INSTALL_LTLIB = $(call _INSTALL_LTLIB,$(PKG_LIB_DIR))
+ endif
+ 
+ # Libtool thinks the static and shared libs should be in the same dir, so
+@@ -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
++	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.0.0.ebuild b/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild
deleted file mode 100644
index 5388bdadfb69..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild,v 1.4 2009/02/24 05:11:32 vapier Exp $
-
-inherit eutils toolchain-funcs autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="sys-fs/e2fsprogs
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-parallel-build.patch #260005
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die "sed include/builddefs.in failed"
-	eautoconf
-}
-
-src_compile() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-	econf \
-		--bindir=/usr/bin \
-		--sbindir=/sbin \
-		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable nls gettext) \
-		|| die "config failed"
-	emake || die
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-dev || die "make install failed"
-	gen_usr_ldscript -a handle
-	prepalldocs
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-3.0.1-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-3.0.1-r1.ebuild
deleted file mode 100644
index 8ab2c0fda86f..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.0.1-r1.ebuild,v 1.2 2009/09/19 04:55:46 robbat2 Exp $
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~arm"
-IUSE="nls static"
-
-RDEPEND="sys-fs/e2fsprogs
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sharedlibs.patch
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die "sed include/builddefs.in failed"
-	sed -i '1iLLDFLAGS = -static' {estimate,fsr}/Makefile
-	sed -i \
-		-e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
-		$(find -name Makefile)
-}
-
-src_compile() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-	econf \
-		--bindir=/usr/bin \
-		--sbindir=/sbin \
-		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable nls gettext) \
-		|| die "config failed"
-	emake || die
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-dev || die "make install failed"
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a disk handle xfs xlog
-	prepalldocs
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild
index 3098fcedb278..c762ec8e4b9e 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2010/06/04 02:27:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild,v 1.3 2010/08/17 13:14:59 vapier Exp $
 
 EAPI="3"
 
@@ -19,18 +19,17 @@ 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 )
-		)
+		sys-libs/readline
+		static? ( sys-libs/ncurses )
 	)
-	libedit? ( dev-libs/libedit )"
+	!readline? ( 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."
+		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
@@ -40,7 +39,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.1-sharedlibs.patch"
+	epatch "${FILESDIR}"/${PN}-3.1.1-sharedlibs.patch
 
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
@@ -64,16 +63,16 @@ src_prepare() {
 }
 
 src_configure() {
-	export DEBUG="-DNDEBUG"
-	export OPTIMIZER="${CFLAGS}"
+	export DEBUG=-DNDEBUG
+	export OPTIMIZER=${CFLAGS}
 	unset PLATFORM # if set in user env, this breaks configure
 
-	local myconf=""
+	local myconf
 
-	if use libedit ; then
-		myconf="--disable-readline --enable-editline"
-	elif use readline ; then
+	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
@@ -87,28 +86,18 @@ src_configure() {
 	econf \
 		--bindir=/usr/bin \
 		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable static-libs static) \
 		$(use_enable nls gettext) \
 		${myconf}
 
-	MAKEOPTS="${MAKEOPTS} V=1"
+	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
+	emake DIST_ROOT="${D}" install install-dev || die
+	prepalldocs
 
 	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript libxfs.so libxlog.so
-	prepalldocs
+	gen_usr_ldscript -a xfs xlog
+	# removing unnecessary .la files if not needed
+	use static-libs || rm -f "${D}"/usr/lib*/*.la
 }