Unbundled half of the libraries, the other half is missing, committed as unkeyworded since this is a work in progress and breaks a lot of things; reported by robbat2 on IRC, tracked in bug #471942.

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

3 files changed, 106 insertions, 10 deletions

diff --git a/app-admin/ec2-api-tools/ChangeLog b/app-admin/ec2-api-tools/ChangeLog
index da00d4e7af49..d0fe232e1135 100644
--- a/app-admin/ec2-api-tools/ChangeLog
+++ b/app-admin/ec2-api-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2013/04/26 21:06:55 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-api-tools/ChangeLog,v 1.19 2013/05/31 22:09:47 tomwij Exp $
+
+*ec2-api-tools-1.6.7.2-r2 (31 May 2013)
+
+  31 May 2013; Tom Wijsman <TomWij@gentoo.org> +ec2-api-tools-1.6.7.2-r2.ebuild:
+  Unbundled half of the libraries, the other hal half is missing, committed as
+  unkeyworded since this is a work in progress and breaks a lot of things;
+  reported by robbat2 on IRC, tracked in bug #471942.
 
 *ec2-api-tools-1.6.7.2 (26 Apr 2013)
 
diff --git a/app-admin/ec2-api-tools/Manifest b/app-admin/ec2-api-tools/Manifest
index d3186b15c2dd..b4950c0470b9 100644
--- a/app-admin/ec2-api-tools/Manifest
+++ b/app-admin/ec2-api-tools/Manifest
@@ -8,17 +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.ebuild 1515 SHA256 a16c5695347c09a5589623559065cce517e8457562e43f1a596a64c178c19feb SHA512 185669c1b23167cc4f272abc56369925eaaa876478adca84d38df8294204c7c400c3f14d18c872700437de8329bb3ff9f91e39e248c7f470d0ae019ca2ccde83 WHIRLPOOL 810295154aa6ced34ec719a696e82400e2aacef96f4978b6b6c3b410fe1b8d20567a8290260a0b82a4118b548b070efbad6ff811a1208d46449fee16c9cb57a2
-MISC ChangeLog 3479 SHA256 04f23d3612cdaf0e0767b4a96759e86c1c8c901b717eee765081e0b6e224548f SHA512 3331afc28df4f6ac020a658c1cfb26e37dfb68581c2103565ec29317309f76c2ade4165d144c5d11c5cb6f75f36a4c051b5c21094227377e0be74b9267bd6f61 WHIRLPOOL 75aa2cfb57dbe83259889b22e83191ff1eda7befdceb3f536890428562b22950fa5983177951f4781b9ebbc8cc27cc444b4bb0ee7f36fb68eb467ed24d517476
+MISC ChangeLog 3810 SHA256 efac73baf19961816ea27c389d2bd5852e2b6ea74662fd3014bdc8dc13d6a156 SHA512 06863c33b63b324bea4a961b9d864c2d98459af3f8df9857d208aa421456f3e4cbddf90df253a29debecc8bdf3cc70613795be6af85e4d246a1b213c05f9287a WHIRLPOOL fca40ab32a4e541ac7db243fbdc99c32db611bb98637acea09e4684efd4cf3095b48da7288c42cb97661a539cb9dea61ca6d4d0258cb0e4142cff7b667d2c17d
 MISC metadata.xml 367 SHA256 6c3c034259db62d0e77d638aaf71cc9e622717cb4c662fc0ea8bc0d79857a435 SHA512 978a135f407c84d4326b240600d59adc55ed686f3d3243f86a9c34712674441d2363bd24c8bba2d86b789e721d6c49a16fac363a8a455998c706e48875b3e87e WHIRLPOOL 6f9877b587255891889577a673fdad7cd539df9be6ae20a780178b5fb765b68f0e977e0bdbc313248a9ea11af1934501e203932bbcf4018d23023cc0f804d1b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJReuwmAAoJEJWyH81tNOV9GJYH/2sZ31Cbc5Q+fUHbrpyOFdZg
