[gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/files/, net-p2p/vuze/
commit: 63d98adfd4189404fa86fbef73475410f12a6f41
Author: Yuan Liao gmail com>
AuthorDate: Thu Feb 17 18:48:06 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Feb 20 10:10:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d98adf
net-p2p/vuze: Switch to log4j-12-api:2, and make ebuild improvements
- Update to EAPI 8
- Switch to HTTPS URL for HOMEPAGE
- Put dependencies into BDEPEND and IDEPEND as appropriate
- Increase memory allotted to the JVM running javac by 192 MB, which is
needed after the migration to log4j-12-api:2
Closes: https://bugs.gentoo.org/831714
Signed-off-by: Yuan Liao gmail.com>
Closes:
https://github.com/gentoo/gentoo/pull/24261/commits/1a2dd6e5e73c65bbe266c58fa4f573d4e1698522
Signed-off-by: Miroslav Šulc gentoo.org>
net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch | 130 ++
net-p2p/vuze/vuze-5.7.6.0-r2.ebuild| 147 +
2 files changed, 277 insertions(+)
diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch
b/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch
new file mode 100644
index ..4bcce5d5f32d
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch
@@ -0,0 +1,130 @@
+From d960f15294c451bda338e4d9998e8d009970f380 Mon Sep 17 00:00:00 2001
+From: Yuan Liao
+Date: Fri, 18 Feb 2022 12:47:20 -0800
+Subject: [PATCH] Migrate from Log4j 1.2 to log4j-1.2-api bridge from Log4j 2
+
+Signed-off-by: Yuan Liao
+---
+ org/gudy/azureus2/ui/common/Main.java | 7 +++---
+ .../azureus2/ui/console/ConsoleInput.java | 8 +++---
+ .../azureus2/ui/console/commands/Log.java | 25 ++-
+ 3 files changed, 21 insertions(+), 19 deletions(-)
+
+diff --git a/org/gudy/azureus2/ui/common/Main.java
b/org/gudy/azureus2/ui/common/Main.java
+index 8c533fb..f93e685 100644
+--- a/org/gudy/azureus2/ui/common/Main.java
b/org/gudy/azureus2/ui/common/Main.java
+@@ -43,7 +43,8 @@ import org.apache.log4j.Appender;
+ import org.apache.log4j.ConsoleAppender;
+ import org.apache.log4j.Logger;
+ import org.apache.log4j.PatternLayout;
+-import org.apache.log4j.varia.DenyAllFilter;
++import org.apache.log4j.bridge.FilterWrapper;
++import org.apache.logging.log4j.core.filter.DenyAllFilter;
+
+ import com.aelitis.azureus.core.*;
+ import com.aelitis.azureus.core.impl.AzureusCoreSingleInstanceClient;
+@@ -113,9 +114,9 @@ public class Main {
+ public static void initRootLogger() {
+ if (Logger.getRootLogger().getAppender("ConsoleAppender")==null) {
+ Appender app;
+- app = new ConsoleAppender(new
PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN));
++ app = new ConsoleAppender();
+ app.setName("ConsoleAppender");
+- app.addFilter( new DenyAllFilter() ); //'log off' by default
++ app.addFilter( new FilterWrapper(DenyAllFilter.newBuilder().build()) );
//'log off' by default
+ Logger.getRootLogger().addAppender(app);
+ }
+ }
+diff --git a/org/gudy/azureus2/ui/console/ConsoleInput.java
b/org/gudy/azureus2/ui/console/ConsoleInput.java
+index d660bbb..0559f72 100644
+--- a/org/gudy/azureus2/ui/console/ConsoleInput.java
b/org/gudy/azureus2/ui/console/ConsoleInput.java
+@@ -34,8 +34,8 @@ import java.util.Vector;
+ import org.apache.log4j.Appender;
+ import org.apache.log4j.ConsoleAppender;
+ import org.apache.log4j.Logger;
+-import org.apache.log4j.PatternLayout;
+-import org.apache.log4j.varia.DenyAllFilter;
++import org.apache.log4j.bridge.FilterWrapper;
++import org.apache.logging.log4j.core.filter.DenyAllFilter;
+ import org.gudy.azureus2.core3.config.COConfigurationManager;
+ import org.gudy.azureus2.core3.download.DownloadManager;
+ import org.gudy.azureus2.core3.download.DownloadManagerState;
+@@ -157,9 +157,9 @@ public class ConsoleInput extends Thread {
+
+ if
(Logger.getRootLogger().getAppender("ConsoleAppender")==null) {
+ Appender app;
+-app = new ConsoleAppender(new
PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN));
++app = new ConsoleAppender();
+ app.setName("ConsoleAppender");
+-app.addFilter( new DenyAllFilter() ); //'log off' by default
++app.addFilter( new
FilterWrapper(DenyAllFilter.newBuilder().build()) ); //'log off' by default
+ Logger.getRootLogger().addAppender(app);
+ }
+
+diff --git a/org/gudy/azureus2/ui/console/commands/Log.java
b/org/gudy/azureus2/ui/console/commands/Log.java
+index 43f66d5..8e9b222 100644
+--- a/org/gudy/azureus2/ui/console/commands/Log.java
b/org/gudy/azureus2/ui/console/commands/Log.java
+@@ -18,10 +18,13 @@ import org.apache.commons.cli.Option;
+ import org.apache.commons.cli.Options;
+ import org.apache.log4j.Appender;
+ import org.apache.log4j.ConsoleAppender;
+-import org.apache.log4j.FileAppender;
+ import org.apache.log4j.Logger;
+ import org.apache.log4j.PatternLayo
[gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/files/, net-p2p/vuze/
commit: 801c33b965e4faf1a3c96476b2d939865d2d0fda
Author: Miroslav Šulc gentoo org>
AuthorDate: Mon Nov 25 10:03:24 2019 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Nov 25 10:03:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=801c33b9
net-p2p/vuze-5.7.2.0-r1: removed obsolete + unused patches
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc gentoo.org>
net-p2p/vuze/Manifest | 1 -
.../vuze/files/vuze-5.3.0.0-unbundle-commons.patch | 110
.../files/vuze-5.6.0.0-invalid-characters.patch| 26
net-p2p/vuze/vuze-5.7.2.0-r1.ebuild| 144 -
4 files changed, 281 deletions(-)
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 7ebe96a96bb..89f0a6704fb 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -1,4 +1,3 @@
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.3.0.0-unbundle-commons.patch
b/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-commons.patch
deleted file mode 100644
index deed0af9c7b..000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-commons.patch
+++ /dev/null
@@ -1,110 +0,0 @@
a/com/aelitis/azureus/core/metasearch/Result.java
-+++ b/com/aelitis/azureus/core/metasearch/Result.java
-@@ -27,7 +27,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.DisplayFormatters;
- import org.json.simple.JSONObject;
-
-@@ -372,6 +372,6 @@ public abstract class Result {
- if ( input == null ){
- return( null );
- }
-- return( Entities.HTML40.unescape( input ));
-+ return( StringEscapeUtils.unescapeHtml( input ));
- }
- }
a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-+++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-@@ -88,14 +88,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{
-@@ -108,7 +108,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) {
-@@ -133,7 +133,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 =
[gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/files/, net-p2p/vuze/
commit: ebbf781dc96a408c120d790a3a0a469f61bb34c1
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Jan 24 22:31:01 2018 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Jan 24 22:38:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebbf781d
net-p2p/vuze: Drop old 5.6.0.0
Package-Manager: Portage-2.3.20, Repoman-2.3.6
net-p2p/vuze/Manifest | 1 -
net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch | 60 -
net-p2p/vuze/vuze-5.6.0.0.ebuild | 144 --
3 files changed, 205 deletions(-)
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 0bd82660814..36aa6b09c44 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -1,4 +1,3 @@
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
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 070dae2d756..000
--- 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]);
-- }
--
--
[gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/files/, net-p2p/vuze/
commit: 132eba1d8df297c478a0f16dc52c2e1598b65672
Author: Ryan Hill gentoo org>
AuthorDate: Wed Aug 3 00:53:22 2016 +
Commit: Ryan Hill gentoo org>
CommitDate: Wed Aug 3 00:55:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132eba1d
net-p2p/vuze: Remove old.
Package-Manager: portage-2.3.0
Signed-off-by: Ryan Hill gentoo.org>
net-p2p/vuze/Manifest | 1 -
.../files/vuze-5.3.0.0-invalid-characters.patch| 24
net-p2p/vuze/vuze-5.3.0.0.ebuild | 144 -
3 files changed, 169 deletions(-)
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 271d2ee..a50b5d3 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -1,5 +1,4 @@
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.3.0.0-invalid-characters.patch
b/net-p2p/vuze/files/vuze-5.3.0.0-invalid-characters.patch
deleted file mode 100644
index 3ef4d80..000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-invalid-characters.patch
+++ /dev/null
@@ -1,24 +0,0 @@
a/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
-+++ b/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
-@@ -50,17 +50,17 @@ public class DateParserRegex extends DateParser {
-
- private static final String[] MONTHS_LIST = new String[] {
- " january janvier enero januar",
-- " february fevrier f�vrier febrero februar",
-- " march mars marzo marz marz m�rz" ,
-+ " february fevrier febrero februar",
-+ " march mars marzo marz marz" ,
- " april avril abril april ",
- " may mai mayo mai",
- " june juin junio juni",
- " july juillet julio juli",
-- " august aout ao�t agosto august",
-+ " august aout agosto august",
- " september septembre septiembre september",
- " october octobre octubre oktober",
- " november novembre noviembre november",
-- " december decembre d�cembre diciembre dezember"};
-+ " december decembre diciembre dezember"};
-
- public DateParserRegex() {
- this("GMT-7",true,null);
diff --git a/net-p2p/vuze/vuze-5.3.0.0.ebuild b/net-p2p/vuze/vuze-5.3.0.0.ebuild
deleted file mode 100644
index b7742d1..000
--- a/net-p2p/vuze/vuze-5.3.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
-# $Id$
-
-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/
-# bundle
