Fix ebuild to work with strict Java settings.

Package-Manager: portage-2.1.2.2

3 files changed, 29 insertions, 31 deletions

diff --git a/dev-java/jsr181/ChangeLog b/dev-java/jsr181/ChangeLog
index bbb2e25141f5..f66abd477b68 100644
--- a/dev-java/jsr181/ChangeLog
+++ b/dev-java/jsr181/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jsr181
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr181/ChangeLog,v 1.3 2007/01/21 18:07:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr181/ChangeLog,v 1.4 2007/03/18 18:06:26 nelchael Exp $
+
+  18 Mar 2007; Krzysiek Pawlik <nelchael@gentoo.org> jsr181-0.7.ebuild:
+  Fix ebuild to work with strict Java settings.
 
   21 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> jsr181-0.7.ebuild:
   Add ~x86-fbsd keyword (see the various bugs for netbeans 5.5-r2).
diff --git a/dev-java/jsr181/Manifest b/dev-java/jsr181/Manifest
index 2fe756433c39..fe3932763aa0 100644
--- a/dev-java/jsr181/Manifest
+++ b/dev-java/jsr181/Manifest
@@ -6,14 +6,14 @@ MD5 7996eb2fe7576e619e3656ee1a5ed6ef files/build.xml 683
 RMD160 a1f74631ee260a8e5a6bc70570d27facbc2168fc files/build.xml 683
 SHA256 523884b2c6fc5087792f1387b6ced694238d5fcb4c4b2742ae249da2293995d5 files/build.xml 683
 DIST web_svcs_md-0_7-erd-spec.zip 360329 RMD160 8bb6841dfdd4f19cc4cfc9e802dc9599593abb9c SHA1 ca2485c53bc595b9e1392730aff9cf47582c2b4a SHA256 b82d6bf06daec256a1c7bd81f62c755e3e1e24aa09857e11a7ef12da3f17268b
-EBUILD jsr181-0.7.ebuild 1203 RMD160 0bdba6b7d5b416043ed73aa440de26e21f5ac1e7 SHA1 f905c7ab23529c4732a3ccc21e4c7cbce2660113 SHA256 48f4785d0ce8d851bafd09283cb938b849b1b956203e93fe600d067d852229dd
-MD5 c28e8783b0b057ea8689f5795ca6c882 jsr181-0.7.ebuild 1203
-RMD160 0bdba6b7d5b416043ed73aa440de26e21f5ac1e7 jsr181-0.7.ebuild 1203
-SHA256 48f4785d0ce8d851bafd09283cb938b849b1b956203e93fe600d067d852229dd jsr181-0.7.ebuild 1203
-MISC ChangeLog 602 RMD160 e536e9114f15b55f71e671a1ff77dfb48ef47fed SHA1 a64bab6269aac7ff52f312b51a414a2ad7c023a4 SHA256 372f1953a6f9f395e0acc7e577679e8bcdcaf5e43c19fa162d0f385f7318a0c0
-MD5 f6a10d820184d8b6e1dc81d762866111 ChangeLog 602
-RMD160 e536e9114f15b55f71e671a1ff77dfb48ef47fed ChangeLog 602
-SHA256 372f1953a6f9f395e0acc7e577679e8bcdcaf5e43c19fa162d0f385f7318a0c0 ChangeLog 602
+EBUILD jsr181-0.7.ebuild 1134 RMD160 9f538fc7dc8a0f4fa60a180b43db0957e470b99f SHA1 a96b8c5a7f6128e6c14bf844f61bf4df856985c4 SHA256 a43b4693bd1fb2323180d4df0b4ab5471cc69badf45ed6c08958d81d4ab08a29
+MD5 c2f42339dc0d11d759518c3397ce2481 jsr181-0.7.ebuild 1134
+RMD160 9f538fc7dc8a0f4fa60a180b43db0957e470b99f jsr181-0.7.ebuild 1134
+SHA256 a43b4693bd1fb2323180d4df0b4ab5471cc69badf45ed6c08958d81d4ab08a29 jsr181-0.7.ebuild 1134
+MISC ChangeLog 722 RMD160 a0845c76da2701c28974f4d471ac3e576a40e738 SHA1 2651b29ee7e37eca79c12940d34ce179fa17f3cc SHA256 9d32fd912c2f693e729830364279ea4c63d41a3e7c8fda8b35e33337d5897454
+MD5 26cd796955f4b7e8857e3ab33a0bfcb4 ChangeLog 722
+RMD160 a0845c76da2701c28974f4d471ac3e576a40e738 ChangeLog 722
+SHA256 9d32fd912c2f693e729830364279ea4c63d41a3e7c8fda8b35e33337d5897454 ChangeLog 722
 MISC metadata.xml 224 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 SHA1 37c1f64045f8874b69bb7dffd084e7f699c37678 SHA256 8727090a0c21416083f038251a19559b983ff39bbefc2aa9b5c6c5bdc25b299d
 MD5 83f6bf68e595b0ec2e45d8e4b78c1f5a metadata.xml 224
 RMD160 ff26da53f08837159410ff3eee9c11933ef21a68 metadata.xml 224
