Takeover, remove old version, bump to latest, depend on Ruby 1.8 with OpenSSL support, and make sure it still works if Ruby 1.9 or RubyEE are selected.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 28 insertions, 20 deletions

diff --git a/app-admin/ec2-ami-tools/ChangeLog b/app-admin/ec2-ami-tools/ChangeLog
index c05d5773d7fe..919465c75268 100644
--- a/app-admin/ec2-ami-tools/ChangeLog
+++ b/app-admin/ec2-ami-tools/ChangeLog
@@ -1,6 +1,15 @@
 # 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.4 2010/06/02 06:54:45 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.5 2010/06/03 12:46:06 flameeyes Exp $
+
+*ec2-ami-tools-1.3.49953 (03 Jun 2010)
+
+  03 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ec2-ami-tools-1.3.45758.ebuild, +ec2-ami-tools-1.3.49953.ebuild,
+  metadata.xml:
+  Takeover, remove old version, bump to latest, depend on Ruby 1.8 with
+  OpenSSL support, and make sure it still works if Ruby 1.9 or RubyEE are
+  selected.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove caleb from metadata.xml (#317071)
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.45758.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.49953.ebuild
index dd13ea03e0a6..cc17ec000d76 100644
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.45758.ebuild
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.3.49953.ebuild
@@ -1,6 +1,8 @@
 # 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.45758.ebuild,v 1.1 2010/01/28 13:41:59 flameeyes Exp $
+# $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 $
+
+EAPI=2
 
 inherit versionator
 
@@ -8,7 +10,7 @@ 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=351&categoryID=88"
+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}
@@ -18,25 +20,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="app-arch/unzip"
-RDEPEND="dev-lang/ruby
+RDEPEND="dev-lang/ruby:1.8[ssl]
 	net-misc/rsync
 	net-misc/curl"
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/${PN}-${EC2_VERSION}-${EC2_PATCHLEVEL}"
-	find . -name *.cmd -exec rm {} \;
+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() {
-	dodir /opt/${PN}
-	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
-	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
-
-	insinto /opt/${PN}/etc
-	doins -r "${S}"/etc/*
+	insinto /opt/${PN}
+	doins -r lib bin etc || die
 
 	dodir /etc/env.d
 	cat - > "${T}"/99${PN} <<EOF
diff --git a/app-admin/ec2-ami-tools/metadata.xml b/app-admin/ec2-ami-tools/metadata.xml
index 9f3fdee2246b..2d083ce3bc66 100644
--- a/app-admin/ec2-ami-tools/metadata.xml
+++ b/app-admin/ec2-ami-tools/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>