-N1H2sBJy2Szblc41Y7sCkz+44GwO3jyF90zEhyVP4635ZzXF9rSP4gwvtSrmGQ9i
-VHb4OSxgxQniLeJIn6Bq4BnNGvvCEKEPiw16Wrwi33J6etgIvODfcxbB6a7gogbu
-aKMVW3x9pggFEhbhALgbzXTlYRv6qhXvFDS38kg2HzXiv2+92QRYolWZVXNzjNxT
-+/1lwD985GUBLFSt22Hf5pW7V3wDmyz5xVRDtgLm/eB//AtEcfmblzNgpczhlVgE
-ibKgGh2I3HkRUXZfm2rIlrC3/NBLzLkx+EjrN/hvu9w55KOw/vJLBvbPRqBkqlw=
-=WmwA
+iQEcBAEBCAAGBQJRqR8yAAoJEJWyH81tNOV9A4UH/3QMMgzJPhPH0T34CoHMcnlT
+BnvsMCGi9c0aUhpoQFuSGIn3cphPnDOS7GmjvqmrXF14etmYT7xN9TWbn27C9cOR
+NhQBHGXfpYe9C+tmWqWVj5goDbKI4PIlPbkoQ+3E1bAtyMTmQFzxlkE6nx/LZz0o
+3ch9xJ4MJx/ZUTKzrI27XcKdsY9dwbRx9VMoum/04gorxd1Ul681O5/0huK3Y/US
+9h1qnetgtQYRxEFkYmuLBfYXPaGsVhh9/6qfI9ecUJrrjkdPc0Jx13V9+dM01t7L
+jZMrRODIlNdWaziRzPOE9rko5wGZP+7Gk25Lpg6reVaPWvQDIWVDnZrhjVtjY0c=
+=XIMV
 -----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-r2.ebuild
new file mode 100644
index 000000000000..715542a5d6ba
--- /dev/null
+++ b/app-admin/ec2-api-tools/ec2-api-tools-1.6.7.2-r2.ebuild
@@ -0,0 +1,88 @@
+# 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 $
+
+EAPI="5"
+
+inherit versionator java-pkg-2
+
+DESCRIPTION="These command-line tools serve as the client interface to the Amazon EC2 web service"
+HOMEPAGE="http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351&categoryID=88"
+SRC_URI="http://s3.amazonaws.com/ec2-downloads/${PN}-${PV}.zip"
+
+S=${WORKDIR}/${PN}-${PV}
+
+LICENSE="Amazon"
+SLOT="0"
+KEYWORDS=""
+RESTRICT="mirror"
+
+CDEPEND="dev-java/bcprov:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-discovery:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/jaxb:2
+	dev-java/jax-ws:2
+	dev-java/jsr173:0
+	dev-java/jdom:1.0
+	dev-java/log4j:0
+	dev-java/wsdl4j:0
+	dev-java/xalan:0
+	dev-java/xalan-serializer:0
+	dev-java/xerces:2"
+
+DEPEND="${CDEPEND}
+	app-arch/unzip:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+
+java_prepare() {
+	rm lib/{bcprov-jdk*,commons-cli-*,commons-codec-*,commons-discovery,commons-httpclient-*,commons-logging-adapters-*,commons-logging-api-*,jaxb-api,jaxb-impl,jaxws-api,jdom,log4j-*,stax2-api-*,wsdl4j,xalan,xercesImpl}.jar \
+		|| die "Failed to remove bundled jar files that are provided by system."
+
+	find . -name '*.cmd' -delete || die "Failed to remove non-Linux files."
+
+	sed -i "s:LIBDIR=\".*\":LIBDIR=\"/usr/share/${PN}/lib\":g" bin/ec2-cmd || die "Failed to set the library path in the wrapper."
+
+	for FILE in bin/* ; do
+		sed -i 's:${EC2_HOME}:/usr:g' ${FILE} || die "Failed to set the EC2_HOME value in the wrappers."
+	done
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe bin/*
+
+	insinto /usr/share/${PN}/lib
+	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
+
+	dodoc THIRDPARTYLICENSE.TXT
+}
+
+pkg_postinst() {
+	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 ""
+	elog "  export EC2_PRIVATE_KEY=/path/to/pk-HKZYKTAIG2ECMXYIBH3HXV4ZBZQ55CLO.pem"
+	elog "  export EC2_CERT=/path/to/cert-HKZYKTAIG2ECMXYIBH3HXV4ZBZQ55CLO.pem"
+}