Taking maintainership. Extensively tested, all commands run without giving an immediate error. Replaced src_unpack phase by a EAPI 5 compliant src_prepare phase. Revision bump as we now install to / instead of /opt, dropped ROOT and ROOTPATH environment variables since the binaries are already accessible through their defaults.

(Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 27 insertions, 19 deletions

diff --git a/app-admin/ec2-api-tools/ChangeLog b/app-admin/ec2-api-tools/ChangeLog
index fa363b70b78f..76e434621c2c 100644
--- a/app-admin/ec2-api-tools/ChangeLog
+++ b/app-admin/ec2-api-tools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/ec2-api-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-api-tools/ChangeLog,v 1.16 2013/03/13 21:20:04 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-api-tools/ChangeLog,v 1.17 2013/04/03 00:59:13 tomwij Exp $
+
+*ec2-api-tools-1.6.0.1-r1 (03 Apr 2013)
+
+  03 Apr 2013; Tom Wijsman <TomWij@gentoo.org> +ec2-api-tools-1.6.0.1-r1.ebuild,
+  -ec2-api-tools-1.6.0.1.ebuild, metadata.xml:
+  Taking maintainership. Extensively tested, all commands run without giving an
+  immediate error. Replaced src_unpack phase by a EAPI 5 compliant src_prepare
+  phase. Revision bump as we now install to / instead of /opt, dropped ROOT and
+  ROOTPATH environment variables since the binaries are already accessible
+  through their defaults.
 
 *ec2-api-tools-1.6.0.1 (13 Mar 2013)
 
diff --git a/app-admin/ec2-api-tools/ec2-api-tools-1.6.0.1.ebuild b/app-admin/ec2-api-tools/ec2-api-tools-1.6.0.1-r1.ebuild
index b486ef84385f..1ca5a8ee7ec8 100644
--- a/app-admin/ec2-api-tools/ec2-api-tools-1.6.0.1.ebuild
+++ b/app-admin/ec2-api-tools/ec2-api-tools-1.6.0.1-r1.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-api-tools/ec2-api-tools-1.6.0.1.ebuild,v 1.1 2013/03/13 21:20:04 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-api-tools/ec2-api-tools-1.6.0.1-r1.ebuild,v 1.1 2013/04/03 00:59:13 tomwij Exp $
 
 EAPI="5"
 
@@ -15,29 +15,24 @@ S=${WORKDIR}/${PN}-${PV}
 LICENSE="Amazon"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror"
+
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/jre"
-RESTRICT="mirror"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	find . -name '*.cmd' -delete || die
+src_prepare() {
+	find . -name '*.cmd' -delete || die "Failed to remove redundant cmd files."
 }
 
 src_install() {
-	dodir /opt/${PN}
-	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
-	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
+	exeinto /usr/bin
+	doexe bin/*
+
+	insinto /usr/lib
+	doins lib/*.jar
 
 	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-EC2_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
+	echo "EC2_HOME=/usr" > "${T}"/99${PN} || die "Failed to write configuration variable."
 	doenvd "${T}"/99${PN}
 
 	dodoc THIRDPARTYLICENSE.TXT
@@ -48,7 +43,6 @@ pkg_postinst() {
 	ewarn "to use these tools in a shell before logging out (or restarting"
 	ewarn "your login manager)"
 	elog ""
-	elog ""
 	elog "You need to put the following in your ~/.bashrc replacing the"
 	elog "values with the full paths to your key and certificate."
 	elog ""
diff --git a/app-admin/ec2-api-tools/metadata.xml b/app-admin/ec2-api-tools/metadata.xml
index 1470e032181b..a9b728a9e914 100644
--- a/app-admin/ec2-api-tools/metadata.xml
+++ b/app-admin/ec2-api-tools/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+    <email>TomWij@gentoo.org</email>
+    <name>Tom Wijsman</name>
   </maintainer>
+  <longdescription>
+    These command-line tools serve as the client interface to the Amazon EC2 web service.
+  </longdescription>
 </pkgmetadata>