gentoo resync : 03.11.2019

3 files changed, 155 insertions, 30 deletions

diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index ef0a16e0d92f..553624cc7838 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -9,11 +9,13 @@ AUX vuze-5.3.0.0-unbundle-json.patch 1322 BLAKE2B fc387740073933b9f99474dd2ac5e7
 AUX vuze-5.6.0.0-commons-lang-entities.patch 2085 BLAKE2B 547ab6aa8e964280f72bc161775c4eaec5371c06d8e98629013068d3d69b160f8cac36377a14811ad714cc011f3293d7c82dd873d2bbed536110ab4b4d6fd016 SHA512 a08d23a1947ad668048f49c8137d4494da662d65f5cf98acd5e44656f7d6a2bf691eebba4fd8033996594d1c4edc1a2eec3ce3f92d23b1818c03b405fc081899
 AUX vuze-5.6.0.0-invalid-characters.patch 1121 BLAKE2B 4a4dc12ee00fc60198a1533e4b3b0e293dd6b98f7cdafdaafbc4819bf2bf0ffdaa90065fae8770769f42ae39b6e2a437e0f191dae66b1f24e40b4195fb0b9300 SHA512 718c64a892aa860455db4c23f97d403c77bbba0fd1ecf957761f7c7dfcb9c8b42ed75b1f3e706f3d67335ed38599fbc6f9e2731941bdf819d956e830a8227344
 AUX vuze-5.7.2.0-disable-osx.patch 2278 BLAKE2B 760b82f75b310d01b94891a3c1528fe48200e7c8fdc04baecb18965316e3ffb347c9b131540f7a30061751fd1b449d924536f9d8f77bde7743c88579b33e9be5 SHA512 39797193297d61c1e91bfdcbf6e4fa6acb523c067ac96a0de99d5f79fab69b327688f87f8c8f24c0d7967c4c1017bde478ecc10aa117f96f0b891dc10a21420a
+AUX vuze-5.7.6.0-unbundle-commons.patch 5156 BLAKE2B 641a0264521e97d808046a9d76cb362302dd25679a6e8df6878646d59f04b1a6cc0ab1fd7e83d8f76cb7250b9b2fbd64cf1efbbbc4eb14a0432f2eceea3c22c7 SHA512 f4c5082b618a2feb9c19bb1ddc53e7a61f1511d804488ce279e3c3174fc185d93d31316de58d185e3f6a6f19af11d587c9b11c4361c3f07622c11843eff6b51c
 AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
 DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a7305587d36ef863257b7b86e911f7012e73f532b3b4648000cfff5fa2fd2cd1848f0742791232ceee54f158a9c219 SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf
 DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
+DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
 EBUILD vuze-4.8.1.2-r1.ebuild 4000 BLAKE2B 5ce11619ce22b732bd1f7c0f38c5d48f72cce4bce2092ccc93bc261b6888b40d24cf0bd1e2a120549c2adddd9576226faa9049105a0b81df188eb49f3d094593 SHA512 bffeac4eaab07b89d9e80cdfa3483cd0d3027f4fc53d5e70177c6e07cecc06f64a606fc8daf06fa2dfbeba84e96fc4ecbd82666203bc939347e021e0931da706
 EBUILD vuze-5.7.2.0-r1.ebuild 4253 BLAKE2B c857b5ff4dc750b3d2790c919f24b38d49ca7272dad17c80b789f6aa2fb8978dbe2e525131cedbb829525c51843efcf74ae04067258c6891687af5c8a844bfc9 SHA512 2b5299478c69ac75e28d47c35d0e3ca7a3064fd168a53a78e11545baa674940e62ae11b62bc46883b1561184da5b3e81002bb4a9309e38579d2a5ed1c63bc6dd
