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

Package-Manager: Portage-2.3.19, Repoman-2.3.6

1 files changed, 19 insertions, 19 deletions

diff --git a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
index 4d0cfb2e1d01..1cd6d1b4857c 100644
--- a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
+++ b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
@@ -1,50 +1,50 @@
-# 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 Command Line Toolkit for the Amazon Relational Database Service"
 HOMEPAGE="http://aws.amazon.com/developertools/2928"
 SRC_URI="mirror://sabayon/${CATEGORY}/RDSCli-${PV}.zip"
 
-S="${WORKDIR}/RDSCli-${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}/RDSCli-${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/*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-AWS_RDS_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
+	doexe bin/*
+
+	cat > "${T}"/99${PN} <<- EOF || die
+		AWS_RDS_HOME=/opt/${PN}
+		PATH=/opt/${PN}/bin
+		ROOTPATH=/opt/${PN}/bin
+	EOF
 	doenvd "${T}"/99${PN}
 
-	dodoc "THIRDPARTYLICENSE.TXT"
+	dodoc THIRDPARTYLICENSE.TXT
 }
 
 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."