summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2011-05-23 12:48:09 +0000
committerHans de Graaff <graaff@gentoo.org>2011-05-23 12:48:09 +0000
commit6474f76ea74a5c751746b1b8a2d3834af3e89812 (patch)
treedc8dceeca4253f8a4d6da619f703211002f27de6 /dev-ruby
parentFix underlink. Bug #367593 (diff)
downloadgentoo-2-6474f76ea74a5c751746b1b8a2d3834af3e89812.tar.gz
gentoo-2-6474f76ea74a5c751746b1b8a2d3834af3e89812.tar.bz2
gentoo-2-6474f76ea74a5c751746b1b8a2d3834af3e89812.zip
Block on older haml versions since these install the same sass files.
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/sass/ChangeLog5
-rw-r--r--dev-ruby/sass/sass-3.1.1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-ruby/sass/ChangeLog b/dev-ruby/sass/ChangeLog
index 352e18156bff..cbc7dfe525e9 100644
--- a/dev-ruby/sass/ChangeLog
+++ b/dev-ruby/sass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/sass
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/ChangeLog,v 1.1 2011/05/01 08:27:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/ChangeLog,v 1.2 2011/05/23 12:48:09 graaff Exp $
+
+ 23 May 2011; Hans de Graaff <graaff@gentoo.org> sass-3.1.1.ebuild:
+ Block on older haml versions since these install the same sass files.
*sass-3.1.1 (01 May 2011)
diff --git a/dev-ruby/sass/sass-3.1.1.ebuild b/dev-ruby/sass/sass-3.1.1.ebuild
index 6f24b0173032..920ea69593c0 100644
--- a/dev-ruby/sass/sass-3.1.1.ebuild
+++ b/dev-ruby/sass/sass-3.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/sass-3.1.1.ebuild,v 1.2 2011/05/01 08:28:54 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/sass-3.1.1.ebuild,v 1.3 2011/05/23 12:48:09 graaff Exp $
EAPI=2
@@ -26,4 +26,4 @@ IUSE=""
ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 >=dev-ruby/maruku-0.5.9 )"
ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
-ruby_add_rdepend "dev-ruby/fssm"
+ruby_add_rdepend "dev-ruby/fssm !!<dev-ruby/haml-3.1"