[gentoo-commits] repo/gentoo:master commit in: app-admin/aws-cw-tools/

["David Seifert" <soap@gentoo.org>]

commit:     16b734e2b4f93504d82306560a26eb41a7d8f1a8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 18:13:51 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 22:31:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b734e2

app-admin/aws-cw-tools: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild      | 33 +++++++++++-----------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
index cef18133833..ab4c5fb5543 100644
--- a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
+++ b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
@@ -1,42 +1,42 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 DESCRIPTION="The API tools serve as the client interface to the Amazon CloudWatch web service"
 HOMEPAGE="http://aws.amazon.com/developertools/2534"
 # SRC_URI="http://ec2-downloads.s3.amazonaws.com/CloudWatch-2010-08-01.zip"
 SRC_URI="mirror://sabayon/${CATEGORY}/CloudWatch-${PV}.zip"
 
-S="${WORKDIR}/CloudWatch-${PV}"
-
 LICENSE="Amazon"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror"
+
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/jre"
-RESTRICT="mirror"
 
-src_unpack() {
-	unpack ${A}
-	cd "$S"
+S="${WORKDIR}/CloudWatch-${PV}"
+
+src_prepare() {
+	default
 	find . -name '*.cmd' -delete || die
 }
 
 src_install() {
-	dodir /opt/${PN}
 	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
+	doins -r lib/.
+
 	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
+	doexe bin/*
 
 	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-AWS_CLOUDWATCH_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
+	cat - > "${T}"/99${PN} <<- EOF || die
+		AWS_CLOUDWATCH_HOME=/opt/${PN}
+		PATH=/opt/${PN}/bin
+		ROOTPATH=/opt/${PN}/bin
+	EOF
 	doenvd "${T}"/99${PN}
 
 	dodoc "THIRDPARTYLICENSE.TXT"
@@ -46,6 +46,7 @@ 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)"
+
 	elog
 	elog "You need to put the following in your ~/.bashrc replacing the"
 	elog "values with the full path to your AWS credentials file."