[gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/, net-p2p/vuze/files/

2021-06-05 Thread Miroslav Šulc
commit: 428a1a90c7e8f4bc1403a991d73ef4d2899e929b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun  5 08:22:07 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun  5 08:22:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428a1a90

net-p2p/vuze: removed obsolete 5.7.6.0

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/vuze-5.6.0.0-commons-lang-entities.patch |  51 
 .../vuze/files/vuze-5.7.6.0-unbundle-commons.patch | 114 
 net-p2p/vuze/vuze-5.7.6.0.ebuild   | 145 -
 3 files changed, 310 deletions(-)

diff --git a/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch 
b/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch
deleted file mode 100644
index c58d475995e..000
--- a/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/org/gudy/azureus2/core3/util/AddressUtils.java 
b/org/gudy/azureus2/core3/util/AddressUtils.java
-index 6691951..38f14ee 100644
 a/org/gudy/azureus2/core3/util/AddressUtils.java
-+++ b/org/gudy/azureus2/core3/util/AddressUtils.java
-@@ -494,11 +494,11 @@ AddressUtils
-   try{
-   // unfortunately we have an 
incompatible base64 standard in i2p, they replaced / with ~ and + with -
-   
--  char[]  encoded = to_decode.toCharArray();
-+  byte[]  encoded = to_decode.getBytes();
-   
-   for ( int i=0;i");
-   
-   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);
-+ 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/, net-p2p/vuze/files/

2021-04-19 Thread Miroslav Šulc
commit: 64b38f71e0ab137eb054750943d2ecfdf222e1d7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Apr 19 08:33:10 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Apr 19 08:33:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b38f71

net-p2p/vuze: switched from commons-lang to commons-text

Closes: https://bugs.gentoo.org/783822
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch | 174 +
 net-p2p/vuze/vuze-5.7.6.0-r1.ebuild| 144 +
 2 files changed, 318 insertions(+)

diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch 
b/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch
new file mode 100644
index 000..a03995d167a
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch
@@ -0,0 +1,174 @@
+diff --git a/com/aelitis/azureus/core/metasearch/Result.java 
b/com/aelitis/azureus/core/metasearch/Result.java
+index bec05e1..9588f9a 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.text.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.unescapeHtml4( 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..e03916b 100644
+--- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
 b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
+@@ -22,7 +22,7 @@ package com.aelitis.azureus.core.metasearch.impl.web;
+ import java.util.Date;
+ import java.util.StringTokenizer;
+ 
+-import org.apache.commons.lang.*;
++import org.apache.commons.text.StringEscapeUtils;
+ import org.gudy.azureus2.core3.util.Base32;
+ import org.gudy.azureus2.core3.util.ByteFormatter;
+ import org.gudy.azureus2.core3.util.Debug;
+@@ -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.unescapeHtml4(name);
+   }
+   }
+   
+   public void setCommentsFromHTML(String comments) {
+   if(comments != null) {
+   comments = removeHTMLTags(comments);
+-  comments = Entities.HTML40.unescape(comments);
++  comments = StringEscapeUtils.unescapeHtml4(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.unescapeHtml4(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.unescapeHtml4(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.unescapeHtml4(nbSeeds);
+   nbSeedsS = nbSeedsS.replaceAll(",", "");
+   nbSeedsS = nbSeedsS.replaceAll(" ", "");
+   try {
+@@ -166,7 +166,7 @@ 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/, net-p2p/vuze/files/

2019-10-22 Thread Miroslav Šulc
commit: e49ff55fc315733b4c3425648fedf95322c95d80
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Oct 22 19:47:57 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Oct 22 19:49:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e49ff55f

net-p2p/vuze-5.7.6.0: bump

Closes: https://bugs.gentoo.org/620404
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc  gentoo.org>

 net-p2p/vuze/Manifest  |   1 +
 .../vuze/files/vuze-5.7.6.0-unbundle-commons.patch | 114 
 net-p2p/vuze/vuze-5.7.6.0.ebuild   | 145 +
 3 files changed, 260 insertions(+)

diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 36aa6b09c44..7ebe96a96bb 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -1,3 +1,4 @@
 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

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 000..d8643dbe680
--- /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) {

[gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/, net-p2p/vuze/files/

2016-08-02 Thread Ryan Hill
commit: 18a41171d1aa2281c3aaf7aa963eeb32fc4c18ad
Author: Ryan Hill  gentoo  org>
AuthorDate: Wed Aug  3 00:51:13 2016 +
Commit: Ryan Hill  gentoo  org>
CommitDate: Wed Aug  3 00:55:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a41171

net-p2p/vuze: Version bump.

Package-Manager: portage-2.3.0
Signed-off-by: Ryan Hill  gentoo.org>

 net-p2p/vuze/Manifest |   1 +
 net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch |  71 +++
 net-p2p/vuze/vuze-5.7.2.0.ebuild  | 145 ++
 3 files changed, 217 insertions(+)

diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 09f88fb..271d2ee 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -1,4 +1,5 @@
 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_5720_source.zip 10709515 SHA256 
fcad8bc3df5e5d844eb7a8e0f24d199b37cfc831b2c50698e12ce9e5a9db1045 SHA512 
073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
 WHIRLPOOL 
a45cdfba1a42bfdb4cf36a493b1522865b465e37ec8d0921a63d2e449f1d25f1dfd3d96857b29b45f68eb6d36bf4f25767eb13426bf944711411259a8af3ea78
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 SHA256 
972cf16d88d8605f93b77a84770b6512d54ae8281a0d4c06b66890a69deb6c49 SHA512 
aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
 WHIRLPOOL 
a7dd533676c428a00caddc2d4d4c008feec1a1201bb9aef7b7ed9c25d41405344d89bc9f70d442f043beb7aaf6db7d73582cc46edfa3665d599b2635e51b1ee7

diff --git a/net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch 
b/net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch
new file mode 100644
index 000..6ae2301
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch
@@ -0,0 +1,71 @@
+diff --git a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java 
b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
+index 256daff..68010b9 100644
+--- a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
 b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
+@@ -231,66 +231,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) {
+-  UIFunctions uiFunctions = 
UIFunctionsManager.getUIFunctions();
+-  if (uiFunctions != null) {
+-  event.doit = 
uiFunctions.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 =