@@ -22,9 +22,9 @@ MD5 b2aa36b8ac5b5abe246e7562877c4fea files/digest-jsr181-0.7 265
 RMD160 0a11ad9600baab8c92bd59775e63abb5dbc22656 files/digest-jsr181-0.7 265
 SHA256 e80e30dc6bf67be64b2033eadeb107130bed1dcb1bd935f79d67588d8f8fe72c files/digest-jsr181-0.7 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFs6wBAiZjviIA2XgRAkX/AJ9C9xPfyeBiYEWOzq9qrlv6om/naACfVvaS
-VCBMp12osaE7K0pmoO5sqys=
-=QWcP
+iD8DBQFF/YBYgo/w9rxVVVERAn1BAKC8o8M1G4NN9RPPryWA7I8yLBlODACgrXT7
+RdyHlsKdoWm6+PVtaPBpxgQ=
+=SnJE
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jsr181/jsr181-0.7.ebuild b/dev-java/jsr181/jsr181-0.7.ebuild
index 6897a246da29..b268f7298791 100644
--- a/dev-java/jsr181/jsr181-0.7.ebuild
+++ b/dev-java/jsr181/jsr181-0.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr181/jsr181-0.7.ebuild,v 1.3 2007/01/21 18:07:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr181/jsr181-0.7.ebuild,v 1.4 2007/03/18 18:06:26 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,8 +13,8 @@ SRC_URI="web_svcs_md-0_7-erd-spec.zip"
 LICENSE="bea.jsr181"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="doc source"
-RESTRICT="fetch nostrip"
+IUSE=""
+RESTRICT="fetch"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
@@ -32,32 +34,25 @@ src_unpack() {
 
 	unpack "${A}"
 	cd "${S}"
-	unzip -qq jsr181-src.jar || die "unzip failed"
-	mkdir src lib
-	mv javax src
+	unpack ./jsr181-src.jar
+	rm -f jsr181-src.jar
+	mkdir src lib || die
+	mv javax src || die
 
-	cp "${FILESDIR}/build.xml" "${S}/"
+	cp -i "${FILESDIR}/build.xml" "${S}/" || die
 
 }
 
-src_compile() {
-
-	cd "${S}"
-	local antflags="jar"
-	use doc && antflags="${antflags} doc"
-	eant ${antflags}
-
-}
+EANT_DOC_TARGET="doc"
 
 src_install() {
 
-	cd "${S}"
 	java-pkg_dojar jsr181.jar
 
 	use doc && {
-		java-pkg_dohtml -r api
+		java-pkg_dojavadoc api
 		dodoc JSR181-ERD4.pdf
 	}
-	use source && java-pkg_dosrc "src/*"
+	use source && java-pkg_dosrc src/*
 
 }