Add SLOTs to java deps. Remove old.

Signed-off-by: Ryan Hill <rhill@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

5 files changed, 24 insertions, 154 deletions

diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog
index 6bcce299c849..e04dde37a913 100644
--- a/net-p2p/vuze/ChangeLog
+++ b/net-p2p/vuze/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/vuze
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.65 2015/04/18 12:46:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.66 2015/04/19 10:03:51 rhill Exp $
+
+  19 Apr 2015; Ryan Hill <rhill@gentoo.org> -vuze-4.5.1.0-r1.ebuild,
+  vuze-5.3.0.0.ebuild, vuze-5.6.0.0.ebuild:
+  Add SLOTs to java deps. Remove old.
 
   18 Apr 2015; Pacho Ramos <pacho@gentoo.org> vuze-4.8.1.2-r1.ebuild:
   ppc64 stable wrt bug #432146
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index e7a474c9650a..eec65d699aed 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -15,21 +15,23 @@ AUX vuze-5.3.0.0-use-jdk-cipher-only.patch 1594 SHA256 f5912134e4f3548fe1dd48b93
 AUX vuze-5.6.0.0-commons-lang-entities.patch 2085 SHA256 52515b513089e549d488d84b2c88f160735d9b7ef75da1e998df8f616e3fe9f6 SHA512 a08d23a1947ad668048f49c8137d4494da662d65f5cf98acd5e44656f7d6a2bf691eebba4fd8033996594d1c4edc1a2eec3ce3f92d23b1818c03b405fc081899 WHIRLPOOL a6447983dc9e7ff0e26ced10f5298b6ee1996549643c67aa693e7eff58b77a9708574066823ed0110d08603fa12eaa017fdb43738166007f49f75f116c3a6788
 AUX vuze-5.6.0.0-invalid-characters.patch 1121 SHA256 8f00bc2477c01853a352b6afc1e186dacb97161c3d9d199205e2d68e3bef6a2a SHA512 718c64a892aa860455db4c23f97d403c77bbba0fd1ecf957761f7c7dfcb9c8b42ed75b1f3e706f3d67335ed38599fbc6f9e2731941bdf819d956e830a8227344 WHIRLPOOL 9b432134579a88c5bdac0942ec019172583f2292453e09d3584e73079e9601992b08672e6e5d2d989fa11562d74bc569143309ead78a26dcf8f9eff6f51762b5
 AUX vuze.desktop 164 SHA256 4fbc293d66810bcd4eec210d00d5ea97f5e49acdd10197a52e361ed11b8718ed SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480 WHIRLPOOL 822e059e377141864f465d4de7915651a609ef69c8d67eedc85bd1c60a2b605882cad0c63b592329b369e34f8877e1c36bc344f414be20818bccf39d1f88ec25
