Adding to ~amd64. Fixing install problem resulting from test task deleting jar and javadoc.

Package-Manager: portage-2.1.2.7

3 files changed, 27 insertions, 14 deletions

diff --git a/dev-java/jempbox/ChangeLog b/dev-java/jempbox/ChangeLog
index 5127f17aa8fd..7bf0e209aeab 100644
--- a/dev-java/jempbox/ChangeLog
+++ b/dev-java/jempbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jempbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jempbox/ChangeLog,v 1.1 2007/04/24 23:23:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jempbox/ChangeLog,v 1.2 2007/05/15 09:43:17 ali_bush Exp $
+
+  15 May 2007; Alistair John Bush <ali_bush@gentoo.org>
+  jempbox-0.2.0.ebuild:
+  Adding to ~amd64. Fixed build problem where tests were deleting jar and javadoc.
 
 *jempbox-0.2.0 (24 Apr 2007)
 
diff --git a/dev-java/jempbox/Manifest b/dev-java/jempbox/Manifest
index b5bf13608b85..8394e8bcf3d9 100644
--- a/dev-java/jempbox/Manifest
+++ b/dev-java/jempbox/Manifest
@@ -1,12 +1,12 @@
 DIST JempBox-0.2.0.zip 6131627 RMD160 9407e9cf3c58920a7c6d34f04343fbf9e3e7abb4 SHA1 0561f3d580dcb48fd1962a02e20562186ac9d8b5 SHA256 a4c6def91c31aaae4b8ee4b3f9ecebef73fce2f608bf7fc906a89a9bef17978e
-EBUILD jempbox-0.2.0.ebuild 1314 RMD160 e488be2695d54b7aa7f53d91e74237a8c2832e5b SHA1 8e512ed4473d60b52346c76ae879c5e483b9736a SHA256 f1411276d42cc787ad92da5cdb913e8e81b9dc1240fbb2bf2080ebbbd8062307
-MD5 89e218c17ac2182c2c1862059c3fc556 jempbox-0.2.0.ebuild 1314
-RMD160 e488be2695d54b7aa7f53d91e74237a8c2832e5b jempbox-0.2.0.ebuild 1314
-SHA256 f1411276d42cc787ad92da5cdb913e8e81b9dc1240fbb2bf2080ebbbd8062307 jempbox-0.2.0.ebuild 1314
-MISC ChangeLog 341 RMD160 9267ae9b3349249fe1d7046aeec37cc65ee97dc2 SHA1 bf2017ec214e20dae7084f3ae9c129909cc1360b SHA256 c4b510b2384369cbd9ceaf9491e876711598d197fcacbe48abc370c8d5c7c043
-MD5 14205ed5ea2e3ab993184198abd23944 ChangeLog 341
-RMD160 9267ae9b3349249fe1d7046aeec37cc65ee97dc2 ChangeLog 341
-SHA256 c4b510b2384369cbd9ceaf9491e876711598d197fcacbe48abc370c8d5c7c043 ChangeLog 341
+EBUILD jempbox-0.2.0.ebuild 1628 RMD160 081c30c6e1889c47911d7f39383c03c74afa5ab0 SHA1 23383516dcc543fb00825a694b1514c0a1adf68d SHA256 53e4ec1fd35fda39c403c3a8b80bc9faa638c60d914e38d755bb0aa1dc4ab832
+MD5 f24a6b828125618584da1710d36cc754 jempbox-0.2.0.ebuild 1628
+RMD160 081c30c6e1889c47911d7f39383c03c74afa5ab0 jempbox-0.2.0.ebuild 1628
+SHA256 53e4ec1fd35fda39c403c3a8b80bc9faa638c60d914e38d755bb0aa1dc4ab832 jempbox-0.2.0.ebuild 1628
+MISC ChangeLog 507 RMD160 c308244ac9162acb12d812beefe7634e2085771f SHA1 7601b6eac7ce5e57b8ca3f40fc244faf2de4cfb4 SHA256 c8a7b765bdec749d817ab1e884963081e96880f2a5c57e9525a87c7908007d4d
+MD5 b690f48c3ec56179b5ef70ad95e89a85 ChangeLog 507
+RMD160 c308244ac9162acb12d812beefe7634e2085771f ChangeLog 507
+SHA256 c8a7b765bdec749d817ab1e884963081e96880f2a5c57e9525a87c7908007d4d ChangeLog 507
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
diff --git a/dev-java/jempbox/jempbox-0.2.0.ebuild b/dev-java/jempbox/jempbox-0.2.0.ebuild
index 33a8a1c7e2ac..aa9ca7e1f561 100644
--- a/dev-java/jempbox/jempbox-0.2.0.ebuild
+++ b/dev-java/jempbox/jempbox-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jempbox/jempbox-0.2.0.ebuild,v 1.1 2007/04/24 23:23:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jempbox/jempbox-0.2.0.ebuild,v 1.2 2007/05/15 09:43:17 ali_bush Exp $
 
 JAVA_PKG_IUSE="doc source test"
 WANT_ANT_TASKS="ant-nodeps"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jempbox.org"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"
@@ -42,18 +42,27 @@ src_unpack() {
 	fi
 }
 
-EANT_BUILD_TARGET="package"
+src_compile() {
+	eant package $(use_doc)
+
+	#tests delete the jar and javadocs so newjar, dojavadoc will fail to
+	#install jar and javadoc.
+	mkdir gentoo-dist
+	cp "lib/${MY_P}.jar" "gentoo-dist/${MY_P}.jar" || die "Failed to copy jar."
+	use doc && cp -R website/build/site/javadoc gentoo-dist || die \
+		"Unable to copy javadoc"
+}
 
 src_test() {
 	ANT_TASKS="ant-junit" eant junit
 }
 
 src_install() {
-	java-pkg_newjar lib/${MY_P}.jar
+	java-pkg_newjar "gentoo-dist/${MY_P}".jar
 
 	if use doc; then
 		dohtml -r docs/*
-		java-pkg_dojavadoc website/build/site/javadoc
+		java-pkg_dojavadoc gentoo-dist/javadoc
 	fi
 
 	use source && java-pkg_dosrc src/org