Revision bump, keyworded again and removed broken revision. Library symlinks were accidentally installed to /, also corrected a remaining EC2_HOME related error...

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 39 insertions, 29 deletions

diff --git a/app-admin/ec2-api-tools/ChangeLog b/app-admin/ec2-api-tools/ChangeLog
index d0fe232e1135..df188e5727a4 100644
--- a/app-admin/ec2-api-tools/ChangeLog
+++ b/app-admin/ec2-api-tools/ChangeLog
@@ -1,6 +1,14 @@
 # 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.19 2013/05/31 22:09:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-api-tools/ChangeLog,v 1.20 2013/06/01 06:26:27 tomwij Exp $
+
+*ec2-api-tools-1.6.7.2-r3 (01 Jun 2013)
+
+  01 Jun 2013; Tom Wijsman <TomWij@gentoo.org> +ec2-api-tools-1.6.7.2-r3.ebuild,
+  -ec2-api-tools-1.6.7.2-r2.ebuild:
+  Revision bump, keyworded again and removed broken revision. Library symlinks
+  were accidentally installed to /, also corrected a remaining EC2_HOME related
+  error...
 
 *ec2-api-tools-1.6.7.2-r2 (31 May 2013)
 
diff --git a/app-admin/ec2-api-tools/Manifest b/app-admin/ec2-api-tools/Manifest
index b4950c0470b9..3320f2b6f8ff 100644
--- a/app-admin/ec2-api-tools/Manifest
+++ b/app-admin/ec2-api-tools/Manifest
@@ -8,18 +8,18 @@ DIST ec2-api-tools-1.6.7.2.zip 14536729 SHA256 4ff426a8d36610754699f639780c7b258
 EBUILD ec2-api-tools-1.5.6.1.ebuild 1562 SHA256 33f0514fa73f664b93a826d8237ccccb401af796219010ca8a9ac19bd6face1f SHA512 ef7fe6350f1c2a74e0f685987f9cc1aa03e9529f1ea557f035a710dda0f7099791708f9aec34f8c077ccedce1dbef18c86c483ed00d689b49a3b94684dee0f9a WHIRLPOOL 8572cf409efab0b9dbfa21b27971da53b21c0a866122f38dc841dc161460206f5798e4a68b4fe8c3791a02971af2d4c9ff709832fa07f51abe4092c0abbc531b
 EBUILD ec2-api-tools-1.6.0.0.ebuild 1562 SHA256 4dd8091c084f72077e8b37873ea789d30c70cc1ac845c5ecbf6c7b1a611a9382 SHA512 00eaf25d33a8b9bb7c0be1afa2f5ddc3cfec4560627c2c1362b517ce8a104c130098e416eb644bbe5ee2eb2094add6c1023b2d71bbc2b0a156ebecd6e21e7b60 WHIRLPOOL 54eb57d94ddba4ab1442f504034bf742f659b672403438c5b4c85654c5df718b25b257e19c8ddb03ba4d162c58620f76238b4e9f3e0b5ecd30ba94bc7a997b9c
 EBUILD ec2-api-tools-1.6.0.1-r1.ebuild 1518 SHA256 7eb887a277d8055f884643fad93fa6f29b501a0f31eb7637155aa03088c335aa SHA512 436ad48170d4af1aa12a74e0eed92c6b9d59c6e9a86aec7a59c3a313c332f16e91a2a0012c91a61166da4391fe0f3108b8245c27000ee0576c751a8e4f74847c WHIRLPOOL e1bbd7776cb104cea03d7b213dfefaf317ee787fb20e4444d3d5703d694a9960f295bee006339020639cf561c7709277cbc348e2b792cc2ed3caf12b0a89157d
-EBUILD ec2-api-tools-1.6.7.2-r2.ebuild 3187 SHA256 4dcd5968fa9e638230c762fedee27cc55ccedea5d44b49467497aed5510218a6 SHA512 c59126d6adfe04c9dbb17ad04d8298355a2c84c40c421ccba8b1710c12320d80d7da1a69174db38ad11fc8a6d5cbe76d9654dd2a54ed39e5ae3430aac376376c WHIRLPOOL 7570a828e04847e4c0b3fa8a118c4a3c407c0250f6e39562fc78e732914a83fb5c089baa0ed9250f030bcb2502624fe8775f05d359d99050ab8f7721fdc0ce4b
+EBUILD ec2-api-tools-1.6.7.2-r3.ebuild 3471 SHA256 1883bb4c1d98c6b869f19ff188e25bb5f1f17fee464b4fb267dab483bc28ef14 SHA512 56aa4e30cbf10fb22492d60563a7004183a66fa8a22a95f89e35c3f35494a7db1cc73fd98069697529f0b2382a844f724dce51a607a4cb7f3c7b3e5cf0251226 WHIRLPOOL 05aaa6c4a8db0dff55211532fbfde4f2e84cba6daf9f45914e464f8446c566f9fbb7236e0ccd555b25ffb13e41a9ae45d553402ef4547fd01740876aa953af9e
 EBUILD ec2-api-tools-1.6.7.2.ebuild 1515 SHA256 a16c5695347c09a5589623559065cce517e8457562e43f1a596a64c178c19feb SHA512 185669c1b23167cc4f272abc56369925eaaa876478adca84d38df8294204c7c400c3f14d18c872700437de8329bb3ff9f91e39e248c7f470d0ae019ca2ccde83 WHIRLPOOL 810295154aa6ced34ec719a696e82400e2aacef96f4978b6b6c3b410fe1b8d20567a8290260a0b82a4118b548b070efbad6ff811a1208d46449fee16c9cb57a2
