Unbundle sass from haml; add it as a dependency; bump to EAPI=4.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 93 insertions, 7 deletions

diff --git a/dev-ruby/haml/ChangeLog b/dev-ruby/haml/ChangeLog
index a945c8c9d9eb..3eec565169dd 100644
--- a/dev-ruby/haml/ChangeLog
+++ b/dev-ruby/haml/ChangeLog
@@ -1,6 +1,12 @@
 # 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.70 2012/01/01 07:45:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.71 2012/01/22 18:14:04 flameeyes Exp $
+
+*haml-3.1.4-r2 (22 Jan 2012)
+
+  22 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/haml-3.1.4-sass.patch, +haml-3.1.4-r2.ebuild:
+  Unbundle sass from haml; add it as a dependency; bump to EAPI=4.
 
 *haml-3.1.4-r1 (01 Jan 2012)
 
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 4937d459f551..b776971e5b56 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX haml-3.1.4-sass.patch 644 RMD160 18454b0ba833e854ea023eff71f293f08228d76e SHA1 487dfd5150e8fd780517dd82ccb3e4ba9df6d929 SHA256 615e3585a62566b2dc13ac56ca9606ea51c3c052e24fb49506779728d5eca160
 DIST haml-3.0.25.gem 273408 RMD160 5c34251668d422d2d75480f44ba06fc38c90e2a6 SHA1 71fba1c7deefc237af6712388b1240aeed5e2113 SHA256 98bafb508c68b8aae61a5ace85a14f97f9247730e71ce3897b529cee9362c73f
 DIST haml-3.1.3.gem 354304 RMD160 42b10d765d346cd1a5529261432ae1ced3f90895 SHA1 978c0c77d30dbb0f059d420dc8cc15dd9ddc081f SHA256 f712ffdf513bc1dd30c4cdb509d6c7de8a0a1cfac93f39a25c00db464762927b
 DIST haml-3.1.4.gem 367616 RMD160 ccc39e3aa3efec75f4f08a4aec596c4f5de59fcb SHA1 f0fdefc29eabe79acbc7a4a3503fcb0e488a2a26 SHA256 cec73e077f73504fffebe4db33bbbaff6cf0a65e2c6b6041cd22f9bc9da54394
@@ -8,13 +9,14 @@ EBUILD haml-3.0.25-r1.ebuild 989 RMD160 9b44e31a5413a216f667358685ecdd93e1136577
 EBUILD haml-3.0.25.ebuild 979 RMD160 bc239277303f09948a769bd352d98d96d80a68f4 SHA1 1a0a93c13dd573686823a194daabdd7deed62bc1 SHA256 83e5be34c2df477b263786687e5e180fcdc092f96278e8e1c70583d9256da830
 EBUILD haml-3.1.3.ebuild 991 RMD160 8fb067fce1d4fb1e2dabdddac5ed499a40058353 SHA1 ef2428deecf388772e08f413a03eab4899068284 SHA256 e39fee1c4015c3aab4740124dbf5544005cb551e86241784c78b97924905eaff
 EBUILD haml-3.1.4-r1.ebuild 1086 RMD160 20ce74c4954ba6aecf560c56a0a1836660afa5ae SHA1 37c37c0f31b21ec8e5f4647382b9a0252d629622 SHA256 ee35da0cde37d1264ebc6e69432a2a273da2b3c35f259f990b7ce8465e0086fc
+EBUILD haml-3.1.4-r2.ebuild 1365 RMD160 61908464fb706ae055347e19e6a216fd35284414 SHA1 5011a3ea56baf137a95bec255f7875d4fcd5aa5f SHA256 67de3173bea6ae5324b5ad4c64f8df322e8733d23c58a74eb1dd85ccffc7f9da
 EBUILD haml-3.1.4.ebuild 1107 RMD160 5bc2395dcf56d2ae996d0dcbace84888c8d44344 SHA1 1490955a214aeaef89331e9f86080dbddaa65fec SHA256 b7fde5cd0d8925e8084c053b589202b65d1c679ffabffd4f524dbf89a68c2461
-MISC ChangeLog 9775 RMD160 acd41e47e992388bde43d9c6fab7a26f2dcc33a0 SHA1 ad3638fc19f48a38105bd7c4c670fa6d4a1591e6 SHA256 b7e0fa8d94bfdbdd7e93857628df59b38f0a8478b6da7daffbea536b8bd7f4ae
+MISC ChangeLog 9987 RMD160 19470a199b3f93a7729951467849a098735a72d2 SHA1 dae16bf06aeeec6544052eebf6aef6e2018cf2db SHA256 cb06ce74fdb4a028d28b604910b59bf4f83bd7455adfad4eec216794f89504b1
 MISC metadata.xml 219 RMD160 c4f05e85bd9645a64124d3847da25522de568428 SHA1 13b624bb74ad54c50dd466cb811f39ed171fe913 SHA256 670b7642b3830f31d24a317577d842b3499592b6e9a6283312b89c59397a2932
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8ADxYACgkQiIP6VqMIqNf0HgD/e8akaTluzE0gjdvcQ/dwHBK6
-dYM6qhzgjvrnWEzou1gA/3SUS1oRVjfbZElgiRcha3zj1bmfE1GX/OfJdWJFF/DA
-=yu5C
+iEYEARECAAYFAk8cUcoACgkQAiZjviIA2Xgs0QCeN2HsbBcALcTCB6YmNytS07tx
+eikAoIMRsrqzGKkvauuN69n3NsA/d5IP
+=4GTC
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/haml/files/haml-3.1.4-sass.patch b/dev-ruby/haml/files/haml-3.1.4-sass.patch
new file mode 100644
index 000000000000..8bf5d153749c
--- /dev/null
+++ b/dev-ruby/haml/files/haml-3.1.4-sass.patch
@@ -0,0 +1,22 @@
+Index: haml-3.1.4/metadata
+===================================================================
+--- haml-3.1.4.orig/metadata
++++ haml-3.1.4/metadata
+@@ -20,6 +20,17 @@ date: 2011-11-28 00:00:00 -08:00
+ default_executable: 
+ dependencies: 
+ - !ruby/object:Gem::Dependency 
++  name: sass
++  prerelease: false
++  requirement: &id003 !ruby/object:Gem::Requirement 
++    none: false
++    requirements: 
++    - - "~>"
++      - !ruby/object:Gem::Version 
++        version: 3.1.11
++  type: :runtime
++  version_requirements: *id003
++- !ruby/object:Gem::Dependency 
+   name: yard
+   prerelease: false
+   requirement: &id001 !ruby/object:Gem::Requirement 
diff --git a/dev-ruby/haml/haml-3.1.4-r2.ebuild b/dev-ruby/haml/haml-3.1.4-r2.ebuild
new file mode 100644
index 000000000000..aac4a5c94c9c
--- /dev/null
+++ b/dev-ruby/haml/haml-3.1.4-r2.ebuild
@@ -0,0 +1,56 @@
+# 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 $
+
+EAPI=4
+
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+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-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/sass"
+
+# 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
+	)"
+
+all_ruby_prepare() {
+	# unbundle sass; remove dependency over fssm and add one over sass
+	# itself.
+	rm -r vendor/ || die
+
+	pushd .. &>/dev/null
+	epatch "${FILESDIR}"/${P}-sass.patch
+	sed -i \
+		-e '/vendor\//d' \
+		metadata || die
+	popd &>/dev/null
+}