Add a revision and hard blocker to ensure only the latest slot installs in /usr/bin, fixing bug 487142.

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

4 files changed, 82 insertions, 7 deletions

diff --git a/dev-ruby/haml/ChangeLog b/dev-ruby/haml/ChangeLog
index 65c7bc0248fe..3983b5857bd9 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.88 2013/10/06 15:41:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.89 2013/10/07 06:26:10 graaff Exp $
+
+*haml-3.1.8-r2 (07 Oct 2013)
+
+  07 Oct 2013; Hans de Graaff <graaff@gentoo.org> +haml-3.1.8-r2.ebuild,
+  haml-4.0.3.ebuild:
+  Add a revision and hard blocker to ensure only the latest slot installs in
+  /usr/bin, fixing bug 487142.
 
   06 Oct 2013; Hans de Graaff <graaff@gentoo.org> haml-3.1.8-r1.ebuild:
   Drop tests from stable candidate so we can bootstrap a stable ruby19 rails
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index dc67e1756ba7..7ac27c7f76f8 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -5,13 +5,14 @@ AUX haml-3.1.6-sass.patch 568 SHA256 bf1d8387aab6f23fe2a35ab1157c03bf316492090d3
 DIST haml-3.1.8.gem 367616 SHA256 44f69d51810cfc5a0ffbb03fdc646afb2c2f4f841eacfab87caba02b59ae1617 SHA512 cb65e4b6b4eaf31b0d81376e819baf3a8e5216baa18fca744ac3297d207f26120c6571693459e06490dab587e7936624d14852504dd502de39dac3052181d4e7 WHIRLPOOL e6ea1e5f3074ec72d69ee99eeefacdea3dc36ff89ac6f29ae5e4fc0cc826ace375688a6126b1739e5bde0722fe0cf321f87561f68214ee72f5c60e1f8115c5a8
 DIST haml-4.0.3.gem 115712 SHA256 d94e937e5bc92da72e1d101e1ba983a5a84eb84b1981709b93fdfc349b833fd1 SHA512 1ecca4187a53071e17d4536ea7983d273a13630b66789640052da86376146a3f119175cc050c7fa7eeddc996f7bf0ad6728f215284fcb6918c82326c5a516f79 WHIRLPOOL 79aca5570b293617049fdc9981a7c85e7011b092485e2cd4688659e495c22718fbd2339e389efd08024b95f685436b80cbaf497d9f31388ebc59b275c0c3e57f
 EBUILD haml-3.1.8-r1.ebuild 1587 SHA256 0518efca9e25dba7266b61fe542cb1bca81bc7d9319dfa861facc245cf2e8b55 SHA512 2f253560a5906f1f91fba84860c482b8eae458e84e0ed520d9caef74b27afe640854476f5e79f735adac211a715c54f655c3d2ab9edc423e8f7a61cfcde27498 WHIRLPOOL f68ab2244e55f5087fbaa26063c2b0fd8abe4556926a6e04c5bcc09ec250144f267f29ca3fd4e77e1d4fce015b06d6d1b854104a0fc406dbdc080e1944bf2015