-DIST Vuze_4510_source.zip 9181967 SHA256 f92360f48e87c3a1d3edcfc2239ef69276792584292e00a48eac1eac4bd22e7f SHA512 cbac307372cfa6b09db0b7d3f3e73c8039db7a6e0dd270513bc8f9e96721c88e024b5998e0d133883c6f701e76f1b36fc9c7bfc7573c6b6c1c82b3179be429c5 WHIRLPOOL bd6fd25b75b4cc16213d478588b313ba69ff4ee4eaf1c11ad0e01ee4074222cb77739f13001ddd881a5b77002ac3cb0a9e3accc44691c2720f94ea7df499a158
 DIST Vuze_4812_source.zip 9530217 SHA256 8ad02ae61ac1c515cb3226b95b34d4fe036faa64e725b64fdcb5ef7d1cb9633d SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf WHIRLPOOL bc8823e053fa2f86161234c77f4873f2035a111361d60ee8c75937710774defec577651a10acf909bb170e600dc2775a5dbe2cf626649729e86f4a04e02a46d9
 DIST Vuze_5300_source.zip 10015198 SHA256 556149f09f48c533a37d80526ac655f0bc067f3a6bf3f3c4483f5273ac74ebc7 SHA512 44bad9f04707ae37acb66f16ae94afd7ad24d245f0371f60241442f460277c5b8dd29476640eb1e04b468b3ebd0100a159d1027764445ab526e3e0c0c544296d WHIRLPOOL 801e398eaf8b8457dc02336039bc8a64e535544ff1ea99ff100b623f734a499147e9abd8ce3031ebb0f1e5bb0e04a9c160e06fe5c0b16f12b31caf920f711d4a
 DIST Vuze_5600_source.zip 10398501 SHA256 1aa6148311969ce6c51333b7ef51bcc8713e222fa5d14b2448e97aebbd25ea5e SHA512 dfe557cb1f50be935c78ee4431bc14db5f0107eebab8545cf925de8b0d48bb91ca77f7feab54a5fd91aaaf50bd3c68c1519cf49c2eb4d145ff7794bf9f22cfd7 WHIRLPOOL 62b637b5fc8145c31bdfb0ca2f63bdd9ee9c70d3afde3cb693ede66c0ab6db593f412ab124ac1230f1bbf33ff9ce635e29a0cea7556f013fcb7144aacb98c0d0
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 SHA256 972cf16d88d8605f93b77a84770b6512d54ae8281a0d4c06b66890a69deb6c49 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d WHIRLPOOL a7dd533676c428a00caddc2d4d4c008feec1a1201bb9aef7b7ed9c25d41405344d89bc9f70d442f043beb7aaf6db7d73582cc46edfa3665d599b2635e51b1ee7
-EBUILD vuze-4.5.1.0-r1.ebuild 3993 SHA256 7ecd564c4ac093577426525490f075d7941454a3843c81b12042a3122780c358 SHA512 45471f3301525748689e59d4f1ea873502e34e704c63288c678927b99fdf16457ac641b57dcf41043213dc1f1fd2aa6480cbbb0d4127e0e054f820870ad7da00 WHIRLPOOL 5c65c6f4f7e0f9fc479ae051d7c90ef6789584344c1fed853f7ce25d632248cc499d8085c05358ded8e5cbade7810620ad2684ea87a8aff5f344d4d6a020712d
 EBUILD vuze-4.8.1.2-r1.ebuild 4386 SHA256 8e8119dce07d0ed3c4409be95dcc24a09fc9b7207cfdcffb1807edcf4d09e89f SHA512 378622cf12169dd8e8a6548176bd8de16bcc2db772b31171873182153dc49e719efcd84b7d6c97380c1427f656fcc61943f9c01935ebe3008e9de445f820db11 WHIRLPOOL 8033e322b2b2d559aa0bcb05b63ea41da6431b97099e57e7fc7eac8a199fac34efea437b7059e825f610f3173a7e2e47ca89d9eba031fceff7bf09b78987ed5b
