gentoo resync : 25.01.2018

5 files changed, 4 insertions, 225 deletions

diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 53eeadb30c8a..49d4d44be9e6 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -1,6 +1,5 @@
 AUX build.xml 2275 BLAKE2B a4aea605301da5ad6af89915c686caabd9ee0f0d3b56f3ee46e2eae74adc86d88de4462228e0387b43b1d5b897c3d6b2e8939822000e86631c22ec5230e31461 SHA512 bdec7c10548ed2fda57235d14f0ae67e00e548a84b88855b5b683c947015b52bcf7011fb5952b4225370db54541614c0402fe6c77e723d310358a502837b40a3
 AUX vuze-4.1.0.0-pre 1850 BLAKE2B 3013871146bd43e7bcd0e7bd92c44ca5d06ebca634ed836918f89c1620095a200c81de2ce76c30a4cef5b3f659995c14532b410c8c39679ee821196009aba821 SHA512 04c5a77bff69e50963f3122c46f549dec78e462bfa0697b32ffe8630d22612a64f1adc52bc8d7d8868d972c4bdac3082a1e9b513459d9f97915ad87d05ab2b4a
-AUX vuze-5.3.0.0-disable-osx.patch 1841 BLAKE2B aa87ad0364dd7e604a004749cd432954847b0d487bde7e56e0c6273017fc7dbefbe322884ff3dc0520cf415f9be87c18611503aa0041cc6030f9eed04b8edf0d SHA512 f5c60b188eb5e4c48dfd73c9de03c4eb0884dfb36f147d6ef4be6d2e26602d7de6f80de4be4a64d94c1d9ad9cdbbd928b1cd4e00f09c57e8eb72d7d0f623e1c7
 AUX vuze-5.3.0.0-disable-shared-plugins.patch 1069 BLAKE2B d2594d617396bee9506cf8060c61d7d97b4e5780b34ebed656cffa3d70cf69d27a50056d77d8527af716246a31918d81c626f931aa9b7a78bb3c823d2da79f7f SHA512 ee9e6513b2dd1d4e986f4c57fd5ace3593f98f7eaeb5e454fc7b5fb3c6876b86b85b511981c951ead96b1a106abb18a2e01047b2063d55c98300ed6356c0460b
 AUX vuze-5.3.0.0-disable-updaters.patch 1726 BLAKE2B 8a1d7ec1196ee27019f513d51290a0d5dae1f1ada84e21617f42d8e6bd9a42020be84eb962489f371c611f3af2edb2fb9c0bbd7d986a10ea31103a64fe3ada82 SHA512 743d48eeeac4534fc66463c0989a88d97117d988227b6cce77abdaa97c9cb9813aa1228f81a607af09e07fdf95ce02a3981f7f083fba0d9875d0951b8bbf29a3
 AUX vuze-5.3.0.0-java5.patch 618 BLAKE2B d939b9708bc4fa2902d1b5f78ceb4d707ff59e421cc9b2308178d57e78dede189eeb0723bea8ac22a3b6502f59533f72a1207be59e36cca7c568d2e0c52ce120 SHA512 0ecddf69a7fdd72860262cc73dd4a0852ba8e31d73dfc7ad1d96ad18eaa41ec23ca977207d6bff32e183d95c1a6918909ef3cab697d0c9d754345613544eb90c
@@ -12,10 +11,8 @@ AUX vuze-5.6.0.0-invalid-characters.patch 1121 BLAKE2B 4a4dc12ee00fc60198a1533e4
 AUX vuze-5.7.2.0-disable-osx.patch 2278 BLAKE2B 760b82f75b310d01b94891a3c1528fe48200e7c8fdc04baecb18965316e3ffb347c9b131540f7a30061751fd1b449d924536f9d8f77bde7743c88579b33e9be5 SHA512 39797193297d61c1e91bfdcbf6e4fa6acb523c067ac96a0de99d5f79fab69b327688f87f8c8f24c0d7967c4c1017bde478ecc10aa117f96f0b891dc10a21420a
 AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
 DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a7305587d36ef863257b7b86e911f7012e73f532b3b4648000cfff5fa2fd2cd1848f0742791232ceee54f158a9c219 SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf
-DIST Vuze_5600_source.zip 10398501 BLAKE2B 3c6a1a8967bb3a603dfcb248cc5d5dd8aaf4a7efdfba9efa529fa98f0ad945574ffe574084d223fadb3710e6aa690d86dd8d67ea77febbe6a28b730f97ba313e SHA512 dfe557cb1f50be935c78ee4431bc14db5f0107eebab8545cf925de8b0d48bb91ca77f7feab54a5fd91aaaf50bd3c68c1519cf49c2eb4d145ff7794bf9f22cfd7
 DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
-EBUILD vuze-4.8.1.2-r1.ebuild 4273 BLAKE2B 64e39bf87b9c1f63d085f23a171b2256acc5961459ebdc29709d874f2c8f70a0607fa2522698ab637bbbee750189cbdb715238faab68d878f43e1799a1ea5fe3 SHA512 c27b01e4d5ec5751d5af4d62170572a43744fa04d934bf820c7a53d84735adda38967bfcc525521ec6e2dd2ab9f0d4de346ce7099b8f64ebafd0ddf0cc44c8c1
-EBUILD vuze-5.6.0.0.ebuild 4407 BLAKE2B 4d5c0c06f211b4a90a4e2ae3ffe58c8df9335e9340ac58038a51ad8c2210d35ffc28ffcd73ec4d51b8220fb975d8b22e56ad60e18b34ccca7419cd6d036855fe SHA512 a94743bace7557aec51eec202edc89fc828924e790b5591494ca73f10ced30c2378f36bb4d512d49e6c0f34e17bad295ce8a5777b9219a9e819e50c49fce6b5d
-EBUILD vuze-5.7.2.0.ebuild 4407 BLAKE2B 3117c769ed08349f132ae7d1e4bf498a6beb9abf30797b9d7f3926a3c7cbb4a3a99dfa831ddbf0d4197ca43bc120715e528b232ed279fb69f659fb1345c278b5 SHA512 2015dda515c61e65b554dd1d7ad1b56773bc717e3e927e937d04b4ef6bf37c7e48a6ea267c9647e8044093d555a3649467c25003562bc670f3a96aa0d416dd53
+EBUILD vuze-4.8.1.2-r1.ebuild 4009 BLAKE2B cf4c682b9aa7523e63d5d652b963bacbc3592bee5e8787d8d8d7e0090e9683b8f23c4f8757a5a495d7a581cd61f9e7843eea4325ca20ec347989d50988e96246 SHA512 b161e31d14594bd795bb02a6b0a83b09e6ca6db10b8e8078f8422c202575d8fe3d03c2e111ada4fcb806062e71f7acde163c31c63e8f0c29fd8221223edd6a26
+EBUILD vuze-5.7.2.0.ebuild 4202 BLAKE2B 566b413c98b31d0e6af8e825e7512dedee93aa895fe65e82b96b9807843d38db49ccb7b6fc038768eec1278bb164107308f6ebc37910811e7e8003d5c5555274 SHA512 30018294bf0a93e9970c031ea21ff5923324cf61938a993a0bac7b3f149e67ea519f4a38d99b6e821566fbc5a0f2caafa1600352d4454a9efbccf91ca18a96e0
 MISC metadata.xml 415 BLAKE2B 919790264b1d38dbb5ffe76b2611851a7d601980ed82c3008d4c762431e9ec4ce58def0fc824f85fb694aead62190e11cba7b57149259f1e59b26c0736e605a6 SHA512 d81c0a6171fcd95b06d63b6d6680a22451326ecff7e4a82e8d581cc2da95663bc35b9f2a4e56c0d10aa915e5f1ee238f5b2bc33ee06944ef1250def695367c7d
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch b/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch
deleted file mode 100644
index 070dae2d7562..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-+++ b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-@@ -229,57 +229,6 @@ public class SWTThread {
- 			}
- 		});
- 
--		if (Constants.isOSX) {
--			
--			// On Cocoa, we get a Close trigger on display.  Need to check if all
--			// platforms send this.
--			display.addListener(SWT.Close, new Listener() {
--				public void handleEvent(Event event) {
--					event.doit = UIFunctionsManager.getUIFunctions().dispose(false, false);
--				}
--			});
--
--			String platform = SWT.getPlatform();
--			// use reflection here so we decouple generic SWT from OSX specific stuff to an extent
--
--			if (platform.equals("carbon")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
--
--					Constructor<?> constructor = ehancerClass.getConstructor(new Class[] {});
--
--					constructor.newInstance(new Object[] {});
--
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			} else if (platform.equals("cocoa")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CocoaUIEnhancer");
--
--					Method mGetInstance = ehancerClass.getMethod("getInstance", new Class[0]);
--					Object claObj = mGetInstance.invoke(null, new Object[0] );
--
--					Method mHookAppMenu = claObj.getClass().getMethod("hookApplicationMenu", new Class[] {});
--					if (mHookAppMenu != null) {
--						mHookAppMenu.invoke(claObj, new Object[0]);
--					}
--
--					Method mHookDocOpen = claObj.getClass().getMethod("hookDocumentOpen", new Class[] {});
--					if (mHookDocOpen != null) {
--						mHookDocOpen.invoke(claObj, new Object[0]);
--					}
--					
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			}
--		}   
--
- 		if (app != null) {
- 			app.runInSWTThread();
- 			runner = new Thread(new AERunnable() {
diff --git a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild b/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
index 0c35e7b02cd3..760aa1db034d 100644
--- a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
+++ b/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -129,12 +129,6 @@ pkg_postinst() {
 	elog "Using this config file you can start the console UI."
 	elog
 
-	if ! has_version dev-java/swt:3.7[webkit]; then
-		elog
-		elog "Your dev-java/swt:3.7 was built without webkit support. Features such as Vuze HD Network will not work."
-		elog "Rebuild swt with USE=webkit (needs net-libs/webkit-gtk:2) to use these features."
-	fi
-
 	fdo-mime_desktop_database_update
 }
 
diff --git a/net-p2p/vuze/vuze-5.6.0.0.ebuild b/net-p2p/vuze/vuze-5.6.0.0.ebuild
deleted file mode 100644
index 561de94cf7ae..000000000000
--- a/net-p2p/vuze/vuze-5.6.0.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators "")
-MY_SRC="Vuze_${MY_PV}"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-# bundles parts of http://www.programmers-friend.org/
-# bundles bcprov - 1.37 required but not in the tree
-RDEPEND="
-	dev-java/commons-cli:1
-	dev-java/commons-lang:2.1
-	dev-java/json-simple:0
-	dev-java/log4j:0
-	dev-java/swt:3.8[cairo]
-	>=virtual/jre-1.6:*"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.6:*"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-pkg_pretend() {
-	if ! has_version dev-java/swt:3.8[webkit]; then
-		echo
-		ewarn "dev-java/swt:3.8 was built without webkit support."
-		ewarn "Web features such as Vuze HD Network will be disabled."
-	fi
-}
-
-src_unpack() {
-	mkdir -p "${S}" && cd "${S}"
-	unpack ${A}
-
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
-}
-
-java_prepare() {
-	# upstream likes randomly changing a subset of files to CRLF every release
-	edos2unix $(find "${S}" -type f -name "*.java")
-
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-java5.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-osx.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-commons.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0.0-invalid-characters.patch
-#	epatch "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
-
-	# OSX / Windows
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java
-	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
-
-	# Tree2 file does not compile on linux
-	rm -rf "${S}"/org/eclipse || die
-	# Bundled apache
-	rm -rf "${S}"/org/apache || die
-	# Bundled json
-	rm -rf "${S}"/org/json || die
-	# Bundled bcprov
-	# currently disabled - requires bcprov 1.37
-	#rm -rf "${S}"/org/bouncycastle || die
-
-	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-	mkdir -p "${S}"/build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	use sparc && mem="320"
-	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
-
-	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"
-	echo
-	elog "Vuze was formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration options will be"
-	elog "placed in '~/.azureus/gentoo.config'."
-	elog
-	elog "If you need to change some startup options, you should modify this file"
-	elog "rather than the startup script.  You can enable the console UI by"
-	elog "editing this config file."
-	echo
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-5.7.2.0.ebuild b/net-p2p/vuze/vuze-5.7.2.0.ebuild
index 65d8f1b6371f..01f5c404a7cd 100644
--- a/net-p2p/vuze/vuze-5.7.2.0.ebuild
+++ b/net-p2p/vuze/vuze-5.7.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -36,14 +36,6 @@ DEPEND="${RDEPEND}
 
 PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
 
-pkg_pretend() {
-	if ! has_version dev-java/swt:3.8[webkit]; then
-		echo
-		ewarn "dev-java/swt:3.8 was built without webkit support."
-		ewarn "Web features such as Vuze HD Network will be disabled."
-	fi
-}
-
 src_unpack() {
 	mkdir -p "${S}" && cd "${S}"
 	unpack ${A}