-MISC ChangeLog 3810 SHA256 efac73baf19961816ea27c389d2bd5852e2b6ea74662fd3014bdc8dc13d6a156 SHA512 06863c33b63b324bea4a961b9d864c2d98459af3f8df9857d208aa421456f3e4cbddf90df253a29debecc8bdf3cc70613795be6af85e4d246a1b213c05f9287a WHIRLPOOL fca40ab32a4e541ac7db243fbdc99c32db611bb98637acea09e4684efd4cf3095b48da7288c42cb97661a539cb9dea61ca6d4d0258cb0e4142cff7b667d2c17d
+MISC ChangeLog 4139 SHA256 e218c0dbae29911971ca90c778497ba111a67c1626cc2b56016201a15f57abf4 SHA512 97e04aa824600e2a10a8eca11873c63a9d9f604d52e7514137471101c5f092adeafdd4e6dba491b0c5827fe4601b6afb04305a3127dc4275eedde3694d256077 WHIRLPOOL c67ce843a8ff358a2ef157dde89df9eefc847b6617e38769dfa72fc01537476e7d71c93c01933e4a3a30eaa5097241a0781f0d6c33220511342d477c67100191
 MISC metadata.xml 367 SHA256 6c3c034259db62d0e77d638aaf71cc9e622717cb4c662fc0ea8bc0d79857a435 SHA512 978a135f407c84d4326b240600d59adc55ed686f3d3243f86a9c34712674441d2363bd24c8bba2d86b789e721d6c49a16fac363a8a455998c706e48875b3e87e WHIRLPOOL 6f9877b587255891889577a673fdad7cd539df9be6ae20a780178b5fb765b68f0e977e0bdbc313248a9ea11af1934501e203932bbcf4018d23023cc0f804d1b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRqR8yAAoJEJWyH81tNOV9A4UH/3QMMgzJPhPH0T34CoHMcnlT
-BnvsMCGi9c0aUhpoQFuSGIn3cphPnDOS7GmjvqmrXF14etmYT7xN9TWbn27C9cOR
-NhQBHGXfpYe9C+tmWqWVj5goDbKI4PIlPbkoQ+3E1bAtyMTmQFzxlkE6nx/LZz0o
-3ch9xJ4MJx/ZUTKzrI27XcKdsY9dwbRx9VMoum/04gorxd1Ul681O5/0huK3Y/US
-9h1qnetgtQYRxEFkYmuLBfYXPaGsVhh9/6qfI9ecUJrrjkdPc0Jx13V9+dM01t7L
-jZMrRODIlNdWaziRzPOE9rko5wGZP+7Gk25Lpg6reVaPWvQDIWVDnZrhjVtjY0c=
-=XIMV
+iQEcBAEBCAAGBQJRqZOeAAoJEJWyH81tNOV9dNYH/iXcPTE7zkBJD7DOLDCIkRaB
+KbGexH3at1bhddNNgpeIJZ0l1QKnVVg0p44NEc44l9+kxfUL0Ax3ct83SaBmJn/9
+rY7b3yzV1zFXiQLEahBy3wAt0Vs+b6MBIp9vk93AdytRRHsKqySuhvbRKRsUjlhn
+N7KHIxz6iUDwu/enazSYaeBZYuKzrWLZozAdIyO1tLhPEF/VGo193FaXkOmrvK95
+YNMd9jOTK85L5uH60RbI3rGl78dhra73aob7EZKdl/ANSin9eAZU5h5vYkHr4BiJ
+Ao0o+AeWMybx9Lqai/h6/CmnqrKx/q89CJqc1ivXuOiUvCmtPYuLqZsUad/jqGE=
+=WkSW
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ec2-api-tools/ec2-api-tools-1.6.7.2-r2.ebuild b/app-admin/ec2-api-tools/ec2-api-tools-1.6.7.2-r3.ebuild
index 715542a5d6ba..dd71cb2a6a61 100644
--- a/app-admin/ec2-api-tools/ec2-api-tools-1.6.7.2-r2.ebuild
+++ b/app-admin/ec2-api-tools/ec2-api-tools-1.6.7.2-r3.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.7.2-r2.ebuild,v 1.1 2013/05/31 22:09:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-api-tools/ec2-api-tools-1.6.7.2-r3.ebuild,v 1.1 2013/06/01 06:26:27 tomwij Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${PV}
 
 LICENSE="Amazon"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 RESTRICT="mirror"
 
 CDEPEND="dev-java/bcprov:0