-EBUILD vuze-5.7.2.0.ebuild 4193 BLAKE2B c1845f9c926717ea470ab39122771498a1d49d0cd9bc5fe406f8c9aa20f99a1b02489c4ef490855743646c184b819c4a767e4fc2b0912caac99cb337f18d5054 SHA512 57542781decd415deaf345fc00977d9502def7faac9685273b2d9df8e55a3233f15efc861183ac85af2bf9d9febad5c99bcac3137d6cf15f96c1083b0cd5044c
+EBUILD vuze-5.7.6.0.ebuild 4110 BLAKE2B 0c21f1a4937237ab93865419d74015b0241bba14ebfbfa8fba7599562c58fa212e3fcc230a345eaf915ded63f3e790dfdacc995eb640a21922695c9d8d9b16df SHA512 46f739eb0bf9675fce078e6eb9ebf0b7a8ad3483b3fef188891235122fdeda7f4ee17677bea387c5e16b8002ae830c87e0f4033fb5dc903441a6e86eb444bace
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch b/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch
new file mode 100644
index 000000000000..d8643dbe680f
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch
@@ -0,0 +1,114 @@
+diff --git a/com/aelitis/azureus/core/metasearch/Result.java b/com/aelitis/azureus/core/metasearch/Result.java
+index bec05e1..9481f86 100644
+--- a/com/aelitis/azureus/core/metasearch/Result.java
++++ b/com/aelitis/azureus/core/metasearch/Result.java
+@@ -28,7 +28,7 @@ import java.util.Locale;
+ import java.util.Map;
+ import java.util.Random;
+ 
+-import org.apache.commons.lang.Entities;
++import org.apache.commons.lang.StringEscapeUtils;
+ import org.gudy.azureus2.core3.util.AENetworkClassifier;
+ import org.gudy.azureus2.core3.util.DisplayFormatters;
+ import org.gudy.azureus2.core3.util.HostNameToIPResolver;
+@@ -464,6 +464,6 @@ public abstract class Result {
+ 		if ( input == null ){
+ 			return( null );
+ 		}
+-		return( Entities.HTML40.unescape( input ));
++		return( StringEscapeUtils.unescapeHtml( input ));
+ 	}
+ }
+diff --git a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
+index 2d353b8..8ebf9ff 100644
+--- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
++++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
+@@ -87,14 +87,14 @@ public class WebResult extends Result {
+ 	public void setNameFromHTML(String name) {
+ 		if(name != null) {
+ 			name = removeHTMLTags(name);
+-			this.name = Entities.HTML40.unescape(name);
++			this.name = StringEscapeUtils.unescapeHtml(name);
+ 		}
+ 	}
+ 	
+ 	public void setCommentsFromHTML(String comments) {
+ 		if(comments != null) {
+ 			comments = removeHTMLTags(comments);
+-			comments = Entities.HTML40.unescape(comments);
++			comments = StringEscapeUtils.unescapeHtml(comments);
+ 			comments = comments.replaceAll(",", "");
+ 			comments = comments.replaceAll(" ", "");
+ 			try{
+@@ -107,7 +107,7 @@ public class WebResult extends Result {
+ 	public void setCategoryFromHTML(String category) {
+ 		if(category != null) {
+ 			category = removeHTMLTags(category);
+-			this.category = Entities.HTML40.unescape(category).trim();
++			this.category = StringEscapeUtils.unescapeHtml(category).trim();
+ 			/*int separator = this.category.indexOf(">");
+ 			
+ 			if(separator != -1) {
+@@ -136,7 +136,7 @@ public class WebResult extends Result {
+ 	public void setNbPeersFromHTML(String nbPeers) {
+ 		if(nbPeers != null) {
+ 			nbPeers = removeHTMLTags(nbPeers);
+-			String nbPeersS = Entities.HTML40.unescape(nbPeers);
++			String nbPeersS = StringEscapeUtils.unescapeHtml(nbPeers);
+ 			nbPeersS = nbPeersS.replaceAll(",", "");
+ 			nbPeersS = nbPeersS.replaceAll(" ", "");
+ 			try {
+@@ -151,7 +151,7 @@ public class WebResult extends Result {
+ 	public void setNbSeedsFromHTML(String nbSeeds) {
+ 		if(nbSeeds != null) {
+ 			nbSeeds = removeHTMLTags(nbSeeds);
+-			String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
++			String nbSeedsS = StringEscapeUtils.unescapeHtml(nbSeeds);
+ 			nbSeedsS = nbSeedsS.replaceAll(",", "");
+ 			nbSeedsS = nbSeedsS.replaceAll(" ", "");
+ 			try {
+@@ -166,7 +166,7 @@ public class WebResult extends Result {
+ 	public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
+ 		if(nbSuperSeeds != null) {
+ 			nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
+-			String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
++			String nbSuperSeedsS = StringEscapeUtils.unescapeHtml(nbSuperSeeds);
+ 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
+ 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
+ 			try {
+@@ -248,7 +248,7 @@ public class WebResult extends Result {
+ 	public void setPublishedDateFromHTML(String publishedDate) {
+ 		if(publishedDate != null && publishedDate.length() > 0) {
+ 			publishedDate = removeHTMLTags(publishedDate);
+-			String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
++			String publishedDateS = StringEscapeUtils.unescapeHtml(publishedDate).replace((char)160,(char)32);
+ 			this.publishedDate = dateParser.parseDate(publishedDateS);
+ 		}
+ 	}
+@@ -257,7 +257,7 @@ public class WebResult extends Result {
+ 	public void setSizeFromHTML(String size) {
+ 		if(size != null) {
+ 			size = removeHTMLTags(size);
+-			String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
++			String sizeS = StringEscapeUtils.unescapeHtml(size).replace((char)160,(char)32);
+ 			sizeS = sizeS.replaceAll("<[^>]+>", " ");
+ 			//Add a space between the digits and unit if there is none
+ 			sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
+@@ -303,7 +303,7 @@ public class WebResult extends Result {
+ 	public void setVotesFromHTML(String votes_str) {
+ 		if(votes_str != null) {
+ 			votes_str = removeHTMLTags(votes_str);
+-			votes_str = Entities.HTML40.unescape(votes_str);
++			votes_str = StringEscapeUtils.unescapeHtml(votes_str);
+ 			votes_str = votes_str.replaceAll(",", "");
+ 			votes_str = votes_str.replaceAll(" ", "");
+ 			try {
+@@ -317,7 +317,7 @@ public class WebResult extends Result {
+ 	public void setVotesDownFromHTML(String votes_str) {
+ 		if(votes_str != null) {
+ 			votes_str = removeHTMLTags(votes_str);
+-			votes_str = Entities.HTML40.unescape(votes_str);
++			votes_str = StringEscapeUtils.unescapeHtml(votes_str);
+ 			votes_str = votes_str.replaceAll(",", "");
+ 			votes_str = votes_str.replaceAll(" ", "");
+ 			try {
diff --git a/net-p2p/vuze/vuze-5.7.2.0.ebuild b/net-p2p/vuze/vuze-5.7.6.0.ebuild
index 41195930d091..893c96776623 100644
--- a/net-p2p/vuze/vuze-5.7.2.0.ebuild
+++ b/net-p2p/vuze/vuze-5.7.6.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-ant-2 versionator xdg-utils
+inherit eutils java-pkg-2 java-ant-2 xdg-utils desktop
 
-MY_PV=$(replace_all_version_separators "")
+MY_PV=$(ver_rs 1- "")
 MY_SRC="Vuze_${MY_PV}"
 
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
@@ -17,53 +17,62 @@ 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
+CDEPEND="
 	dev-java/log4j:0
 	dev-java/swt:3.8[cairo]
-	>=virtual/jre-1.6:*"
+	dev-java/commons-cli:1
+	dev-java/json-simple:0
+	dev-java/commons-lang:2.1"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8"
 
-DEPEND="${RDEPEND}
+DEPEND="
+	${CDEPEND}
 	app-arch/unzip
 	dev-util/desktop-file-utils
-	>=virtual/jdk-1.6:*"
+	>=virtual/jdk-1.8"
 
 PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3.0.0-java5.patch
+	"${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
+	"${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
+	"${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch
+	"${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
+	"${FILESDIR}"/${P}-unbundle-commons.patch
+	"${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
+	"${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch
+#	"${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
+)
+
 src_unpack() {
-	mkdir -p "${S}" && cd "${S}"
+	mkdir -p "${S}" || die
+	cd "${S}" || die
 	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"
+	if [[ -f build.xml ]]; then
+		die "upstream has build.xml again, don't overwrite"
+	fi
 	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
 }
 
-java_prepare() {
+src_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.7.2.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
+	default
 
 	# 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
+	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java || die
+	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java || die
+	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
 
 	# Tree2 file does not compile on linux
 	rm -rf "${S}"/org/eclipse || die
@@ -85,7 +94,7 @@ 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 x86   && mem="256"
 	use ppc   && mem="192"
 	use ppc64 && mem="256"
 	use sparc && mem="320"