summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-12 14:08:32 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-12 14:08:32 +0000
commit0617a3b1561e2a537d31ac10cb31ad06edbc210d (patch)
tree8347b18f7a3bbd7c0f564de4faac7fcf49ecd4e4
parentInitial import of right_http_connection needed to de-bundle fakeweb. (diff)
downloadgentoo-2-0617a3b1561e2a537d31ac10cb31ad06edbc210d.tar.gz
gentoo-2-0617a3b1561e2a537d31ac10cb31ad06edbc210d.tar.bz2
gentoo-2-0617a3b1561e2a537d31ac10cb31ad06edbc210d.zip
Unbundle samuel and right_http_connection, and add them as dependencies instead.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
-rw-r--r--dev-ruby/fakeweb/ChangeLog9
-rw-r--r--dev-ruby/fakeweb/fakeweb-1.2.7.ebuild22
-rw-r--r--dev-ruby/fakeweb/fakeweb-1.2.8.ebuild13
3 files changed, 17 insertions, 27 deletions
diff --git a/dev-ruby/fakeweb/ChangeLog b/dev-ruby/fakeweb/ChangeLog
index 9a497ad27bda..34570201e780 100644
--- a/dev-ruby/fakeweb/ChangeLog
+++ b/dev-ruby/fakeweb/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-ruby/fakeweb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/ChangeLog,v 1.2 2009/12/28 12:13:35 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/ChangeLog,v 1.3 2010/01/12 14:08:32 flameeyes Exp $
+
+ 12 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ -fakeweb-1.2.7.ebuild, fakeweb-1.2.8.ebuild:
+ Unbundle samuel and right_http_connection, and add them as dependencies
+ instead.
*fakeweb-1.2.8 (28 Dec 2009)
diff --git a/dev-ruby/fakeweb/fakeweb-1.2.7.ebuild b/dev-ruby/fakeweb/fakeweb-1.2.7.ebuild
deleted file mode 100644
index 7c14b82d61c1..000000000000
--- a/dev-ruby/fakeweb/fakeweb-1.2.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.2.7.ebuild,v 1.1 2009/12/25 02:07:34 flameeyes Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Helper for faking web requests in Ruby"
-HOMEPAGE="http://github.com/chrisk/fakeweb"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend test '>=dev-ruby/mocha-0.9.5 virtual/ruby-test-unit'
diff --git a/dev-ruby/fakeweb/fakeweb-1.2.8.ebuild b/dev-ruby/fakeweb/fakeweb-1.2.8.ebuild
index 135ff875f6ed..224abd23b1a6 100644
--- a/dev-ruby/fakeweb/fakeweb-1.2.8.ebuild
+++ b/dev-ruby/fakeweb/fakeweb-1.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.2.8.ebuild,v 1.1 2009/12/28 12:13:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.2.8.ebuild,v 1.2 2010/01/12 14:08:32 flameeyes Exp $
EAPI=2
@@ -19,4 +19,11 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-ruby_add_bdepend test '>=dev-ruby/mocha-0.9.5 virtual/ruby-test-unit'
+ruby_add_bdepend test '>=dev-ruby/mocha-0.9.5 virtual/ruby-test-unit
+ dev-ruby/samuel dev-ruby/right_http_connection'
+
+all_ruby_prepare() {
+ # The package bundles samuel and right_http_connection, remove
+ # them and use the packages instead.
+ rm -r test/vendor || die "failed to remove bundled gems"
+}