diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-09-07 14:22:59 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-09-07 14:22:59 +0000 |
| commit | da83fb53dac8a22bee4a714f4a5d4770f919ea12 (patch) | |
| tree | 205f227098b1cb312cb4c36794d262641eb2b3b8 /app-admin/ec2-ami-tools | |
| parent | Add back ruby18 to keep support for it until it is actually dropped. (diff) | |
| download | gentoo-2-da83fb53dac8a22bee4a714f4a5d4770f919ea12.tar.gz gentoo-2-da83fb53dac8a22bee4a714f4a5d4770f919ea12.tar.bz2 gentoo-2-da83fb53dac8a22bee4a714f4a5d4770f919ea12.zip | |
Revision bump. Fixed up ruby version sed by using a variable instead and removed redundant S definition. Fixes bug #483832 reported by Paul Tobias.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'app-admin/ec2-ami-tools')
| -rw-r--r-- | app-admin/ec2-ami-tools/ChangeLog | 9 | ||||
| -rw-r--r-- | app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r3.ebuild (renamed from app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r2.ebuild) | 16 |
2 files changed, 15 insertions, 10 deletions
diff --git a/app-admin/ec2-ami-tools/ChangeLog b/app-admin/ec2-ami-tools/ChangeLog index 5734587402fd..fd1b81628300 100644 --- a/app-admin/ec2-ami-tools/ChangeLog +++ b/app-admin/ec2-ami-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/ec2-ami-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.15 2013/09/04 12:56:00 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.16 2013/09/07 14:22:59 tomwij Exp $ + +*ec2-ami-tools-1.4.0.5-r3 (07 Sep 2013) + + 07 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +ec2-ami-tools-1.4.0.5-r3.ebuild, + -ec2-ami-tools-1.4.0.5-r2.ebuild: + Revision bump. Fixed up ruby version sed by using a variable instead and + removed redundant S definition. Fixes bug #483832 reported by Paul Tobias. *ec2-ami-tools-1.4.0.5-r2 (04 Sep 2013) diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r2.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r3.ebuild index e2baba6d03c7..bd4b6d05890f 100644 --- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r2.ebuild +++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r2.ebuild,v 1.1 2013/09/04 12:56:00 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r3.ebuild,v 1.1 2013/09/07 14:22:59 tomwij Exp $ EAPI="5" @@ -15,19 +15,17 @@ LICENSE="Amazon SLOT="0" KEYWORDS="~amd64 ~x86" +ruby_slot="1.9" + DEPEND="app-arch/unzip" -RDEPEND="dev-lang/ruby:1.9[ssl] +RDEPEND="dev-lang/ruby:${ruby_slot}[ssl] net-misc/rsync net-misc/curl" -S="${WORKDIR}/${P}" - src_prepare() { - # Simplify the scripts to always run Ruby 18, since that seems to - # be what upstream has been using; since Gentoo supports alternative - # implementations as well it is not guaranteed that ruby is ruby18. - # There are forks which patch this, but Amazon hasn't patched this yet. - sed -i -e '$s:^ruby:exec ruby18:' bin/* || die 'Sed failed.' + # Simplify the scripts to always run Ruby 19, since Gentoo supports + # alternative implementations as well it is not guaranteed that ruby is ruby19. + sed -i -e "\$s:^ruby:exec ruby${ruby_slot/./}:" bin/* || die 'Sed failed.' # Remove a left behind license file. rm lib/ec2/oem/LICENSE.txt || die 'Removal of LICENSE failed.' |