From 276950f2474bf66c409f5e9e48fd5b2a54a6a98c Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Sat, 3 Jul 2010 13:00:42 +0000 Subject: [PATCH] fix dependency on chef Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- app-admin/chef-server-api/ChangeLog | 6 +++++- app-admin/chef-server-api/chef-server-api-0.9.6.ebuild | 4 ++-- app-admin/chef-solr/ChangeLog | 5 ++++- app-admin/chef-solr/chef-solr-0.9.6.ebuild | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app-admin/chef-server-api/ChangeLog b/app-admin/chef-server-api/ChangeLog index 99f065f10c7d..8c10fe367cd1 100644 --- a/app-admin/chef-server-api/ChangeLog +++ b/app-admin/chef-server-api/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/chef-server-api # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.1 2010/07/03 12:42:13 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.2 2010/07/03 13:00:42 hollow Exp $ + + 03 Jul 2010; Benedikt Böhm + chef-server-api-0.9.6.ebuild: + fix dependency on chef *chef-server-api-0.9.6 (03 Jul 2010) diff --git a/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild b/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild index a7e72bd29d1e..adf54ef6865f 100644 --- a/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild +++ b/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild,v 1.1 2010/07/03 12:42:13 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild,v 1.2 2010/07/03 13:00:42 hollow Exp $ EAPI="2" USE_RUBY="ruby18" @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -ruby_add_rdepend "=app-admin/chef-${PV} +ruby_add_rdepend "~app-admin/chef-${PV} <=dev-ruby/json-1.4.2 >=dev-ruby/merb-assets-1.1.0 >=dev-ruby/merb-core-1.1.0 diff --git a/app-admin/chef-solr/ChangeLog b/app-admin/chef-solr/ChangeLog index 249ff4425373..ca2046a70804 100644 --- a/app-admin/chef-solr/ChangeLog +++ b/app-admin/chef-solr/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/chef-solr # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.1 2010/07/03 12:54:17 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.2 2010/07/03 12:59:55 hollow Exp $ + + 03 Jul 2010; Benedikt Böhm chef-solr-0.9.6.ebuild: + fix dependency on chef *chef-solr-0.9.6 (03 Jul 2010) diff --git a/app-admin/chef-solr/chef-solr-0.9.6.ebuild b/app-admin/chef-solr/chef-solr-0.9.6.ebuild index 06973fbfcae9..019ba1636689 100644 --- a/app-admin/chef-solr/chef-solr-0.9.6.ebuild +++ b/app-admin/chef-solr/chef-solr-0.9.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.9.6.ebuild,v 1.1 2010/07/03 12:54:17 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.9.6.ebuild,v 1.2 2010/07/03 12:59:55 hollow Exp $ EAPI="2" USE_RUBY="ruby18" @@ -21,7 +21,7 @@ IUSE="" RDEPEND=">=net-misc/rabbitmq-server-1.7.0 =virtual/jre-1.6.0" -ruby_add_rdepend "=app-admin/chef-${PV} +ruby_add_rdepend "~app-admin/chef-${PV} >=dev-ruby/libxml-1.1.3 >=dev-ruby/uuidtools-2.0.0" -- 2.26.2