gentoo resync : 30.12.2017

3 files changed, 17 insertions, 77 deletions

diff --git a/app-admin/aws-elb-tools/Manifest b/app-admin/aws-elb-tools/Manifest
index aaa455f90222..3ce8b7d4817e 100644
--- a/app-admin/aws-elb-tools/Manifest
+++ b/app-admin/aws-elb-tools/Manifest
@@ -1,4 +1,3 @@
 DIST ElasticLoadBalancing-1.0.15.1.zip 6717939 BLAKE2B deef8cfb32a9c0d3627af26f32430efbe27a7712acd7c5dd9b7e8947b7c16ac866cec64100dd1bc315c4a2729451d181da8d16f133ea81fc927452cce6cc4f9b SHA512 813f00d632b483a5ec98632d830be4b02fc1bc71aa7bd845faa477f7d05bda7c801e5d83992c111dfc136bf5e1204bf96b00a1c24e5b19438decb356d0841725
-EBUILD aws-elb-tools-1.0.15.1-r1.ebuild 1597 BLAKE2B 4fbff7e2d910af09ac36261761f616cf8e074da88b7abfb5b1589463768cadc161025a29b2cd3c90c2db1d7cc5097d1991987733283a83677b2bec997437dadd SHA512 e6713f7b785b47814b20b7bb27c5c87183f30ebca7622de0de778fa9dcb716a69c5a54f177ada999b266a8df081fdf8aab1fcbfe08d8225acd111572c1c04d19
-EBUILD aws-elb-tools-1.0.15.1.ebuild 1611 BLAKE2B 59f2197f963af6779f57109b855057147a9be257e19a3a483f2448fd3c7056bb711806ba25e6f7c33bd205ec6df863e4d168d19c7b9823980b5bc40dca20eb8b SHA512 5cf3b2bd5ff8c580d3adf1d144a01402cf55487ebd62ec25e9e2aaffacf32106eaa2e70b6be46a9bd6a125f8580ef2c295992651d410619f80a127f949b9ca0e
+EBUILD aws-elb-tools-1.0.15.1-r1.ebuild 1562 BLAKE2B 54ac1fd7d026dd4f58dc2d1a294efa97ca4f6c94c869a968cee44e104e31356be2309e931d1c764fa5d8e1b5a1ee2c10df49880fb8d223d6927ccc34e9432b62 SHA512 a443939e59330c71b6b360c0420d18649ea21c26eefb4f8da961295faed18242578354bc954c8d64359168308b8a3d1a2bb57116c515e1ea734e87ac17c01672
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
index c1738a3ffad9..7b6784456062 100644
--- a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
+++ b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,15 +7,16 @@ DESCRIPTION="Serves as the client interface to the Elastic Load Balancing web se
 HOMEPAGE="http://aws.amazon.com/developertools/Amazon-EC2/2536"
 SRC_URI="mirror://sabayon/${CATEGORY}/ElasticLoadBalancing-${PV}.zip"
 
-S="${WORKDIR}/ElasticLoadBalancing-${PV}"
-
 LICENSE="Amazon"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror"
+
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/jre"
-RESTRICT="mirror"
+
+S="${WORKDIR}/ElasticLoadBalancing-${PV}"
 
 src_prepare() {
 	default
@@ -23,27 +24,27 @@ src_prepare() {
 }
 
 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_ELB_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
+	doexe bin/*
+
+	cat > "${T}"/99${PN} <<- EOF || die
+		AWS_ELB_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."
diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
deleted file mode 100644
index 23ee15e13fe6..000000000000
--- a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="Serves as the client interface to the Elastic Load Balancing web service"
-HOMEPAGE="http://aws.amazon.com/developertools/Amazon-EC2/2536"
-SRC_URI="mirror://sabayon/${CATEGORY}/ElasticLoadBalancing-${PV}.zip"
-
-S="${WORKDIR}/ElasticLoadBalancing-${PV}"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-RESTRICT="mirror"
-
-src_unpack() {
-	unpack ${A}
-	cd "$S"
-	find . -name '*.cmd' -delete || die
-}
-
-src_install() {
-	dodir /opt/${PN}
-	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
-	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-AWS_ELB_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
-	doenvd "${T}"/99${PN}
-
-	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."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}