Version bump. Removed old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 14 insertions, 277 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index 2fcf152a63b7..a99e7c311b80 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.165 2013/05/15 03:59:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.166 2013/10/18 08:17:44 polynomial-c Exp $
+
+*xfsprogs-3.1.11 (18 Oct 2013)
+
+  18 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> -xfsprogs-3.1.7.ebuild,
+  -xfsprogs-3.1.8.ebuild, +xfsprogs-3.1.11.ebuild,
+  -files/xfsprogs-3.1.1-sharedlibs.patch, -files/xfsprogs-3.1.8-readline.patch:
+  Version bump. Removed old.
 
   15 May 2013; Mike Frysinger <vapier@gentoo.org> xfsprogs-3.1.10.ebuild:
   Add s390 love #444688.
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
deleted file mode 100644
index ded1f30d6d9e..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-ripped from PLD Linux
-
---- xfsprogs-3.1.2/libdisk/Makefile
-+++ xfsprogs-3.1.2/libdisk/Makefile
-@@ -25,8 +25,10 @@
- include $(BUILDRULES)
- 
- install: default
-+	$(INSTALL_LTLIB)
- 
- install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: install-dev
- 
---- xfsprogs-3.1.2/libxcmd/Makefile
-+++ xfsprogs-3.1.2/libxcmd/Makefile
-@@ -32,6 +32,12 @@
- 
- include $(BUILDRULES)
- 
--install install-dev install-qa: default
-+install: default
-+	$(INSTALL_LTLIB)
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .dep
---- xfsprogs-3.1.2/libxfs/Makefile
-+++ xfsprogs-3.1.2/libxfs/Makefile
-@@ -41,7 +41,9 @@
- include $(BUILDRULES)
- 
- install: default
-+	$(INSTALL_LTLIB_ROOT)
- 
- install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: default
---- xfsprogs-3.1.2/libxlog/Makefile
-+++ xfsprogs-3.1.2/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,12 @@
- 
- include $(BUILDRULES)
- 
--install install-dev install-qa: default
-+install: default
-+	$(INSTALL_LTLIB_ROOT)
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .dep
---- xfsprogs-3.1.2/Makefile
-+++ xfsprogs-3.1.2/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
---- 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 = set -e; \
- 	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
-+	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/files/xfsprogs-3.1.8-readline.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch
deleted file mode 100644
index c4f794e186e2..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 52548f087e9c5ff05c9f43c859114cf2066f133b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 25 Aug 2012 19:06:28 -0400
-Subject: [PATCH] libxcmd: link against readline
-
-This library uses readline funcs (the input.c file), so we need to link
-this shared library against it.
-
-URL: https://bugs.gentoo.org/432644
-Reported-by: David Badia <dbadia@gmail.com>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libxcmd/Makefile |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libxcmd/Makefile b/libxcmd/Makefile
-index b3544f4..ce082a5 100644
---- a/libxcmd/Makefile
-+++ b/libxcmd/Makefile
-@@ -22,10 +22,12 @@ endif
- 
- ifeq ($(ENABLE_READLINE),yes)
- LCFLAGS += -DENABLE_READLINE
-+LTLIBS += $(LIBREADLINE) $(LIBTERMCAP)
- endif
- 
- ifeq ($(ENABLE_EDITLINE),yes)
- LCFLAGS += -DENABLE_EDITLINE
-+LTLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
- endif
- 
- default: ltdepend $(LTLIBRARY)
--- 
-1.7.9.7
-
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.11.ebuild
index d41a11343ee6..1ce38d336ee0 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.8.ebuild,v 1.9 2012/08/25 23:10:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.11.ebuild,v 1.1 2013/10/18 08:17:44 polynomial-c Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+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 )"
 
@@ -37,8 +37,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.1-sharedlibs.patch
-	epatch "${FILESDIR}"/${PN}-3.1.8-readline.patch
+	epatch "${FILESDIR}"/${PN}-3.1.10-sharedlibs.patch
 
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
@@ -70,15 +69,6 @@ src_configure() {
 	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+=" --enable-static"
 	else
@@ -89,6 +79,8 @@ src_configure() {
 		--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"
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.7.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.7.ebuild
deleted file mode 100644
index 3d6d82dead38..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.1.7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.ebuild,v 1.8 2012/04/01 16:41:44 armin76 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="!static? ( >=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}
-	static? ( || ( sys-apps/util-linux[static-libs] <sys-apps/util-linux-2.20 ) )
-	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
-}