1 |
commit: 4f1977644c438e114ec6a17eda347f820fc6e3dc |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 3 08:18:06 2016 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 3 08:58:22 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f197764 |
7 |
|
8 |
app-admin/ec2-ami-tools: use ruby21 with ruby-single eclass |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
...ools-1.5.6.ebuild => ec2-ami-tools-1.5.6-r1.ebuild} | 18 ++++++++---------- |
13 |
1 file changed, 8 insertions(+), 10 deletions(-) |
14 |
|
15 |
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6-r1.ebuild |
16 |
similarity index 67% |
17 |
rename from app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6.ebuild |
18 |
rename to app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6-r1.ebuild |
19 |
index 938f477..1832818 100644 |
20 |
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6.ebuild |
21 |
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6-r1.ebuild |
22 |
@@ -1,12 +1,14 @@ |
23 |
-# Copyright 1999-2015 Gentoo Foundation |
24 |
+# Copyright 1999-2016 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
# $Id$ |
27 |
|
28 |
EAPI="5" |
29 |
|
30 |
-inherit versionator |
31 |
+USE_RUBY="ruby21" |
32 |
|
33 |
-DESCRIPTION="These command-line tools serve as the client interface to the Amazon EC2 web service" |
34 |
+inherit ruby-single versionator |
35 |
+ |
36 |
+DESCRIPTION="Command-line tools that serve as client interface to the Amazon EC2 web service" |
37 |
HOMEPAGE="http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88" |
38 |
SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip" |
39 |
|
40 |
@@ -15,18 +17,14 @@ LICENSE="Amazon |
41 |
SLOT="0" |
42 |
KEYWORDS="~amd64 ~x86" |
43 |
|
44 |
-ruby_slot="2.0" |
45 |
- |
46 |
DEPEND="app-arch/unzip" |
47 |
-RDEPEND="dev-lang/ruby:${ruby_slot}[ssl] |
48 |
+RDEPEND=" |
49 |
+ ${RUBY_DEPS} |
50 |
+ virtual/ruby-ssl |
51 |
net-misc/rsync |
52 |
net-misc/curl" |
53 |
|
54 |
src_prepare() { |
55 |
- # Simplify the scripts to always run Ruby 20, since Gentoo supports |
56 |
- # alternative implementations as well it is not guaranteed that ruby is ruby19. |
57 |
- sed -i -e "\$s:^ruby:exec ruby${ruby_slot/./}:" bin/* || die 'Sed failed.' |
58 |
- |
59 |
# Remove a left behind license file. |
60 |
rm lib/ec2/oem/LICENSE.txt || die 'Removal of LICENSE failed.' |
61 |
} |