@@ -49,6 +49,7 @@ java_prepare() {
 
 	for FILE in bin/* ; do
 		sed -i 's:${EC2_HOME}:/usr:g' ${FILE} || die "Failed to set the EC2_HOME value in the wrappers."
+		sed -i '/PREFIX__EC2_HOME/d' ${FILE} || die "Failed to remove remaining redundant PREFIX__EC2_HOME lines from wrappers."
 	done
 }
 
@@ -56,24 +57,25 @@ src_install() {
 	exeinto /usr/bin
 	doexe bin/*
 
-	insinto /usr/share/${PN}/lib
+	local libs="/usr/share/${PN}/lib"
+	insinto ${libs}
 	doins lib/*.jar
-	dosym $(java-pkg_getjar bcprov{,.jar}) bcprov-jdk15-145.jar
-	dosym $(java-pkg_getjar commons-cli{-1,.jar}) commons-cli-1.1.jar
-	dosym $(java-pkg_getjar commons-codec{,.jar}) commons-codec-1.4.jar
-	dosym $(java-pkg_getjar commons-discovery{,.jar}) commons-discovery.jar
-	dosym $(java-pkg_getjar commons-httpclient{-3,.jar}) commons-httpclient-3.1.jar
-	dosym $(java-pkg_getjar commons-logging{,-adapters.jar}) commons-logging-adapters-1.1.1.jar
-	dosym $(java-pkg_getjar commons-logging{,-api.jar}) commons-logging-api-1.1.1.jar
-	dosym $(java-pkg_getjar jaxb{-2,-api.jar}) jaxb-api.jar
-	dosym $(java-pkg_getjar jaxb{-2,-impl.jar}) jaxb-impl.jar
-	dosym $(java-pkg_getjar jax-ws{-2,.jar}) jaxws-api.jar
-	dosym $(java-pkg_getjar jdom{-1.0,.jar}) jdom.jar
-	dosym $(java-pkg_getjar log4j{,.jar}) log4j-1.2.14.jar
-	dosym $(java-pkg_getjar jsr173{,.jar}) stax2-api-3.0.1.jar
-	dosym $(java-pkg_getjar wsdl4j{,.jar}) wsdl4j.jar
-	dosym $(java-pkg_getjar xalan{,.jar}) xalan.jar
-	dosym $(java-pkg_getjar xerces{-2,Impl.jar}) xercesImpl.jar
+	dosym $(java-pkg_getjar bcprov{,.jar}) ${libs}/bcprov-jdk15-145.jar
+	dosym $(java-pkg_getjar commons-cli{-1,.jar}) ${libs}/commons-cli-1.1.jar
+	dosym $(java-pkg_getjar commons-codec{,.jar}) ${libs}/commons-codec-1.4.jar
+	dosym $(java-pkg_getjar commons-discovery{,.jar}) ${libs}/commons-discovery.jar
+	dosym $(java-pkg_getjar commons-httpclient{-3,.jar}) ${libs}/commons-httpclient-3.1.jar
+	dosym $(java-pkg_getjar commons-logging{,-adapters.jar}) ${libs}/commons-logging-adapters-1.1.1.jar
+	dosym $(java-pkg_getjar commons-logging{,-api.jar}) ${libs}/commons-logging-api-1.1.1.jar
+	dosym $(java-pkg_getjar jaxb{-2,-api.jar}) ${libs}/jaxb-api.jar
+	dosym $(java-pkg_getjar jaxb{-2,-impl.jar}) ${libs}/jaxb-impl.jar
+	dosym $(java-pkg_getjar jax-ws{-2,.jar}) ${libs}/jaxws-api.jar
+	dosym $(java-pkg_getjar jdom{-1.0,.jar}) ${libs}/jdom.jar
+	dosym $(java-pkg_getjar log4j{,.jar}) ${libs}/log4j-1.2.14.jar
+	dosym $(java-pkg_getjar jsr173{,.jar}) ${libs}/stax2-api-3.0.1.jar
+	dosym $(java-pkg_getjar wsdl4j{,.jar}) ${libs}/wsdl4j.jar
+	dosym $(java-pkg_getjar xalan{,.jar}) ${libs}/xalan.jar
+	dosym $(java-pkg_getjar xerces{-2,Impl.jar}) ${libs}/xercesImpl.jar
 
 	dodoc THIRDPARTYLICENSE.TXT
 }