3 files changed, 8 insertions, 36 deletions
diff --git a/dev-ruby/flexmock/ChangeLog b/dev-ruby/flexmock/ChangeLog
index 5d7eaff89053..0689f93cb350 100644
--- a/dev-ruby/flexmock/ChangeLog
+++ b/dev-ruby/flexmock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/flexmock
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flexmock/ChangeLog,v 1.37 2014/04/20 17:52:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flexmock/ChangeLog,v 1.38 2014/05/15 00:40:32 mrueg Exp $
+
+  15 May 2014; Manuel Rüger <mrueg@gentoo.org> -flexmock-1.3.2-r1.ebuild,
+  flexmock-1.3.1.ebuild:
+  Cleanup old. Remove ruby18.
 
   20 Apr 2014; Hans de Graaff <graaff@gentoo.org> flexmock-1.3.3.ebuild:
   Add ruby21.
diff --git a/dev-ruby/flexmock/flexmock-1.3.1.ebuild b/dev-ruby/flexmock/flexmock-1.3.1.ebuild
index 0d9f35e6ca98..0f49f26fcb30 100644
--- a/dev-ruby/flexmock/flexmock-1.3.1.ebuild
+++ b/dev-ruby/flexmock/flexmock-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flexmock/flexmock-1.3.1.ebuild,v 1.3 2013/07/27 22:19:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flexmock/flexmock-1.3.1.ebuild,v 1.4 2014/05/15 00:40:32 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_DOCDIR="html"
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
diff --git a/dev-ruby/flexmock/flexmock-1.3.2-r1.ebuild b/dev-ruby/flexmock/flexmock-1.3.2-r1.ebuild
deleted file mode 100644
index b0b9ce988704..000000000000
--- a/dev-ruby/flexmock/flexmock-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flexmock/flexmock-1.3.2-r1.ebuild,v 1.1 2013/10/06 11:49:25 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mock object library for Ruby unit testing"
-HOMEPAGE="http://flexmock.rubyforge.org/"
-
-LICENSE="flexmock"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:2
-	)"
-
-each_ruby_test() {
-	ruby-ng_rspec test/rspec_integration
-	${RUBY} -S testrb -Ilib:. test/*_test.rb || die
-}