From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 92A871395E2 for ; Sat, 3 Dec 2016 08:58:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60156E0C02; Sat, 3 Dec 2016 08:58:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 394A5E0BFF for ; Sat, 3 Dec 2016 08:58:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 109F73411FB for ; Sat, 3 Dec 2016 08:58:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BA7C4A8 for ; Sat, 3 Dec 2016 08:58:37 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1480755502.4f1977644c438e114ec6a17eda347f820fc6e3dc.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/ec2-ami-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6-r1.ebuild app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6.ebuild X-VCS-Directories: app-admin/ec2-ami-tools/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 4f1977644c438e114ec6a17eda347f820fc6e3dc X-VCS-Branch: master Date: Sat, 3 Dec 2016 08:58:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a2c39b97-6b95-4398-8079-fc004e7500d2 X-Archives-Hash: 2237ba56d6cf4fc91640191d4de55221 commit: 4f1977644c438e114ec6a17eda347f820fc6e3dc Author: Hans de Graaff gentoo org> AuthorDate: Sat Dec 3 08:18:06 2016 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat Dec 3 08:58:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f197764 app-admin/ec2-ami-tools: use ruby21 with ruby-single eclass Package-Manager: portage-2.3.0 ...ools-1.5.6.ebuild => ec2-ami-tools-1.5.6-r1.ebuild} | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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 similarity index 67% rename from app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6.ebuild rename to app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6-r1.ebuild index 938f477..1832818 100644 --- 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 @@ -1,12 +1,14 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -inherit versionator +USE_RUBY="ruby21" -DESCRIPTION="These command-line tools serve as the client interface to the Amazon EC2 web service" +inherit ruby-single versionator + +DESCRIPTION="Command-line tools that serve as client interface to the Amazon EC2 web service" HOMEPAGE="http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88" SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip" @@ -15,18 +17,14 @@ LICENSE="Amazon SLOT="0" KEYWORDS="~amd64 ~x86" -ruby_slot="2.0" - DEPEND="app-arch/unzip" -RDEPEND="dev-lang/ruby:${ruby_slot}[ssl] +RDEPEND=" + ${RUBY_DEPS} + virtual/ruby-ssl net-misc/rsync net-misc/curl" src_prepare() { - # Simplify the scripts to always run Ruby 20, 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.' }