-EBUILD vuze-5.3.0.0.ebuild 4376 SHA256 4636b13e21cf2d6729930eb2a1a73908cc2aa007194dba53c6b2c77bf59de4fd SHA512 19df9c5337969d4b23b7303935081bc444505459e9cfaeef6567ad96869c1cb6f7f8fe80c743eb9c9a090b1a9a1b18284d5b6da1ca572439de0ec7589da54793 WHIRLPOOL 9880b54f8ead62c5f3ed4bc364b80f721e0a4d60982aa92d9103b6fd2522ac8cc3c021b207ff485570d7e16d024a9548d73bf0c6ce7cf3e97367abf1b708715c
-EBUILD vuze-5.6.0.0.ebuild 4512 SHA256 605cdc8c83c7e13e503f6a7aaafbceaf93e3acbbd7dd073801c6af3d7e846884 SHA512 ed4aafeb6ed803f945a5c506ad3957fe6b47dc2700da910879d0c1f9ad9f3557b5a33c1986e1d81a246620a32a525e9b82b01c232df9aa3f56e021c9bf31a7ce WHIRLPOOL ffd354ae72c2935790ec01626e03027abd61fb937c64066a893953e3a62df392408262f9aed3f16faffb4449eb3ffd393f5ecd625cd29f52ed233d7ad09cd867
-MISC ChangeLog 29007 SHA256 52313f9a3d2bd9262df30da90e2cbea3381eef943f9a41c8fac4753071bb9028 SHA512 be09240dd1828f559953b3e6d6c94c3b0bd3d54b1bbc499825106510f3a609d517f0129ae442efb2796b02e9fb6f02a14a19ba7bee23309ae2b66be2d8e99243 WHIRLPOOL c091f8b006550d6ce92f2845de71452ddac24fe946a3285acd5db12e6bf80dca733591a55e23b18ab761fb5cb04befa5a61081a7122b231ecb5ca3c9c932893f
+EBUILD vuze-5.3.0.0.ebuild 4382 SHA256 33846c30e4c674142785dbbe3f91ca11f7c93d975a6893129606e12e3e8985b4 SHA512 5c7c1f67482ec5e3d018d0f5824f7ce153c63535d54d1bef63c579dc70de75db7a8d0fd2fef0f78efaf21a54c9635c723a53cd2d85be821a89658fc367a47b9b WHIRLPOOL 8202c6519593e49d14a9355e1276557cc442b3cac874906b2a500d064ba586a677e1ffeac66dafa869539a54fd03139f8b773257c2fdfe0117f82f1a471dd742
+EBUILD vuze-5.6.0.0.ebuild 4518 SHA256 8fbfd78a95697de3ad10dca3de56fb0a1854a628e54fbf81853d15d894b6692c SHA512 cde47b8b9de6312b7670fc5263121043a5affe035acbfcb7f037bd534e6f4880ca4f6edc34db6194da4ca81f071a9e30edd7bd9b9852f20f29c5a5eb8b1a5304 WHIRLPOOL 7207ee3d69fb872249759cc758c5ca2a227724e693ec1f83432a2753b99c9e3f608cd5c002251d24e6b7fcb2f3089fb92c785bd3785195c97aa6b804b9ecf99e
+MISC ChangeLog 29159 SHA256 0c312ebb96a3d990c803a6b84566a2998e160a67deaa6115e03a8166dd9e963d SHA512 88e5b4e5b2edda237f984bd80a4f54481e992f1714ec24d1bd69be66d7ff49acd208d900d56a06bfbe0c582df7ebb3d11862f1b70000ec069a4e7fd6cb78fc92 WHIRLPOOL 7c48e8931750abb8fcb7a52c0762fa23363341b498b86713c65d5dc099e612b761e6be64429ab60853a627de3892b6e6e1e3844f66de2ea5d60a1db9973f5b2b
 MISC metadata.xml 246 SHA256 904c21f9fa2947f92f79cce43db178f3d14362d6180ec0503f206086ab083a0c SHA512 756b73a6283fd01672e9a6ccf1fb9656f5596a660e2c3ed6ea767338f082f2a516f2e736ca34932c98e454bddd0fcffc045cfc740474c36849d6d4009b9444d2 WHIRLPOOL 0c63202860bfc9050faa22d7f75094e43ad5188483e04462f0aa4f50839b870ffe1fed4d516c8105f05e401c0e84bef0fc52883685c548324f8693fcfa1a49b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlUyUhoACgkQCaWpQKGI+9QE7wCeK1XrPidIiX5nQRxswnMnCacV
