Use JAVA_PKG_IUSE and delete bundled classes in src_unpack.

Package-Manager: portage-2.1.3_rc6

3 files changed, 29 insertions, 20 deletions

diff --git a/dev-java/radeox/ChangeLog b/dev-java/radeox/ChangeLog
index e8ee446976d6..1f2fb83ade02 100644
--- a/dev-java/radeox/ChangeLog
+++ b/dev-java/radeox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/radeox
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.12 2007/01/12 12:39:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/ChangeLog,v 1.13 2007/07/04 22:24:44 betelgeuse Exp $
+
+  04 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+  radeox-1.0_beta2-r1.ebuild:
+  Use JAVA_PKG_IUSE and delete bundled classes in src_unpack.
 
 *radeox-1.0_beta2-r1 (12 Jan 2007)
 
diff --git a/dev-java/radeox/Manifest b/dev-java/radeox/Manifest
index e5697fa1ab36..f0f7f3181ca9 100644
--- a/dev-java/radeox/Manifest
+++ b/dev-java/radeox/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST radeox-1.0-BETA-2-src.tgz 1720998 RMD160 6853e478a6fb95355c8627a58b914e0cb5253cb8 SHA1 dc66bb32f43e8785a96eec29010a56d3115a865b SHA256 3a0a38cfd82d84dde518f4347bfd8ad487e4993f7f99dfe5eefe4df7c3497045
-EBUILD radeox-1.0_beta2-r1.ebuild 1103 RMD160 edb86e1dd6adc1d4bee0e6695f52f653db25c7a4 SHA1 938ba7288694b7e66c4cc13521c78a0cff0c22d7 SHA256 a70ff2586d39eccbb247a4f4382374c400cdc3e6234c2234a424b9c1df6b7b69
-MD5 27a147cf4841b247db40f78d2a6af75f radeox-1.0_beta2-r1.ebuild 1103
-RMD160 edb86e1dd6adc1d4bee0e6695f52f653db25c7a4 radeox-1.0_beta2-r1.ebuild 1103
-SHA256 a70ff2586d39eccbb247a4f4382374c400cdc3e6234c2234a424b9c1df6b7b69 radeox-1.0_beta2-r1.ebuild 1103
+EBUILD radeox-1.0_beta2-r1.ebuild 1225 RMD160 88020684e69cec525f136c08f1e781eef2f63f10 SHA1 9fe2f9563c0c5f839133d19ec6466364bcb26983 SHA256 54b875328cd415785a114d9131b71fe0ff086189f7be8fa9197ae480938230c1
+MD5 6bd3a393969dcb83bb946674655adc29 radeox-1.0_beta2-r1.ebuild 1225
+RMD160 88020684e69cec525f136c08f1e781eef2f63f10 radeox-1.0_beta2-r1.ebuild 1225
+SHA256 54b875328cd415785a114d9131b71fe0ff086189f7be8fa9197ae480938230c1 radeox-1.0_beta2-r1.ebuild 1225
 EBUILD radeox-1.0_beta2.ebuild 1371 RMD160 dbe75ba76ec965923d99d5abe5decc75cb4caf4b SHA1 01a04291282e57c2b61e578be525d9dd14cd909f SHA256 bd588021168205a79db5986125fd6e3c31896bd5227b69a1d0126071d0b50813
 MD5 ca8a5c54865a04f6d04e483522ceba23 radeox-1.0_beta2.ebuild 1371
 RMD160 dbe75ba76ec965923d99d5abe5decc75cb4caf4b radeox-1.0_beta2.ebuild 1371
 SHA256 bd588021168205a79db5986125fd6e3c31896bd5227b69a1d0126071d0b50813 radeox-1.0_beta2.ebuild 1371
