Version bumped.

(Portage version: 2.1.10.19/cvs/Linux x86_64)

4 files changed, 11 insertions, 60 deletions

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index dff996528893..39a7e6af416b 100644
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/facter
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.38 2011/09/19 21:52:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.39 2011/09/29 12:26:17 matsuu Exp $
+
+*facter-1.6.1 (29 Sep 2011)
+
+  29 Sep 2011; MATSUU Takuto <matsuu@gentoo.org> -facter-1.5.7-r2.ebuild,
+  -facter-1.5.8.ebuild, -facter-1.5.9.ebuild, +facter-1.6.1.ebuild:
+  Version bumped. Removed old versions.
 
   19 Sep 2011; Markus Meier <maekke@gentoo.org> facter-1.6.0.ebuild:
   x86 stable, bug #380525
diff --git a/dev-ruby/facter/facter-1.5.7-r2.ebuild b/dev-ruby/facter/facter-1.5.7-r2.ebuild
deleted file mode 100644
index b78297f12fcb..000000000000
--- a/dev-ruby/facter/facter-1.5.7-r2.ebuild
+++ /dev/null
@@ -1,27 +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-r2.ebuild,v 1.3 2010/06/21 15:39:32 gmsoft Exp $
-
-EAPI="2"
-# jruby failed to install
-USE_RUBY="ruby18 ruby19 ree18"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG ChangeLog README* TODO"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-RUBY_PATCHES=(
-	"${FILESDIR}/${P}-fqdn.patch"
-	"${FILESDIR}/${P}-virtual.patch"
-	"${FILESDIR}/${P}-ruby19.patch"
-)
diff --git a/dev-ruby/facter/facter-1.5.8.ebuild b/dev-ruby/facter/facter-1.5.8.ebuild
deleted file mode 100644
index 248ac0351e94..000000000000
--- a/dev-ruby/facter/facter-1.5.8.ebuild
+++ /dev/null
@@ -1,28 +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.8.ebuild,v 1.3 2010/11/04 03:13:30 matsuu Exp $
-
-EAPI="2"
-# jruby failed to install
-USE_RUBY="ruby18 ruby19 ree18"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README* TODO"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-RUBY_PATCHES=( "${P}-freebsd-spec.patch" )
-
-ruby_add_bdepend "test? (
-		dev-ruby/mocha
-		dev-ruby/rspec:0
-	)"
diff --git a/dev-ruby/facter/facter-1.5.9.ebuild b/dev-ruby/facter/facter-1.6.1.ebuild
index 790b4f583197..1ffa97de255f 100644
--- a/dev-ruby/facter/facter-1.5.9.ebuild
+++ b/dev-ruby/facter/facter-1.6.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.5.9.ebuild,v 1.1 2011/05/28 06:53:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.6.1.ebuild,v 1.1 2011/09/29 12:26:17 matsuu Exp $
 
-EAPI="2"
+EAPI="4"
 
 USE_RUBY="ruby18 ruby19 ree18 jruby"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README* TODO"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
 RUBY_FAKEGEM_BINWRAP="facter"
 
 inherit ruby-fakegem
@@ -15,7 +15,7 @@ inherit ruby-fakegem
 DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
 HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
 
-LICENSE="GPL-2"
+LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"