-EBUILD haml-4.0.3.ebuild 951 SHA256 6cc8359aea419c8070f68e72a69975d6a0853423749d058c9d3467ebcda34d6a SHA512 1f103f06c93250eb0e54c58fa12fa5dc4040ec129cb07759c7b9107619bcc98b965215a52cdfd4e8ef9dd9760c139471b2cc4e5910becb2746d01c5aed5bf54b WHIRLPOOL 19cf4cf8f05fdb5fc13628ebf4d55496ecdb260ddeb5b75162722c650d66e1be9f257448fa69a323477a6c7156901ba5e326938b584bf59a165e71fc87bd0d5b
-MISC ChangeLog 12180 SHA256 74168aa82d320290307cd81be17d4a10b91685d63ed695d7362d7125fe64c8a2 SHA512 4e522a5b73e8aaed198ceceb335d9f04b9fc888e73281bb01c736981b4903fd3ecfdb7ecc0d2441e090898647d39436bdc27a77eae001fc725015efc115c3536 WHIRLPOOL 125468ca1ef73032cc717cce10cbb0f7d9de5d95b0b8d281d2a1c6f8720c2a88378835b5ea5989bed6af721f5a7ed669df8e574ccaaca38757421f9ed12ca3eb
+EBUILD haml-3.1.8-r2.ebuild 1612 SHA256 ef5a160f33e60d3e10c2382e52904e20aac5abbb300c0d859586579823e6978b SHA512 e8c396cad37a8d0468b8936d388905f9d5d051b689f63e044c05d2481784e02d65dea96ec02100ef55c7f1e30e779d9e6fc38fc565b2b0b67e6a301ee9cde965 WHIRLPOOL b84b48cfd036ba4042b6aca685dbfadf4559b153650effb004e0263a10509abb6a572488f3c7d587149e44651bf0c1cdce7dcd1a79ef974e0599ab585c190848
+EBUILD haml-4.0.3.ebuild 999 SHA256 622046759739e3546183848e6320fc6f02f12b1139e1564fc8b15d65c17baf07 SHA512 45af6d337b726a65444571fd6e63438c23d6e97a5b6297f6ba5f10945fce915fbc2d5e6a73bf764d2cf8627d0c29f0a0af2cd79b02534d1ebb438ec2cd99d45b WHIRLPOOL 43d114decbb9c43d609c6d9a3fceaf05695ac51f5493d10d96704d39fc1756bc7568678ca709f8b16c1113f4423430a850de5328770ff2d44e8e945bee605784
+MISC ChangeLog 12413 SHA256 b438ed8b04a2c0bf020960843c115ed7ac18c7f8b60b26bfda6287686f401d47 SHA512 e49c0e3a1beb1ac0c00f86b8902af77a7d05a64f03a4ce3c5bf58e8e870c610d74da322f8dad42e82721c4df1863edcf7f77512b38e8a22dcbb889845d4e552d WHIRLPOOL 5ae0b6bb5674cf9f0b6e76b133df2cb59cef847f73402e60f54669cea250ccb6f949a19469c705e7631181ba92f1747c7bf317371284aec67f81f7acd2a4b631
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlJRhMEACgkQiIP6VqMIqNeSggD/aklqEwQEJGhPoRvtfiXflGAH
-PZIY8egrfHo0TAM/dV0A/ihieRPl+gPFSV2Uy1QYuF3zewDgP66awxdES92BrLlS
-=UCiZ
+iF4EAREIAAYFAlJSVAgACgkQiIP6VqMIqNeZygD+O+MELlnpLcC4H59B6YA8BxgJ
+j/sKlyCQT/j1+qWqqisBAJRv8expNVGOPGc0azYhbEbjVn3TsEgbCQDu55GdGevs
+=1ELu
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/haml/haml-3.1.8-r2.ebuild b/dev-ruby/haml/haml-3.1.8-r2.ebuild
new file mode 100644
index 000000000000..6a62cceba5a5
--- /dev/null
+++ b/dev-ruby/haml/haml-3.1.8-r2.ebuild
@@ -0,0 +1,65 @@
+# 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-r2.ebuild,v 1.1 2013/10/07 06:26:10 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"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+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=""
+
+RESTRICT="test"
+
+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
+# 	)"
+ruby_add_bdepend "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
+}
diff --git a/dev-ruby/haml/haml-4.0.3.ebuild b/dev-ruby/haml/haml-4.0.3.ebuild
index a58618f77f03..2942a7d52b10 100644
--- a/dev-ruby/haml/haml-4.0.3.ebuild
+++ b/dev-ruby/haml/haml-4.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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-4.0.3.ebuild,v 1.1 2013/10/06 15:38:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-4.0.3.ebuild,v 1.2 2013/10/07 06:26:10 graaff Exp $
 
 EAPI=5
 
@@ -23,6 +23,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-ma
 
 IUSE="doc test"
 
+RDEPEND="${RDEPEND} !!<dev-ruby/haml-3.1.8-r2"
+
 ruby_add_rdepend "dev-ruby/tilt"
 
 ruby_add_bdepend "