diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2005-05-03 19:30:24 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2005-05-03 19:30:24 +0000 |
| commit | c5e5462003a86c2509110bb088accdf87c9e11cb (patch) | |
| tree | e47a46f587a848e6e48afc586eeb8b66ca0adfbe /net-irc | |
| parent | change gnome meta dep to pre0 (diff) | |
| download | gentoo-2-c5e5462003a86c2509110bb088accdf87c9e11cb.tar.gz gentoo-2-c5e5462003a86c2509110bb088accdf87c9e11cb.tar.bz2 gentoo-2-c5e5462003a86c2509110bb088accdf87c9e11cb.zip | |
Adjusted dependencies to not pull in dev-ruby/rexml. Instead we depend (by default) on >=virtual/ruby-1.8 that already includes rexml, but the combination of =virtual/ruby-1.6* with dev-ruby/shim-ruby18 or dev-ruby/rexml is also fine. Closes bug #89164.
(Portage version: 2.0.51.21)
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/rbot/ChangeLog | 9 | ||||
| -rw-r--r-- | net-irc/rbot/rbot-0.9.6.ebuild | 17 | ||||
| -rw-r--r-- | net-irc/rbot/rbot-0.9.7.ebuild | 14 |
3 files changed, 32 insertions, 8 deletions
diff --git a/net-irc/rbot/ChangeLog b/net-irc/rbot/ChangeLog index e408ead7f773..fe0f6c2564f7 100644 --- a/net-irc/rbot/ChangeLog +++ b/net-irc/rbot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-irc/rbot # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.8 2005/04/22 15:08:20 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.9 2005/05/03 19:30:24 swegener Exp $ + + 03 May 2005; Sven Wegener <swegener@gentoo.org> rbot-0.9.6.ebuild, + rbot-0.9.7.ebuild: + Adjusted dependencies to not pull in dev-ruby/rexml. Instead we depend (by + default) on >=virtual/ruby-1.8 that already includes rexml, but the + combination of =virtual/ruby-1.6* with dev-ruby/shim-ruby18 or + dev-ruby/rexml is also fine. Closes bug #89164. 22 Apr 2005; Sven Wegener <swegener@gentoo.org> rbot-0.9.7.ebuild: Marked stable on x86. diff --git a/net-irc/rbot/rbot-0.9.6.ebuild b/net-irc/rbot/rbot-0.9.6.ebuild index d017ced5e78a..a5d47d78cd88 100644 --- a/net-irc/rbot/rbot-0.9.6.ebuild +++ b/net-irc/rbot/rbot-0.9.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.6.ebuild,v 1.7 2005/04/18 19:27:24 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.6.ebuild,v 1.8 2005/05/03 19:30:24 swegener Exp $ DESCRIPTION="rbot is a ruby IRC bot" HOMEPAGE="http://www.linuxbrit.co.uk/rbot/" @@ -11,10 +11,19 @@ SLOT="0" KEYWORDS="x86 ~ppc" IUSE="spell" -DEPEND="virtual/ruby" +DEPEND="|| ( + >=virtual/ruby-1.8 + ( + =virtual/ruby-1.6* + ( + dev-ruby/shim-ruby18 + dev-ruby/rexml + ) + ) + ) + dev-ruby/ruby-bdb" + RDEPEND="${DEPEND} - dev-ruby/ruby-bdb - dev-ruby/rexml spell? ( app-text/ispell )" src_unpack() { diff --git a/net-irc/rbot/rbot-0.9.7.ebuild b/net-irc/rbot/rbot-0.9.7.ebuild index 0a2cdbf843b8..3b2461932db2 100644 --- a/net-irc/rbot/rbot-0.9.7.ebuild +++ b/net-irc/rbot/rbot-0.9.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.7.ebuild,v 1.4 2005/04/22 15:08:20 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.7.ebuild,v 1.5 2005/05/03 19:30:24 swegener Exp $ DESCRIPTION="rbot is a ruby IRC bot" HOMEPAGE="http://www.linuxbrit.co.uk/rbot/" @@ -11,9 +11,17 @@ SLOT="0" KEYWORDS="x86 ~ppc ~sparc ~amd64" IUSE="spell" -RDEPEND="virtual/ruby +RDEPEND="|| ( + >=virtual/ruby-1.8 + ( + =virtual/ruby-1.6* + ( + dev-ruby/shim-ruby18 + dev-ruby/rexml + ) + ) + ) dev-ruby/ruby-bdb - dev-ruby/rexml spell? ( app-text/ispell )" DEPEND="${RDEPEND} >=sys-apps/sed-4" |