Add slot-operator deps. Remove acl from RDEPEND.

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

6 files changed, 16 insertions, 184 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 02126ff06e14..f9285c98f1bc 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.81 2014/06/20 06:00:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.82 2014/08/22 09:36:50 floppym Exp $
+
+  22 Aug 2014; Mike Gilbert <floppym@gentoo.org> -btrfs-progs-3.14.1-r1.ebuild,
+  -btrfs-progs-3.14.1.ebuild, -btrfs-progs-3.14_pre20140414.ebuild,
+  btrfs-progs-3.14.2.ebuild, btrfs-progs-9999.ebuild:
+  Add slot-operator deps. Remove acl from RDEPEND.
 
   20 Jun 2014; Mike Gilbert <floppym@gentoo.org>
   +files/btrfs-progs-3.14.2-install-man.patch, btrfs-progs-3.14.2.ebuild:
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14.1-r1.ebuild
deleted file mode 100644
index 38a92808882f..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14.1-r1.ebuild,v 1.1 2014/05/20 14:47:03 floppym Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	inherit git-2
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE=""
-
-DEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-arg_strtou64.patch"
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		BUILD_VERBOSE=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		bindir=/sbin \
-		libdir=/usr/$(get_libdir) \
-		mandir=/usr/share/man
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14.1.ebuild
deleted file mode 100644
index 4696da1356a4..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14.1.ebuild,v 1.1 2014/04/29 01:50:12 floppym Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	inherit git-2
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE=""
-
-DEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		BUILD_VERBOSE=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		bindir=/sbin \
-		libdir=/usr/$(get_libdir) \
-		mandir=/usr/share/man
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
index 47499a7201fd..2c2a1142870e 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild,v 1.2 2014/06/20 06:00:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild,v 1.3 2014/08/22 09:36:50 floppym Exp $
 
 EAPI=5
 
@@ -27,12 +27,12 @@ SLOT="0/${libbtrfs_soname}"
 IUSE=""
 
 RDEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
+	dev-libs/lzo:2=
+	sys-libs/zlib:0=
+	sys-fs/e2fsprogs:0=
 "
 DEPEND="${RDEPEND}
+	sys-apps/acl
 	app-text/asciidoc
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14_pre20140414.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14_pre20140414.ebuild
deleted file mode 100644
index 9026dd65fbc1..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.14_pre20140414.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.14_pre20140414.ebuild,v 1.1 2014/04/14 20:26:56 slyfox Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	#SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
-	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	inherit git-2
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE=""
-
-DEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		BUILD_VERBOSE=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		bindir=/sbin \
-		libdir=/usr/$(get_libdir) \
-		mandir=/usr/share/man
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index d5d714a7864f..c43019b7b633 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.34 2014/06/19 21:05:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.35 2014/08/22 09:36:50 floppym Exp $
 
 EAPI=5
 
@@ -27,12 +27,12 @@ SLOT="0/${libbtrfs_soname}"
 IUSE=""
 
 RDEPEND="
-	dev-libs/lzo
-	sys-libs/zlib
-	sys-apps/acl
-	sys-fs/e2fsprogs
+	dev-libs/lzo:2=
+	sys-libs/zlib:0=
+	sys-fs/e2fsprogs:0=
 "
 DEPEND="${RDEPEND}
+	sys-apps/acl
 	app-text/asciidoc
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto