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

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

3 files changed, 12 insertions, 54 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/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)"
-}