Add dev-ruby/mocha to DEPEND. Removed old versions.

(Portage version: 2.1.9.22/cvs/Linux x86_64)

5 files changed, 10 insertions, 91 deletions

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index 2ee0065c6731..ec89e5b80b58 100644
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/facter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.32 2010/10/25 02:09:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.33 2010/11/04 03:13:30 matsuu Exp $
+
+  04 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> -facter-1.5.6.ebuild,
+  -facter-1.5.7.ebuild, -facter-1.5.7-r1.ebuild, facter-1.5.8.ebuild:
+  Add dev-ruby/mocha to DEPEND. Removed old versions.
 
   25 Oct 2010; Jeroen Roovers <jer@gentoo.org> facter-1.5.8.ebuild:
   Marked ~hppa (bug #337956).
diff --git a/dev-ruby/facter/facter-1.5.6.ebuild b/dev-ruby/facter/facter-1.5.6.ebuild
deleted file mode 100644
index cec75d7800c6..000000000000
--- a/dev-ruby/facter/facter-1.5.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.5.6.ebuild,v 1.3 2010/01/04 11:18:44 fauli Exp $
-
-inherit ruby
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-LICENSE="GPL-2"
-HOMEPAGE="http://reductivelabs.com/projects/facter/index.html"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tar.gz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-USE_RUBY="ruby18"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	DESTDIR="${D}" ruby_einstall || die
-	DESTDIR="${D}" erubydoc
-}
diff --git a/dev-ruby/facter/facter-1.5.7-r1.ebuild b/dev-ruby/facter/facter-1.5.7-r1.ebuild
deleted file mode 100644
index 83c379e047f8..000000000000
--- a/dev-ruby/facter/facter-1.5.7-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.5.7-r1.ebuild,v 1.4 2010/09/20 20:07:40 gmsoft Exp $
-
-EAPI="2"
-
-inherit ruby
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tar.gz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-USE_RUBY="ruby18"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.7-fqdn.patch
-	epatch "${FILESDIR}"/${PN}-1.5.7-virtual.patch
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	DESTDIR="${D}" ruby_einstall || die
-	DESTDIR="${D}" erubydoc
-}
diff --git a/dev-ruby/facter/facter-1.5.7.ebuild b/dev-ruby/facter/facter-1.5.7.ebuild
deleted file mode 100644
index e8ca5c310f52..000000000000
--- a/dev-ruby/facter/facter-1.5.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.5.7.ebuild,v 1.3 2010/03/12 07:56:25 hollow Exp $
-
-EAPI="2"
-
-inherit ruby
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-LICENSE="GPL-2"
-HOMEPAGE="http://reductivelabs.com/projects/facter/index.html"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tar.gz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-USE_RUBY="ruby18"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.7-fqdn.patch
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	DESTDIR="${D}" ruby_einstall || die
-	DESTDIR="${D}" erubydoc
-}
diff --git a/dev-ruby/facter/facter-1.5.8.ebuild b/dev-ruby/facter/facter-1.5.8.ebuild
index a1bd51fff80a..248ac0351e94 100644
--- a/dev-ruby/facter/facter-1.5.8.ebuild
+++ b/dev-ruby/facter/facter-1.5.8.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/dev-ruby/facter/facter-1.5.8.ebuild,v 1.2 2010/10/25 02:09:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.5.8.ebuild,v 1.3 2010/11/04 03:13:30 matsuu Exp $
 
 EAPI="2"
 # jruby failed to install
@@ -22,4 +22,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-maco
 
 RUBY_PATCHES=( "${P}-freebsd-spec.patch" )
 
-ruby_add_bdepend "test? ( dev-ruby/rspec:0 )"
+ruby_add_bdepend "test? (
+		dev-ruby/mocha
+		dev-ruby/rspec:0
+	)"