Make sure to install rails/init.rb otherwise haml would fail to load.

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

6 files changed, 10 insertions, 171 deletions

diff --git a/dev-ruby/haml/ChangeLog b/dev-ruby/haml/ChangeLog
index 3eec565169dd..6fc4b17876bf 100644
--- a/dev-ruby/haml/ChangeLog
+++ b/dev-ruby/haml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/haml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.71 2012/01/22 18:14:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.72 2012/01/25 00:46:57 flameeyes Exp $
+
+*haml-3.1.4-r3 (25 Jan 2012)
+
+  25 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org> +haml-3.1.4-r3.ebuild,
+  -haml-3.0.25-r1.ebuild, -haml-3.0.25.ebuild, -haml-3.1.3.ebuild,
+  -haml-3.1.4-r1.ebuild, -haml-3.1.4-r2.ebuild:
+  Make sure to install rails/init.rb otherwise haml would fail to load.
 
 *haml-3.1.4-r2 (22 Jan 2012)
 
diff --git a/dev-ruby/haml/haml-3.0.25-r1.ebuild b/dev-ruby/haml/haml-3.0.25-r1.ebuild
deleted file mode 100644
index 6570d4e7ddeb..000000000000
--- a/dev-ruby/haml/haml-3.0.25-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-3.0.25-r1.ebuild,v 1.4 2011/08/07 14:23:12 armin76 Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb VERSION VERSION_NAME vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HAML - a ruby web page templating engine"
-HOMEPAGE="http://haml-lang.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-
-# TODO: haml has some emacs modes that it could be installing, in case
-IUSE=""
-
-# The html engine requires hpricot
-ruby_add_rdepend "dev-ruby/hpricot dev-ruby/fssm"
-
-# It could use merb during testing as well, but it's not mandatory
-ruby_add_bdepend "
-	test? (
-		virtual/ruby-test-unit
-		dev-ruby/erubis
-		dev-ruby/rails
-		dev-ruby/ruby_parser
-	)
-	doc? (
-		dev-ruby/yard
-		dev-ruby/maruku
-	)"
diff --git a/dev-ruby/haml/haml-3.0.25.ebuild b/dev-ruby/haml/haml-3.0.25.ebuild
deleted file mode 100644
index 302c5fe95c44..000000000000
--- a/dev-ruby/haml/haml-3.0.25.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-3.0.25.ebuild,v 1.2 2011/08/07 14:23:12 armin76 Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb VERSION VERSION_NAME"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HAML - a ruby web page templating engine"
-HOMEPAGE="http://haml.hamptoncatlin.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# TODO: haml has some emacs modes that it could be installing, in case
-IUSE=""
-
-# The html engine requires hpricot
-ruby_add_rdepend dev-ruby/hpricot
-
-# It could use merb during testing as well, but it's not mandatory
-ruby_add_bdepend "
-	test? (
-		virtual/ruby-test-unit
-		dev-ruby/erubis
-		dev-ruby/rails
-		dev-ruby/ruby_parser
-	)
-	doc? (
-		dev-ruby/yard
-		dev-ruby/maruku
-	)"
diff --git a/dev-ruby/haml/haml-3.1.3.ebuild b/dev-ruby/haml/haml-3.1.3.ebuild
deleted file mode 100644
index 49a10ef48d91..000000000000
--- a/dev-ruby/haml/haml-3.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-3.1.3.ebuild,v 1.1 2011/09/09 05:34:29 graaff Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb VERSION VERSION_NAME vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HAML - a ruby web page templating engine"
-HOMEPAGE="http://haml-lang.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# TODO: haml has some emacs modes that it could be installing, in case
-IUSE=""
-
-# The html engine requires hpricot
-ruby_add_rdepend "dev-ruby/hpricot dev-ruby/fssm"
-
-# It could use merb during testing as well, but it's not mandatory
-ruby_add_bdepend "
-	test? (
-		virtual/ruby-test-unit
-		dev-ruby/erubis
-		dev-ruby/rails
-		dev-ruby/ruby_parser
-	)
-	doc? (
-		dev-ruby/yard
-		dev-ruby/maruku
-	)"
diff --git a/dev-ruby/haml/haml-3.1.4-r1.ebuild b/dev-ruby/haml/haml-3.1.4-r1.ebuild
deleted file mode 100644
index 5c24c462e194..000000000000
--- a/dev-ruby/haml/haml-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,42 +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/haml/haml-3.1.4-r1.ebuild,v 1.1 2012/01/01 07:45:11 graaff Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb VERSION VERSION_NAME vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HAML - a ruby web page templating engine"
-HOMEPAGE="http://haml-lang.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# TODO: haml has some emacs modes that it could be installing, in case
-IUSE=""
-
-# The html engine requires hpricot
-ruby_add_rdepend "dev-ruby/hpricot dev-ruby/fssm"
-
-# It could use merb during testing as well, but it's not mandatory
-ruby_add_bdepend "
-	test? (
-		virtual/ruby-test-unit
-		dev-ruby/erubis
-		dev-ruby/rails
-		dev-ruby/ruby_parser
-	)
-	doc? (
-		dev-ruby/yard
-		dev-ruby/maruku
-	)"
diff --git a/dev-ruby/haml/haml-3.1.4-r2.ebuild b/dev-ruby/haml/haml-3.1.4-r3.ebuild
index aac4a5c94c9c..4d2bcfcc3fab 100644
--- a/dev-ruby/haml/haml-3.1.4-r2.ebuild
+++ b/dev-ruby/haml/haml-3.1.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-3.1.4-r2.ebuild,v 1.1 2012/01/22 18:14:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-3.1.4-r3.ebuild,v 1.1 2012/01/25 00:46:57 flameeyes Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING README.md"
 RUBY_FAKEGEM_DOCDIR="doc"
 
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb VERSION VERSION_NAME"
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb rails VERSION VERSION_NAME"
 
 inherit ruby-fakegem