version bump wrt #469804

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key F8551514)

4 files changed, 18 insertions, 60 deletions

diff --git a/sys-fs/nilfs-utils/ChangeLog b/sys-fs/nilfs-utils/ChangeLog
index fbb6006e6d65..9163d1c512a7 100644
--- a/sys-fs/nilfs-utils/ChangeLog
+++ b/sys-fs/nilfs-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/nilfs-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/nilfs-utils/ChangeLog,v 1.21 2013/02/03 12:44:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/nilfs-utils/ChangeLog,v 1.22 2013/05/15 22:34:36 naota Exp $
+
+*nilfs-utils-2.1.5 (15 May 2013)
+
+  15 May 2013; Naohiro Aota <naota@gentoo.org> +nilfs-utils-2.1.5.ebuild,
+  -nilfs-utils-2.0.18.ebuild, -nilfs-utils-2.0.21.ebuild,
+  -nilfs-utils-2.0.23.ebuild:
+  version bump wrt #469804
 
   03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #22900
diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.0.18.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.0.18.ebuild
deleted file mode 100644
index a78b58b688eb..000000000000
--- a/sys-fs/nilfs-utils/nilfs-utils-2.0.18.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/nilfs-utils/nilfs-utils-2.0.18.ebuild,v 1.1 2010/04/10 17:50:43 matsuu Exp $
-
-EAPI=2
-
-DESCRIPTION="A New Implementation of a Log-structured File System for Linux"
-HOMEPAGE="http://www.nilfs.org/"
-SRC_URI="http://www.nilfs.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/e2fsprogs-libs"
-DEPEND="${DEPEND}
-	sys-kernel/linux-headers"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.0.23.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.0.23.ebuild
deleted file mode 100644
index 3fa72f3c316b..000000000000
--- a/sys-fs/nilfs-utils/nilfs-utils-2.0.23.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/nilfs-utils/nilfs-utils-2.0.23.ebuild,v 1.1 2011/11/28 13:33:17 naota Exp $
-
-EAPI=3
-
-inherit multilib
-
-DESCRIPTION="A New Implementation of a Log-structured File System for Linux"
-HOMEPAGE="http://www.nilfs.org/"
-SRC_URI="http://www.nilfs.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/e2fsprogs-libs"
-DEPEND="${DEPEND}
-	sys-kernel/linux-headers"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.0.21.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.1.5.ebuild
index 4141c3491371..53c598620c37 100644
--- a/sys-fs/nilfs-utils/nilfs-utils-2.0.21.ebuild
+++ b/sys-fs/nilfs-utils/nilfs-utils-2.1.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 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/nilfs-utils/nilfs-utils-2.0.21.ebuild,v 1.1 2011/01/30 00:50:43 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/nilfs-utils/nilfs-utils-2.1.5.ebuild,v 1.1 2013/05/15 22:34:36 naota Exp $
 
 EAPI=3
 
-inherit multilib
+inherit multilib linux-info
 
 DESCRIPTION="A New Implementation of a Log-structured File System for Linux"
 HOMEPAGE="http://www.nilfs.org/"
@@ -12,19 +12,24 @@ SRC_URI="http://www.nilfs.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/e2fsprogs-libs"
 DEPEND="${DEPEND}
 	sys-kernel/linux-headers"
 
+CONFIG_CHECK="~POSIX_MQUEUE"
+
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf $(use_enable static-libs static) \
+		--libdir=/$(get_libdir)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 
 	dodoc AUTHORS ChangeLog NEWS README || die
+
+	rm -f "${ED}"/$(get_libdir)/*.la || die
 }