Version bump to latest. Prune older a bit.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

5 files changed, 11 insertions, 325 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index 7b291438c762..809b07ab7c44 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.143 2012/04/01 16:41:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.144 2012/04/26 11:27:32 scarabeus Exp $
+
+*xfsprogs-3.1.8 (26 Apr 2012)
+
+  26 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +xfsprogs-3.1.8.ebuild,
+  -xfsprogs-3.1.4.ebuild, -xfsprogs-3.1.5.ebuild, -xfsprogs-3.1.6.ebuild,
+  -xfsprogs-3.1.7-r1.ebuild:
+  Version bump to latest. Prune older a bit.
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> xfsprogs-3.1.7.ebuild:
   alpha/ia64/sh/sparc stable wrt #408021
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.4.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.4.ebuild
deleted file mode 100644
index 0f710bc17d1a..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.1.4.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.4.ebuild,v 1.7 2012/03/30 17:06:50 flameeyes 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
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.5.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.5.ebuild
deleted file mode 100644
index da2bee260bf3..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.1.5.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.5.ebuild,v 1.2 2012/03/30 17:06:50 flameeyes 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
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild
deleted file mode 100644
index b8dcb773178a..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.1.6.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.6.ebuild,v 1.2 2012/03/30 17:06:50 flameeyes 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
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild
index d1368434a6d5..377f7503b8d8 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2012/03/30 21:40:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild,v 1.1 2012/04/26 11:27:32 scarabeus Exp $
 
 EAPI="4"
 
@@ -79,9 +79,9 @@ src_configure() {
 	fi
 
 	if use static || use static-libs ; then
-		myconf="${myconf} --enable-static"
+		myconf+=" --enable-static"
 	else
-		myconf="${myconf} --disable-static"
+		myconf+=" --disable-static"
 	fi
 
 	econf \