Add ~x86 keyword, remove bundled .class files in src_unpack(), small style tweaks.

Package-Manager: portage-2.1.3_rc4

3 files changed, 22 insertions, 16 deletions

diff --git a/sci-libs/jmol-acme/ChangeLog b/sci-libs/jmol-acme/ChangeLog
index 5c16be98e60d..f4472f052ade 100644
--- a/sci-libs/jmol-acme/ChangeLog
+++ b/sci-libs/jmol-acme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/jmol-acme
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/jmol-acme/ChangeLog,v 1.1 2007/05/22 05:45:17 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/jmol-acme/ChangeLog,v 1.2 2007/06/21 23:21:15 caster Exp $
+
+  21 Jun 2007; Vlastimil Babka <caster@gentoo.org> jmol-acme-1.0.ebuild:
+  Add ~x86 keyword, remove bundled .class files in src_unpack(), small style
+  tweaks.
 
 *jmol-acme-1.0 (22 May 2007)
 
diff --git a/sci-libs/jmol-acme/Manifest b/sci-libs/jmol-acme/Manifest
index d20462a4bb95..e1e8efd2e9c7 100644
--- a/sci-libs/jmol-acme/Manifest
+++ b/sci-libs/jmol-acme/Manifest
@@ -3,14 +3,14 @@ MD5 063359e3e615e3207e35b2f508b25f7f files/src.list 115
 RMD160 9044dfb39f66a14ab5d93fc7f307e167a820839d files/src.list 115
 SHA256 14f9bbf65ef25555840c8551df9caba3fe80015bc334e83d178b7296167d3a97 files/src.list 115
 DIST Acme.tar.gz 478667 RMD160 a58ee00fe9abbb6149aa4b0baebcf9df8e9ec144 SHA1 421c7f69045242523948abe1e7e01092fd544b6e SHA256 6becb7e097bc9a3c7b39a42aaf8dd9ce8d35508b5221c3076e0c1e060ecc688c
-EBUILD jmol-acme-1.0.ebuild 1005 RMD160 472e8a8f7d1500af2d838381d6559b752b924320 SHA1 8a6145dfc2f0ebc2cbed8a201a3395293667aaa4 SHA256 98f2c1444f333464e22cdfecf0f313147f3131d86c14bfe7b6188b0811d8566b
-MD5 f746c5784afc4dccd112b13f79526ca8 jmol-acme-1.0.ebuild 1005
-RMD160 472e8a8f7d1500af2d838381d6559b752b924320 jmol-acme-1.0.ebuild 1005
-SHA256 98f2c1444f333464e22cdfecf0f313147f3131d86c14bfe7b6188b0811d8566b jmol-acme-1.0.ebuild 1005
-MISC ChangeLog 348 RMD160 4ce05e4d0ced9b358d9f3287bfa275bf4732b191 SHA1 c5097180c4ca5a6be2ff8025c4daf8d2183c2688 SHA256 3acf7695a7846cbbeab3ce3741c05dd5226d821f090e31eae07c12d046590884
-MD5 c44ee06e2fef53023c9109b8f1327721 ChangeLog 348
-RMD160 4ce05e4d0ced9b358d9f3287bfa275bf4732b191 ChangeLog 348
-SHA256 3acf7695a7846cbbeab3ce3741c05dd5226d821f090e31eae07c12d046590884 ChangeLog 348
+EBUILD jmol-acme-1.0.ebuild 1029 RMD160 230de636560f08d6778408bc1dd27a38301f2677 SHA1 780d7f937128fe5b93dc210daf86ff83fd2cdd4b SHA256 3da352f55652c92d4e42005cfce53b1aa5749e17014134f6aa097759f71511db
+MD5 75d69ffcea048d638d03725d9a197f4e jmol-acme-1.0.ebuild 1029
+RMD160 230de636560f08d6778408bc1dd27a38301f2677 jmol-acme-1.0.ebuild 1029
+SHA256 3da352f55652c92d4e42005cfce53b1aa5749e17014134f6aa097759f71511db jmol-acme-1.0.ebuild 1029
+MISC ChangeLog 509 RMD160 681d169014684897e688f2d66750e8f0b01fc5b0 SHA1 a1888b37919e11738ad1931f2e6c43f6a711baf3 SHA256 a123b45edaf68d69c6c71fbf4444dcff3f62f8a6cbf7f7124a37a1fa6c17d947
+MD5 7588c4a9cd56eb9b64d209e405730804 ChangeLog 509
+RMD160 681d169014684897e688f2d66750e8f0b01fc5b0 ChangeLog 509
+SHA256 a123b45edaf68d69c6c71fbf4444dcff3f62f8a6cbf7f7124a37a1fa6c17d947 ChangeLog 509
 MISC metadata.xml 290 RMD160 a3e0272f2e27849160907a8781de642853db5fc7 SHA1 8747c2070fbbdaaa74dac0e70d6b89cbd8e13352 SHA256 b6300bcfdb90ce608654ee134f004d154f52a29bfe20b3f4b79c603a22143225
 MD5 ebdf85f6ccd2ce8f0dfb8608d10b1b8c metadata.xml 290
 RMD160 a3e0272f2e27849160907a8781de642853db5fc7 metadata.xml 290
diff --git a/sci-libs/jmol-acme/jmol-acme-1.0.ebuild b/sci-libs/jmol-acme/jmol-acme-1.0.ebuild
index a3fd6dbd5f21..d684c43a800a 100644
--- a/sci-libs/jmol-acme/jmol-acme-1.0.ebuild
+++ b/sci-libs/jmol-acme/jmol-acme-1.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/sci-libs/jmol-acme/jmol-acme-1.0.ebuild,v 1.1 2007/05/22 05:45:17 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/jmol-acme/jmol-acme-1.0.ebuild,v 1.2 2007/06/21 23:21:15 caster Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.acme.com/resources/classes/${MY_P}.tar.gz"
 
 LICENSE="ACME"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
@@ -23,17 +23,19 @@ RDEPEND=">=virtual/jre-1.4"
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
-	mkdir -p "${S}/classes"
 	unpack ${A}
+	cd "${S}"
+
+	mkdir -p classes
+	find . -name \*.class -delete
 }
 
 src_compile() {
-	cp "${FILESDIR}/src.list" "${T}"
+	cp "${FILESDIR}/src.list" "${T}" || die
 	ejavac -sourcepath "" -d "${S}/classes" "@${T}/src.list"
-	cd "${S}/classes"
-	jar -cf "${PN}.jar" * || die "failed to create jar"
+	jar cf "${PN}.jar" -C classes . || die "failed to create jar"
 }
 
 src_install() {
-	java-pkg_dojar "${S}/classes/${PN}.jar"
+	java-pkg_dojar ${PN}.jar
 }