Version bump; remove old.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

3 files changed, 13 insertions, 90 deletions

diff --git a/dev-ruby/mongoid/ChangeLog b/dev-ruby/mongoid/ChangeLog
index e0436e922459..4e847576dcf4 100644
--- a/dev-ruby/mongoid/ChangeLog
+++ b/dev-ruby/mongoid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/mongoid
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/ChangeLog,v 1.5 2012/01/28 20:52:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/ChangeLog,v 1.6 2012/02/13 18:37:19 flameeyes Exp $
+
+*mongoid-2.4.4 (13 Feb 2012)
+
+  13 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> +mongoid-2.4.4.ebuild,
+  -mongoid-2.4.2.ebuild, -mongoid-2.4.3.ebuild:
+  Version bump; remove old.
 
 *mongoid-2.4.3 (28 Jan 2012)
 
diff --git a/dev-ruby/mongoid/mongoid-2.4.3.ebuild b/dev-ruby/mongoid/mongoid-2.4.3.ebuild
deleted file mode 100644
index 0b22c64438c1..000000000000
--- a/dev-ruby/mongoid/mongoid-2.4.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/mongoid-2.4.3.ebuild,v 1.1 2012/01/28 20:52:09 flameeyes Exp $
-
-EAPI=4
-USE_RUBY="ruby18"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="spec:unit"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="${PN}"
-GITHUB_PROJECT="${PN}"
-RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ODM (Object Document Mapper) Framework for MongoDB"
-HOMEPAGE="http://mongoid.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/v${PV} -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-# there is support to create a custom mongodb instance now but there are
-# still issues to be fixed.
-#RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/activemodel-3.1
-	>=dev-ruby/mongo-1.3
-	>=dev-ruby/tzinfo-0.3.22
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/ammeter
-		dev-ruby/mocha
-		dev-ruby/rdoc
-		dev-ruby/rspec
-		dev-util/watchr
-	)"
-
-DEPEND+=" test? ( dev-db/mongodb )"
-
-all_ruby_prepare() {
-	# remove references to bundler, as the gemfile does not add anything
-	# we need to care about.
-	sed -i -e '/[bB]undler/d' Rakefile || die
-	# remove the Gemfile as well or it'll try to load it during testing
-	rm Gemfile || die
-}
-
-each_ruby_test() {
-	mkdir "${T}/mongodb_$(basename $RUBY)"
-	mongod --port 27017 --dbpath "${T}/mongodb_$(basename $RUBY)" \
-		--noprealloc --noauth --nohttpinterface --nounixsocket --nojournal \
-		--bind_ip 127.255.255.254 &
-	mongod_pid=$!
-	failed=0
-
-	sleep 2
-
-	export MONGOID_SPEC_HOST="127.255.255.254"
-	export MONGOID_SPEC_PORT="27017"
-
-	# functional testing crashes Ruby from within Portage, but works
-	# outside of it, needs to be investigated thoroughly, but at least
-	# unit testing works.
-	${RUBY} -S rake spec:unit || failed=1
-	kill "${mongod_pid}"
-
-	[[ "${failed}" == "1" ]] && die "tests failed"
-}
diff --git a/dev-ruby/mongoid/mongoid-2.4.2.ebuild b/dev-ruby/mongoid/mongoid-2.4.4.ebuild
index c6720c4a27e8..bd26e9635134 100644
--- a/dev-ruby/mongoid/mongoid-2.4.2.ebuild
+++ b/dev-ruby/mongoid/mongoid-2.4.4.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/mongoid-2.4.2.ebuild,v 1.1 2012/01/23 02:32:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/mongoid-2.4.4.ebuild,v 1.1 2012/02/13 18:37:19 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18"
 
 #RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="spec:unit"
+# functional testing crashes Ruby from within Portage, but works
+# outside of it, needs to be investigated thoroughly, but at least
+# unit testing works.
+RUBY_FAKEGEM_TASK_TEST="spec:unit spec:functional"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -27,10 +30,6 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 
-# there is support to create a custom mongodb instance now but there are
-# still issues to be fixed.
-#RESTRICT="test"
-
 ruby_add_rdepend "
 	>=dev-ruby/activemodel-3.1
 	>=dev-ruby/mongo-1.3
@@ -69,10 +68,7 @@ each_ruby_test() {
 	export MONGOID_SPEC_HOST="127.255.255.254"
 	export MONGOID_SPEC_PORT="27017"
 
-	# functional testing crashes Ruby from within Portage, but works
-	# outside of it, needs to be investigated thoroughly, but at least
-	# unit testing works.
-	${RUBY} -S rake spec:unit || failed=1
+	${RUBY} -S rake ${RUBY_FAKEGEM_TASK_TEST} || failed=1
 	kill "${mongod_pid}"
 
 	[[ "${failed}" == "1" ]] && die "tests failed"