Revision bump to install a gem specification with the same version requirement as the ebuild.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 76 insertions, 7 deletions

diff --git a/dev-ruby/haml/ChangeLog b/dev-ruby/haml/ChangeLog
index b1eda6076879..84ba41ed13e6 100644
--- a/dev-ruby/haml/ChangeLog
+++ b/dev-ruby/haml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/haml
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.84 2013/06/13 11:37:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.85 2013/06/13 11:38:35 graaff Exp $
+
+*haml-3.1.8-r1 (13 Jun 2013)
+
+  13 Jun 2013; Hans de Graaff <graaff@gentoo.org> files/haml-3.1.6-sass.patch,
+  +haml-3.1.8-r1.ebuild:
+  Revision bump to install a gem specification with the same version
+  requirement as the ebuild.
 
   13 Jun 2013; Hans de Graaff <graaff@gentoo.org> -files/haml-3.1.4-sass.patch:
   Cleanup.
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 9d7b1bb0cd6f..bbbe2d6b306f 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX haml-3.1.6-sass.patch 569 SHA256 ad7e17653879d804b98558304909d8d71c3afb273b2925664ea6f0ac88f0f06b SHA512 3e986ce47bf875a9590391668255ca18aee09296d314b3747343f542713cc434650e50da3adb26f66517656bc52baeb73a2265189cd348124dfaa4ba072fbdd8 WHIRLPOOL 799f7792b3c4e084cdac18380b843e2fe40f991a74e2a922ef7441e2cba6be579ae36d40741b8f44b94029277d13463d7a0768aba566297aa98db4bb5d01c08b
+AUX haml-3.1.6-sass.patch 568 SHA256 bf1d8387aab6f23fe2a35ab1157c03bf316492090d365fa6f12b1f1a5266e71c SHA512 bf8878954ec4195eb90bd857b2aae47a97fcbad704e9361b894b612917da6407b3bbc460bdf4c8327f34be37b7c0e1a6599e545a408a6d57b3f744ca91d52ee2 WHIRLPOOL 26ad7a3016c497a469bba7d23e8784883bb6d270924fafe56067d66ed9ab210e6cb85d4752265153d8b474ca85f6fef3a934a39350becfc8a41a7fae953fe307
 DIST haml-3.1.6.gem 367616 SHA256 e052ee3e2fb1c93c2106d671102d49323ede481539fee202e1ed15845b261da8 SHA512 552083478d6241b84e0904e9f71b587128a419c4ffd54b54eac59bf8218b4b848ff084270a1344cec391e8d86e417759a8d6e2b697cbcf303459e1667b6f9ae5 WHIRLPOOL c83caf52502fb5ffbe4ae1e48dd89b6a18fe57f98fb01affed56cd6c6eba0c44f801c3fc9319380e04a40397925ec8642f40425bde821d255d87e0793c198261
 DIST haml-3.1.8.gem 367616 SHA256 44f69d51810cfc5a0ffbb03fdc646afb2c2f4f841eacfab87caba02b59ae1617 SHA512 cb65e4b6b4eaf31b0d81376e819baf3a8e5216baa18fca744ac3297d207f26120c6571693459e06490dab587e7936624d14852504dd502de39dac3052181d4e7 WHIRLPOOL e6ea1e5f3074ec72d69ee99eeefacdea3dc36ff89ac6f29ae5e4fc0cc826ace375688a6126b1739e5bde0722fe0cf321f87561f68214ee72f5c60e1f8115c5a8
 EBUILD haml-3.1.6.ebuild 1320 SHA256 6025bf9898cdd9843aa2342f87ac7b010e59ee61ace8078e34f759f0802a8338 SHA512 2be64aa74b677ee174b4361aac90e01db6d0de9b9e157cc7b3e58832b73447cd43a70300a5fee240517b1e79d7515ce0077ca68df10de01591d927bdf7998932 WHIRLPOOL 16b0ee2cbb29db18dac0f9285fac684f41711975ce60a2c40953f5ccbc2ee198dc086e8e1b4f6e56eb642c4b5286b8f701ab6349492039e06b973d4ac7e9d367