-MISC ChangeLog 1459 RMD160 2fbda218853ff2febc59879424a5518c8bdd6244 SHA1 bbce643a3238db11f362b405207e5cee92414263 SHA256 f992cb7e8863c545831d68fa1e5e587c6d7af5db1d7a8b9f1f5e29d70f4e172e
-MD5 c7898af077b7e47464b11cc5b80925d7 ChangeLog 1459
-RMD160 2fbda218853ff2febc59879424a5518c8bdd6244 ChangeLog 1459
-SHA256 f992cb7e8863c545831d68fa1e5e587c6d7af5db1d7a8b9f1f5e29d70f4e172e ChangeLog 1459
+MISC ChangeLog 1605 RMD160 fe1225f45435a9d7a0eca149b58a5f146e4427dd SHA1 0237baf461c362a5fae8aed4267ac05c2f06ec87 SHA256 de1ee8b45924ea4e6d7b40c9ce89aacdd9d91b0ced513674ec0147ec34ac9547
+MD5 ef854f08e2623a093e44571b4bda2448 ChangeLog 1605
+RMD160 fe1225f45435a9d7a0eca149b58a5f146e4427dd ChangeLog 1605
+SHA256 de1ee8b45924ea4e6d7b40c9ce89aacdd9d91b0ced513674ec0147ec34ac9547 ChangeLog 1605
 MISC metadata.xml 581 RMD160 376b4c07211d2c83d958342ca32657b31c6c4bcd SHA1 f7246094096559608bf4959dc3027cdb3900742f SHA256 979259ac90111538e0f5dea0ad176812b26f9aaee2e9ef848da6859765efb3d0
 MD5 51b360ad1459b4dae2f08ec2c406e915 metadata.xml 581
 RMD160 376b4c07211d2c83d958342ca32657b31c6c4bcd metadata.xml 581
@@ -25,9 +25,9 @@ MD5 15cdf96611390e18a0434343ffcbd413 files/digest-radeox-1.0_beta2-r1 259
 RMD160 2536a7d4782092bc092bfffd07fcf9e28dfa6ca9 files/digest-radeox-1.0_beta2-r1 259
 SHA256 1b2b1b00193e4ea697346c69ab42987ce422a9c116b4150f30479143e6052d77 files/digest-radeox-1.0_beta2-r1 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFp4F/cxLzpIGCsLQRAi3DAJ41HyA36I7OiECxbi/VUFHdnQOEkQCfY6xO
-waXHb5ahCtD4/0THlTPbyqY=
-=Y9Dx
+iD8DBQFGjB4rcxLzpIGCsLQRAsIaAJ96n45MbtOvJZ81e83qG+BA8VlY2wCfayz/
+kpP8lYcnOV5PLFEgQeY0Lng=
+=CF3/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
index 61df4107ad85..2f9b544fa69f 100644
--- a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
@@ -1,23 +1,26 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/radeox-1.0_beta2-r1.ebuild,v 1.1 2007/01/12 12:39:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/radeox-1.0_beta2-r1.ebuild,v 1.2 2007/07/04 22:24:44 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Radeox Wiki render engine"
 HOMEPAGE="http://www.radeox.org"
-SRC_URI="ftp://snipsnap.org/radeox/${PN}-1.0-BETA-2-src.tgz"
+MY_PV="${PV/_beta/-BETA-}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="ftp://snipsnap.org/radeox/${MY_P}-src.tgz"
 LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
+IUSE=""
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/commons-logging-1*"
 DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	dev-java/ant-core"
+	${RDEPEND}"
 
-S=${WORKDIR}/${PN}-1.0-BETA-2
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
@@ -29,7 +32,9 @@ src_unpack() {
 	rm -rf  src/org/radeox/example/ \
 		src/test/ src/org/radeox/test/
 
-	rm -v lib/*.jar
+	rm -v lib/*.jar || die
+	rm -v src/org/radeox/filter/*.class || die
+	rm -v src/org/radeox/*/*/*.class || die
 	cd lib
 	java-pkg_jar-from commons-logging
 }