Make sure that the executables are executables. Thanks to Jonas Bernoulli in bug #345777.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 17 insertions, 61 deletions

diff --git a/app-admin/ec2-ami-tools/ChangeLog b/app-admin/ec2-ami-tools/ChangeLog
index 6709ccbc9808..0526fdb64f71 100644
--- a/app-admin/ec2-ami-tools/ChangeLog
+++ b/app-admin/ec2-ami-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/ec2-ami-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.6 2010/10/05 11:11:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.7 2010/11/16 22:16:38 flameeyes Exp $
+
+*ec2-ami-tools-1.3.57676-r1 (16 Nov 2010)
+
+  16 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ec2-ami-tools-1.3.49953.ebuild, -ec2-ami-tools-1.3.57676.ebuild,
+  +ec2-ami-tools-1.3.57676-r1.ebuild:
+  Make sure that the executables are executables. Thanks to Jonas Bernoulli
+  in bug #345777.
 
 *ec2-ami-tools-1.3.57676 (05 Oct 2010)
 
diff --git a/app-admin/ec2-ami-tools/Manifest b/app-admin/ec2-ami-tools/Manifest
index 0894e1321401..1cc94d4b56d0 100644
--- a/app-admin/ec2-ami-tools/Manifest
+++ b/app-admin/ec2-ami-tools/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST ec2-ami-tools-1.3-34544.zip 137161 RMD160 a0d6bec4ab5139d8e68de245ca12a1b3f51158ce SHA1 ffc1b93a73601996e3b58395d2a50a2fb385c16e SHA256 1a44fe0ce2ff66a23e354fae9dd2fa52fe472bc4fbd30f768ae4b706b52127df
-DIST ec2-ami-tools-1.3-49953.zip 137477 RMD160 a6ad4a7e3ee6c4d1d2e3994266c2bacf3e0b8c36 SHA1 bc2e5bf609f213845252c662d92d434864864009 SHA256 88e67cb64687887fcf3bb1333decc730c5c4919e90c8153ebc11411ab4adf932
 DIST ec2-ami-tools-1.3-57676.zip 137908 RMD160 64f662c8c7b7607abe9700a03682062bebb8a361 SHA1 195406a962ee022927833186a84f0c5502b47354 SHA256 5d17641700de933f428a1d1bb6e70f69acaf1e68ee3331c780ec7a085b150c30
 EBUILD ec2-ami-tools-1.3.34544.ebuild 1572 RMD160 7186b3c69368aac57ede776804788f7f04bfaf17 SHA1 582784ded6282b959e6b48e58ffe42f60d682795 SHA256 44015def96bc8014c8142516b910fbfc13e45e5a98de6d180513a8f55d93e085
-EBUILD ec2-ami-tools-1.3.49953.ebuild 1501 RMD160 51951a4ea97b6f60af848025722bdb7c720b3fa9 SHA1 9eab2adb1526709662259fdc3849fe11030caf06 SHA256 b5589c95f427c541b366f7c69e776577c4f55d82d57029caab2b3d734b0dafd0
-EBUILD ec2-ami-tools-1.3.57676.ebuild 1501 RMD160 5703c56e78241f1860fc4fe09aa8fe756f92689d SHA1 a5751ecdc9a7f19198d22c192ebb9bd54cbb65b7 SHA256 da1af74cb858c3cb8ad68afb9560f2f7d02616e74a2df845d80f4dd74dc5614a
-MISC ChangeLog 1465 RMD160 97aa6cf2b69471c8911046ef8e602b029139ea2e SHA1 5684c68fe4fcb619bc68b1a177c43454fd65b355 SHA256 01efb612b9e025843e28f02323c36e81be4f6c8dd2c8c4ff1d812bab7913e389
+EBUILD ec2-ami-tools-1.3.57676-r1.ebuild 1540 RMD160 df05877be13d9767d3b8955ab5618dd8895b01eb SHA1 853bd379061a6358627601f7d476ec4650542242 SHA256 a63341537a584b047c6f294fe181a05280064a21029a007e17a777cbac7979f0
+MISC ChangeLog 1765 RMD160 a2e90721c59a9a931130f33427a9a64faf03dbaf SHA1 0fea29d603972d406476a87a581073b53434e294 SHA256 1cfacb604fe7c032ba6871d0c7a7d9b34e01de43319af1158b56d95856e6985a
 MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyrB+UACgkQAiZjviIA2XgblgCdHLqWLOlVc7DZPyLC1/j9TrM6
-g9QAn2z2KNfNwRFUUepo3Yy9qhvMtlPW
-=A1O1
+iEYEARECAAYFAkzjApgACgkQAiZjviIA2XjVzQCfRQiwdsUy2GS3fWCiWo2bkucL
+wj0AoJ+6QoteExQI9M4Y6XCdFYI2rFj4
+=JoNU
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.49953.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.57676-r1.ebuild
index cc17ec000d76..d4d4c286769a 100644
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.49953.ebuild
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.57676-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.3.49953.ebuild,v 1.1 2010/06/03 12:46:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.57676-r1.ebuild,v 1.1 2010/11/16 22:16:38 flameeyes Exp $
 
 EAPI=2
 
@@ -37,6 +37,8 @@ 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}
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.57676.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.57676.ebuild
deleted file mode 100644
index 0a76d96c3689..000000000000
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.57676.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 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.3.57676.ebuild,v 1.1 2010/10/05 11:11:46 flameeyes Exp $
-
-EAPI=2
-
-inherit versionator
-
-EC2_VERSION=$(get_version_component_range 1-2)
-EC2_PATCHLEVEL=$(get_version_component_range 3)
-
-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/${PN}-${EC2_VERSION}-${EC2_PATCHLEVEL}.zip"
-
-S=${WORKDIR}/${PN}-${EC2_VERSION}-${EC2_PATCHLEVEL}
-
-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"
-
-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
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-EC2_AMITOOL_HOME=/opt/${PN}
-PATH=/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)"
-}