diff options
author | Mamoru Komachi <usata@gentoo.org> | 2004-01-25 16:12:14 +0000 |
---|---|---|
committer | Mamoru Komachi <usata@gentoo.org> | 2004-01-25 16:12:14 +0000 |
commit | d29e5cdfa894dfc3c91e93bb3da50cdeaafccebf (patch) | |
tree | 1ccd4012a3bc16bff54ea5e4f6e1c53415a2d794 /dev-ruby | |
parent | Define RUBY iff RUBY is not set (diff) | |
download | gentoo-2-d29e5cdfa894dfc3c91e93bb3da50cdeaafccebf.tar.gz gentoo-2-d29e5cdfa894dfc3c91e93bb3da50cdeaafccebf.tar.bz2 gentoo-2-d29e5cdfa894dfc3c91e93bb3da50cdeaafccebf.zip |
Don't provide dev-lang/ruby-1.8.1 because ruby-cvs shouldn't block shim-ruby18 but dev-lang/ruby.
Diffstat (limited to 'dev-ruby')
-rw-r--r-- | dev-ruby/shim-ruby18/ChangeLog | 9 | ||||
-rw-r--r-- | dev-ruby/shim-ruby18/Manifest | 6 | ||||
-rw-r--r-- | dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild | 10 | ||||
-rw-r--r-- | dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3.ebuild | 12 |
4 files changed, 21 insertions, 16 deletions
diff --git a/dev-ruby/shim-ruby18/ChangeLog b/dev-ruby/shim-ruby18/ChangeLog index cd6d8ba810b0..87bca2e61c85 100644 --- a/dev-ruby/shim-ruby18/ChangeLog +++ b/dev-ruby/shim-ruby18/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/shim-ruby18 -# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/ChangeLog,v 1.2 2003/12/20 01:22:23 usata Exp $ +# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/ChangeLog,v 1.3 2004/01/25 16:12:00 usata Exp $ + + 26 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> + shim-ruby18-1.8.1_pre2.ebuild, shim-ruby18-1.8.1_pre3.ebuild: + Don't provide dev-lang/ruby-1.8.1 because ruby-cvs shouldn't block + shim-ruby18 but dev-lang/ruby. *shim-ruby18-1.8.1_pre3 (20 Dec 2003) diff --git a/dev-ruby/shim-ruby18/Manifest b/dev-ruby/shim-ruby18/Manifest index eb6f65c5d044..66001f11b0ee 100644 --- a/dev-ruby/shim-ruby18/Manifest +++ b/dev-ruby/shim-ruby18/Manifest @@ -1,6 +1,6 @@ +MD5 7a44601ddb068d6b520bf32b89337975 shim-ruby18-1.8.1_pre2.ebuild 833 +MD5 1b696eb328d3f67c46254bbfcbb433f0 ChangeLog 784 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 -MD5 5eb998378cba691431ae2521d42aa901 shim-ruby18-1.8.1_pre2.ebuild 788 -MD5 b60c1785c52bf385a98f66244457a982 ChangeLog 568 -MD5 1d81981a0e97d95e656197d4656810a8 shim-ruby18-1.8.1_pre3.ebuild 789 +MD5 84ff1e677c2b1405fde75e592aa3ed3c shim-ruby18-1.8.1_pre3.ebuild 833 MD5 5bf2aa03e12c37d6908b1714ebef9109 files/digest-shim-ruby18-1.8.1_pre2 82 MD5 1bee4786a6d10dd4fcad55da02c4a06b files/digest-shim-ruby18-1.8.1_pre3 82 diff --git a/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild b/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild index 420ccaa39408..4c5145c74e77 100644 --- a/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild +++ b/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild,v 1.2 2003/12/20 01:22:23 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre2.ebuild,v 1.3 2004/01/25 16:12:00 usata Exp $ inherit ruby @@ -15,11 +15,11 @@ SLOT="0" KEYWORDS="x86" IUSE="" -USE_RUBY="ruby16" +# don't define USE_RUBY since shim-ruby only supports ruby16 +RUBY="/usr/bin/ruby16" DEPEND="~dev-lang/ruby-1.6.8" -PROVIDE="dev-lang/ruby-${PV} - dev-ruby/strscan +PROVIDE="dev-ruby/strscan dev-ruby/racc dev-ruby/optparse" diff --git a/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3.ebuild b/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3.ebuild index 03534b7ac7d1..53e72d385ec0 100644 --- a/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3.ebuild +++ b/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3.ebuild,v 1.1 2003/12/20 01:22:23 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shim-ruby18/shim-ruby18-1.8.1_pre3.ebuild,v 1.2 2004/01/25 16:12:00 usata Exp $ inherit ruby @@ -12,14 +12,14 @@ SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/shim/${MY_P}.tar.bz2" LICENSE="Ruby" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="x86" IUSE="" -USE_RUBY="ruby16" +# don't define USE_RUBY since shim-ruby only supports ruby16 +RUBY="/usr/bin/ruby16" DEPEND="~dev-lang/ruby-1.6.8" -PROVIDE="dev-lang/ruby-${PV} - dev-ruby/strscan +PROVIDE="dev-ruby/strscan dev-ruby/racc dev-ruby/optparse" |