Don't install binaries in the 3.2 slot to avoid file collisions between slots.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

3 files changed, 63 insertions, 3 deletions

diff --git a/dev-ruby/sass/ChangeLog b/dev-ruby/sass/ChangeLog
index ffb178cad031..168b7a911f35 100644
--- a/dev-ruby/sass/ChangeLog
+++ b/dev-ruby/sass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/sass
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/ChangeLog,v 1.51 2014/05/13 05:13:39 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/ChangeLog,v 1.52 2014/05/13 08:35:07 graaff Exp $
+
+*sass-3.2.19-r1 (13 May 2014)
+
+  13 May 2014; Hans de Graaff <graaff@gentoo.org> +sass-3.2.19-r1.ebuild,
+  sass-3.3.7.ebuild:
+  Don't install binaries in the 3.2 slot to avoid file collisions between
+  slots.
 
 *sass-3.2.19 (13 May 2014)
 
diff --git a/dev-ruby/sass/sass-3.2.19-r1.ebuild b/dev-ruby/sass/sass-3.2.19-r1.ebuild
new file mode 100644
index 000000000000..de3d463e206c
--- /dev/null
+++ b/dev-ruby/sass/sass-3.2.19-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/sass-3.2.19-r1.ebuild,v 1.1 2014/05/13 08:35:07 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
+
+# Don't install binaries for compatibility with higher slot.
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, selector inheritance, and more."
+HOMEPAGE="http://sass-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
+
+ruby_add_rdepend ">=dev-ruby/listen-0.7.2:0 !!<dev-ruby/haml-3.1"
+
+# tests could use `less` if we had it
+
+all_ruby_prepare() {
+	rm -rf vendor/listen || die
+
+	# Don't require maruku as markdown provider but let yard decide.
+	sed -i -e '/maruku/d' .yardopts || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Test fails on jruby for us, upstream can't
+			# reproduce. Avoiding it since it only affects debug
+			# information in the CSS file.
+			# https://github.com/nex3/sass/issues/563
+			sed -i -e '24s/filename_fn//' test/sass/plugin_test.rb || die
+			;;
+		*)
+			;;
+	esac
+}
diff --git a/dev-ruby/sass/sass-3.3.7.ebuild b/dev-ruby/sass/sass-3.3.7.ebuild
index 0303fe50cd3a..ff5423114c00 100644
--- a/dev-ruby/sass/sass-3.3.7.ebuild
+++ b/dev-ruby/sass/sass-3.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/sass-3.3.7.ebuild,v 1.1 2014/05/12 14:25:34 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/sass-3.3.7.ebuild,v 1.2 2014/05/13 08:35:07 graaff Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ IUSE=""
 
 ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
 
-ruby_add_rdepend ">=dev-ruby/listen-1.3.1:1 !!<dev-ruby/haml-3.1"
+ruby_add_rdepend ">=dev-ruby/listen-1.3.1:1 !!<dev-ruby/haml-3.1 !!<dev-ruby/sass-3.2.19-r1"
 
 # tests could use `less` if we had it