+EBUILD haml-3.1.8-r1.ebuild 1534 SHA256 5171f0ed30b3a21dbb85adb6d3ce72c5bfcd5f5261da84582ae01f4e5ab8750b SHA512 80a8fedcbdb53434523a5ebbfe6c2d7f9a4aa8e46e3ad6ab6860db243833fd13e5b1fa1854489dbce7ca9764cdb86969355cbdc3ee4f8ebe5ac608f933d95328 WHIRLPOOL 9868362aea2fcf53b8dd86ea9b062aa5581e0644816ed96d1f61f492c55c09ac6326c01059891ae661016159577e0d0c48f7af537056d990d20628cfc4c53090
 EBUILD haml-3.1.8.ebuild 1531 SHA256 ef8e9866ebc71680c5d0e2aded80b1972552ab9774afbd72ebefa6a73ae4f75f SHA512 f8f035095fe5cfd42ece150987225260200a3f190413ce2aefa197ef88a252e474407476baeae0f8aa1cbb1e6e109d2367a9645913b39b0965c1e4cb60d6546d WHIRLPOOL 81649b081a9fe95f8a33ca4d1b6133c2359d2b0c8b8730d60715b57c41b7174ff4cc3c69730c94b46720dcf8de882c0f4c72577bd2288032a7383fb82a507507
-MISC ChangeLog 11568 SHA256 ff138bff7f723dffbd94c4c6be0c978ac174f87562105a6a09f403588f0c7b72 SHA512 97f49413df56ece7804cfd451eeccde8b8f7da3e2735f80cc3e3ac3183e8b2913d576f5034a7c5ebe2105b0f7a50e39471a40cd06b1f5e56bd253244d3feaea1 WHIRLPOOL be8b3082a728f610e6913739c66add7ca2585bb1e4ed12b989584ff2e52d25d5ed744355a7339ebea635aceda78372bc68444d80f12f639cf6b4f42e4b6d0f11
+MISC ChangeLog 11801 SHA256 00822c1fc69d3a497f4a297b1bf87752c0d252833d0e880bbf5b3a109d14cdcf SHA512 a5d2e63305eaca2b32380c5b85109d6cec99690900543655bd8657d31e025a362be220cab8a24f82ae77826d29b8a928e0d4fef05a303c49f3fce98ad3509488 WHIRLPOOL 304bbab00d939f78585596ab7e0ccbbd8d9e0f3ce4558d114953c028fecd1f3bf8effa62b87815d0e6ea246dd4992f7109d6790533861d67e27e2ec94504cfcc
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG5ru8ACgkQiIP6VqMIqNc3kgD/bhM0Mds8ktT0AadxztG2ReXd
-J35WKmq085MtvLTCtFkA/jafFpaz8oo1+r7nNynJdblsRnSnJgNGvZm82sb3qtsB
-=1S83
+iF4EAREIAAYFAlG5rzwACgkQiIP6VqMIqNeqbwD+Ooc+74SBwCAPkAiDf7/rx3H8
+meL5iHvMBPLPSDx3IeoA/1YMZDg+3QChAhrCYwRZr5WsQj1LOVMYZRm/eF6ad0CX
+=BKlc
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/haml/files/haml-3.1.6-sass.patch b/dev-ruby/haml/files/haml-3.1.6-sass.patch
index 6837f10f825d..386854840d8e 100644
--- a/dev-ruby/haml/files/haml-3.1.6-sass.patch
+++ b/dev-ruby/haml/files/haml-3.1.6-sass.patch
@@ -11,7 +11,7 @@
 +    requirements: 
 +    - - "~>"
 +      - !ruby/object:Gem::Version 
-+        version: 3.1.11
++        version: 3.2.0
 +  type: :runtime
 +  version_requirements: *id003
 +- !ruby/object:Gem::Dependency 
diff --git a/dev-ruby/haml/haml-3.1.8-r1.ebuild b/dev-ruby/haml/haml-3.1.8-r1.ebuild
new file mode 100644
index 000000000000..1a1577330fd6
--- /dev/null
+++ b/dev-ruby/haml/haml-3.1.8-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-3.1.8-r1.ebuild,v 1.1 2013/06/13 11:38:35 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb rails 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 ~arm ~x86 ~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=""
+
+ruby_add_rdepend "dev-ruby/sass"
+
+# It could use merb during testing as well, but it's not mandatory
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest
+		dev-ruby/hpricot
+		dev-ruby/erubis
+		dev-ruby/rails
+		dev-ruby/ruby_parser
+		>=dev-ruby/sass-3.2.0
+	)
+	doc? (
+		dev-ruby/yard
+		dev-ruby/maruku
+		dev-ruby/sass
+	)"
+
+all_ruby_prepare() {
+	# unbundle sass; remove dependency over fssm and add one over sass
+	# itself.
+	rm -r vendor/ || die
+
+	pushd .. &>/dev/null
+	epatch "${FILESDIR}"/${PN}-3.1.6-sass.patch
+	sed -i \
+		-e '/vendor\//d' \
+		metadata || die
+	popd &>/dev/null
+
+	# Use newer sass and update specs to make a consistent combination.
+	sed -i -e 's/fuchsia/magenta/' test/haml/results/filters.xhtml || die
+}