Revison bump. Depend on Ruby 1.9.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 25 insertions, 59 deletions

diff --git a/app-admin/ec2-ami-tools/ChangeLog b/app-admin/ec2-ami-tools/ChangeLog
index 64eca4069ca6..5734587402fd 100644
--- a/app-admin/ec2-ami-tools/ChangeLog
+++ b/app-admin/ec2-ami-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2013/04/02 22:50:49 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.15 2013/09/04 12:56:00 tomwij Exp $
+
+*ec2-ami-tools-1.4.0.5-r2 (04 Sep 2013)
+
+  04 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +ec2-ami-tools-1.4.0.5-r2.ebuild,
+  -ec2-ami-tools-1.4.0.2.ebuild, -ec2-ami-tools-1.4.0.5-r1.ebuild:
+  Revison bump. Depend on Ruby 1.9.
 
   02 Apr 2013; Tom Wijsman <TomWij@gentoo.org> -ec2-ami-tools-1.4.0.5.ebuild,
   ec2-ami-tools-1.4.0.5-r1.ebuild:
diff --git a/app-admin/ec2-ami-tools/Manifest b/app-admin/ec2-ami-tools/Manifest
index 649bf706340c..6e83052334bc 100644
--- a/app-admin/ec2-ami-tools/Manifest
+++ b/app-admin/ec2-ami-tools/Manifest
@@ -1,6 +1,18 @@
-DIST ec2-ami-tools-1.4.0.2.zip 139153 SHA256 e80cf8b27e35efee516068e84eb2bd2042a8ea870c5c41e3fc83e5a188c18c36 SHA512 95e13c6f50844cee5e1c30a58eb2137bdb4196a5bad17193b53d3c93db833853b4decd675fd403accf1384792010173f5bd9000db01e4e6b5d08b3861252de36 WHIRLPOOL c6b698bb239c8e1b4b9309188a99cfa179592ea9a1c8c000a4c3da0409bb60172b9b1e04ed9479aee34b73d81deda3851bcf4b9c378465531aa6a498e29b382c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ec2-ami-tools-1.4.0.5.zip 139373 SHA256 e5a8f49826c85c9df2421e36d618fb9bc1951bb0eeb45680c4379a0362c50d6e SHA512 e9754b26b61e168760002ac3c15d83c8d9f702e478c2295df42ae9e08e7d1788c73b60f7292867d8df553225a82e70ac335419dbcc226e3f0e251f1950a66621 WHIRLPOOL c71b102824595ceeeee693ad5cfca5dd7120510b2f4165fd7010f9cf9de3d4bcb5242166ee58b8295f4ff7f2a1dccaa834bb277ccf325928ede9307bd18da980
-EBUILD ec2-ami-tools-1.4.0.2.ebuild 1393 SHA256 ba9829a98e47224fd88a9e0ba44010ce218fd720e5bf085ae7087804f7e55032 SHA512 4562ef4eade5e62dede45e8b7233ea5883e76fd9e8abe7fa5c2f154f7ca2db7a0b30f26196dfa47dea101cc6a5e4289cecbdf2531147c5a4779e0804f14843ba WHIRLPOOL f43dde30592313f35649cd81929939b4e3b537d1860885d8c68318e260712910bbae68445699cec63929f922525c7325baeb74f59054ebdbedc22e6df136b42d
-EBUILD ec2-ami-tools-1.4.0.5-r1.ebuild 1612 SHA256 a8568193c1b65f816d5d11c5b58552f8aefcf27582eed0d1d71b601e6887f2d3 SHA512 3721bbbc3dacba3886e9dac3c9385e79225111a2286b79175c334621ab8787cfe1313f084cee89634f6c1b16d3c639ee21f0cdd3598ea3254a41817db627f1af WHIRLPOOL 7c8ea60135a7c23aa7f2555e7a9a92672baedf744117af9d982299c8d72be89015e85c27cc40775d8192d8e61728aeb53eb142b99f89a440d0bfff53cc70d1b3
-MISC ChangeLog 3214 SHA256 97f073099ca1a515afdf00efdd0ed97c505353739e3fc2069db16836734fd0cc SHA512 dce0760718237f1c240851fc7ca791644fa6807c7f7ca43e3716529c0257fa8c99e50d1801bf697621ea60ca25263f89955969afb12963ff3f5b2a06a24a1074 WHIRLPOOL 0d14152b1bd25abf51d7c1e044ec92aedfb78c98c3040bc0f25a30bf861711b578931617372e1b047e880770ef44723a748d985962eb7ca8f3149df9ea2c0519
+EBUILD ec2-ami-tools-1.4.0.5-r2.ebuild 1612 SHA256 0da7dbc5295a8a68a9da2abfc608b4f888fd6f964b8130b3e33005c05f2ac8ea SHA512 fa57845d6e1572931c4cdde42bab4561dc42782d913168efed73a87618c3dce14812faa527ac0072055de6ef45ecef5fcff742bf9105024f136b4c21cb360a2e WHIRLPOOL b6d0e2a5166da6cdcf6d9c0951c8cec2f32d6a9e97b951fb4742656d2eadf40321087bddf343836f5e09e3b52bb53597fa11406c289ac2a63a566cf33666de9c
+MISC ChangeLog 3440 SHA256 f41b0d20f15b0a1f5bc35b9e271284c10eca98269bb9edc1c3963e8ff01f43b3 SHA512 25b22e06631738149cd602d25ad6b47047a6185bb7bc69cce4d58fa818b25ee8dcb47f7929bddb09dee721e976f12b627f611e30d388d8605a8f48375045429d WHIRLPOOL 3c7ef47801ffc0293378811b185769d8edfc7b8a52253a98c7bb847fe819521d21f634d1fb61dce4f9b05248373e99bf1f8806902e488f7d2babe9090a1a3231
 MISC metadata.xml 367 SHA256 6c3c034259db62d0e77d638aaf71cc9e622717cb4c662fc0ea8bc0d79857a435 SHA512 978a135f407c84d4326b240600d59adc55ed686f3d3243f86a9c34712674441d2363bd24c8bba2d86b789e721d6c49a16fac363a8a455998c706e48875b3e87e WHIRLPOOL 6f9877b587255891889577a673fdad7cd539df9be6ae20a780178b5fb765b68f0e977e0bdbc313248a9ea11af1934501e203932bbcf4018d23023cc0f804d1b2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSJy3pAAoJEJWyH81tNOV97AMH/3pg4AVH06Ixrsj4RzL3Pe8E