-8vkAn2doME70ifMEyKfbdo30qa85NCR0
-=y4Az
+iQEcBAEBCAAGBQJVM33zAAoJEO04vUmVeoRjW00H/08nu8RgVGHdIElr/uYR6DAM
+x3sQrs9RF5QwuJipidiF7CQH/bWFN2buHB+4+Wh1VjQqbytZ0H1I0EK8jIKS7toJ
+ZdTq09kEMLSLd6gbOn+4jz/tQ+8/hP4WgkJLBN1zcvTqYx0VqGL5TNr/VoiP4KL8
+piDlLLCepGVxWTlQm2UBPZ1g2EdBhjXfNq7fPCB1FBdesJKQ1swHWauSi4JRjFMt
+XyV95OwZeXIopEIF+8cPqytgLTrJd3ICgYcUbfD9E/+8fzoRdARUSQp0fhLB3h0y
+DVmQliffyJAEZTzoGndHVsXSd7JSI8O4zfOGsidhjKnh1RT+ZRnYQFhtDTO7YVE=
+=4ADE
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/vuze/vuze-4.5.1.0-r1.ebuild b/net-p2p/vuze/vuze-4.5.1.0-r1.ebuild
deleted file mode 100644
index adc2637c0258..000000000000
--- a/net-p2p/vuze/vuze-4.5.1.0-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.5.1.0-r1.ebuild,v 1.1 2013/08/15 16:23:14 tomwij Exp $
-
-EAPI=2
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators "")
-
-PATCHSET_VER="4.5.0.2"
-PATCHSET_DIR="${PN}-${PATCHSET_VER}-gentoo-patches"
-PATCHSET="${PATCHSET_DIR}.tar.bz2"
-SRC_TARBALL="Vuze_${MY_PV}_source.zip"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/Vuze_${MY_PV}/${SRC_TARBALL}
-	mirror://gentoo/${PATCHSET}"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-# bundles parts of commons-lang, but modified
-# bundles parts of http://www.programmers-friend.org/
-RDEPEND="
-	dev-java/json-simple:0
-	dev-java/bcprov:1.40
-	>=dev-java/commons-cli-1.0:1
-	>=dev-java/log4j-1.2.8:0
-	dev-java/swt:3.6[cairo]
-	!net-p2p/azureus-bin
-	>=virtual/jre-1.5"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.5"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-src_unpack() {
-	unpack ${PATCHSET}
-	mkdir "${S}" && cd "${S}" || die
-	unpack ${SRC_TARBALL}
-}
-
-java_prepare() {
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	# hopefully that's just a packaging mistake
-	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PATCHSET_DIR}/"
-
-	### Removes OS X files and entries.
-	rm -rv "org/gudy/azureus2/platform/macosx" \
-		   "org/gudy/azureus2/ui/swt/osx" || die
-
-	### Removes Windows files.
-	rm -v ./org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	### Removes test files.
-	rm -rv org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-
-	### Removes bouncycastle (we use our own bcprov).
-	rm -rv "org/bouncycastle" || die
-
-	### Removes bundled json
-	rm -rv "org/json" || die
-
-	### The Tree2 file does not compile against Linux SWT and is used only on Windows.
-	### It's runtime-conditional use is thus patched out in the patchset.
-	rm -rf "org/eclipse" || die
-
-	mkdir -p build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.6,bcprov-1.40,json-simple,log4j,commons-cli-1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt || die
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}/${PN}.desktop"
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates via ebuilds"
-
-	elog "Vuze has been formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration"
-	elog "options will be placed in '~/.azureus/gentoo.config'."
-	elog "If you need to change some startup options, you should"
-	elog "modify this file, rather than the startup script."
-	elog "Using this config file you can start the console UI."
-	elog
-
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-5.3.0.0.ebuild b/net-p2p/vuze/vuze-5.3.0.0.ebuild
index 26b3970ffdc2..629d420db03a 100644
--- a/net-p2p/vuze/vuze-5.3.0.0.ebuild
+++ b/net-p2p/vuze/vuze-5.3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.3.0.0.ebuild,v 1.2 2015/03/14 09:39:07 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.3.0.0.ebuild,v 1.3 2015/04/19 10:03:51 rhill Exp $
 
 EAPI="5"
 
@@ -23,10 +23,10 @@ IUSE=""
 # bundles parts of http://www.programmers-friend.org/
 # bundles bcprov - 1.37 required but not in the tree
 RDEPEND="
-	dev-java/commons-cli
+	dev-java/commons-cli:1
 	dev-java/commons-lang:2.1
-	dev-java/json-simple
-	dev-java/log4j
+	dev-java/json-simple:0
+	dev-java/log4j:0
 	dev-java/swt:3.8[cairo]
 	>=virtual/jre-1.6:*"
 
diff --git a/net-p2p/vuze/vuze-5.6.0.0.ebuild b/net-p2p/vuze/vuze-5.6.0.0.ebuild
index 5f21ee825db6..da581286cc25 100644
--- a/net-p2p/vuze/vuze-5.6.0.0.ebuild
+++ b/net-p2p/vuze/vuze-5.6.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.6.0.0.ebuild,v 1.1 2015/03/14 09:39:07 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.6.0.0.ebuild,v 1.2 2015/04/19 10:03:51 rhill Exp $
 
 EAPI="5"
 
@@ -23,10 +23,10 @@ IUSE=""
 # bundles parts of http://www.programmers-friend.org/
 # bundles bcprov - 1.37 required but not in the tree
 RDEPEND="
-	dev-java/commons-cli
+	dev-java/commons-cli:1
 	dev-java/commons-lang:2.1
-	dev-java/json-simple
-	dev-java/log4j
+	dev-java/json-simple:0
+	dev-java/log4j:0
 	dev-java/swt:3.8[cairo]
 	>=virtual/jre-1.6:*"