+k4K3VpojjY7sn5ZR4qg5iObRhjeZwbbBg/fYGHnIUPHrpZSKYz8yu9XGIBciydw/
+PBNYgLh4dzAOpkW1oV/nAkxPeRtOhbDFTR4sEJ1K3/Hm6n0QBMQlX2qQJ3jiQCNg
+mBEth/pvh2PUDh6IkE6RNjZFk9rW3zLlk+6X3UEn96esvNzzlUmwA/rmyDVJrYcM
+8ipSbmzaq0kzwHbo18gnzNRWwNbNObNd3xmq4k2CoeLC0X9FVU5mtGNKusdHDkme
+V2+rIskn10BbtLx+mYiOBzwgN+/C8XFZNpTbwY/hc8HO4nAe/IGx4WBIVaojfYk=
+=OrBJ
+-----END PGP SIGNATURE-----
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.2.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.2.ebuild
deleted file mode 100644
index f1e80a294a88..000000000000
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 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.2.ebuild,v 1.1 2011/12/14 13:50:24 lxnay Exp $
-
-EAPI=2
-
-inherit versionator
-
-DESCRIPTION="These command-line tools serve as the 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"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND="dev-lang/ruby:1.8[ssl]
-	net-misc/rsync
-	net-misc/curl"
-
-S="${WORKDIR}/${P}"
-
-src_prepare() {
-	find . -name '*.cmd' -delete || die
-
-	# simplify the scripts to always run ruby18, since that seems to
-	# be what upstream has been using, and we support alternative
-	# implementations as well.
-	sed -i -e '$s:^ruby:exec ruby18:' bin/* || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r lib bin etc || die
-
-	chmod 0755 "${D}/opt/${PN}/bin/"*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-EC2_AMITOOL_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
-	doenvd "${T}"/99${PN}
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-}
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r1.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r2.ebuild
index 8b58d66d55d0..e2baba6d03c7 100644
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r1.ebuild
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r2.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-r1.ebuild,v 1.2 2013/04/02 22:50:49 tomwij Exp $
+# $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 $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/unzip"
-RDEPEND="dev-lang/ruby:1.8[ssl]
+RDEPEND="dev-lang/ruby:1.9[ssl]
 	net-misc/rsync
 	net-misc/curl"