Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/files/, net-p2p/vuze/
Date: Mon, 25 Nov 2019 10:04:33
Message-Id: 1574676204.801c33b965e4faf1a3c96476b2d939865d2d0fda.fordfrog@gentoo
1 commit: 801c33b965e4faf1a3c96476b2d939865d2d0fda
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 25 10:03:24 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 25 10:03:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=801c33b9
7
8 net-p2p/vuze-5.7.2.0-r1: removed obsolete + unused patches
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.18
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 net-p2p/vuze/Manifest | 1 -
14 .../vuze/files/vuze-5.3.0.0-unbundle-commons.patch | 110 ----------------
15 .../files/vuze-5.6.0.0-invalid-characters.patch | 26 ----
16 net-p2p/vuze/vuze-5.7.2.0-r1.ebuild | 144 ---------------------
17 4 files changed, 281 deletions(-)
18
19 diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
20 index 7ebe96a96bb..89f0a6704fb 100644
21 --- a/net-p2p/vuze/Manifest
22 +++ b/net-p2p/vuze/Manifest
23 @@ -1,4 +1,3 @@
24 DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a7305587d36ef863257b7b86e911f7012e73f532b3b4648000cfff5fa2fd2cd1848f0742791232ceee54f158a9c219 SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf
25 -DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
26 DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5
27 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
28
29 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
30 deleted file mode 100644
31 index deed0af9c7b..00000000000
32 --- a/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-commons.patch
33 +++ /dev/null
34 @@ -1,110 +0,0 @@
35 ---- a/com/aelitis/azureus/core/metasearch/Result.java
36 -+++ b/com/aelitis/azureus/core/metasearch/Result.java
37 -@@ -27,7 +27,7 @@ import java.util.Locale;
38 - import java.util.Map;
39 - import java.util.Random;
40 -
41 --import org.apache.commons.lang.Entities;
42 -+import org.apache.commons.lang.StringEscapeUtils;
43 - import org.gudy.azureus2.core3.util.DisplayFormatters;
44 - import org.json.simple.JSONObject;
45 -
46 -@@ -372,6 +372,6 @@ public abstract class Result {
47 - if ( input == null ){
48 - return( null );
49 - }
50 -- return( Entities.HTML40.unescape( input ));
51 -+ return( StringEscapeUtils.unescapeHtml( input ));
52 - }
53 - }
54 ---- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
55 -+++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
56 -@@ -88,14 +88,14 @@ public class WebResult extends Result {
57 - public void setNameFromHTML(String name) {
58 - if(name != null) {
59 - name = removeHTMLTags(name);
60 -- this.name = Entities.HTML40.unescape(name);
61 -+ this.name = StringEscapeUtils.unescapeHtml(name);
62 - }
63 - }
64 -
65 - public void setCommentsFromHTML(String comments) {
66 - if(comments != null) {
67 - comments = removeHTMLTags(comments);
68 -- comments = Entities.HTML40.unescape(comments);
69 -+ comments = StringEscapeUtils.unescapeHtml(comments);
70 - comments = comments.replaceAll(",", "");
71 - comments = comments.replaceAll(" ", "");
72 - try{
73 -@@ -108,7 +108,7 @@ public class WebResult extends Result {
74 - public void setCategoryFromHTML(String category) {
75 - if(category != null) {
76 - category = removeHTMLTags(category);
77 -- this.category = Entities.HTML40.unescape(category).trim();
78 -+ this.category = StringEscapeUtils.unescapeHtml(category).trim();
79 - /*int separator = this.category.indexOf(">");
80 -
81 - if(separator != -1) {
82 -@@ -133,7 +133,7 @@ public class WebResult extends Result {
83 - public void setNbPeersFromHTML(String nbPeers) {
84 - if(nbPeers != null) {
85 - nbPeers = removeHTMLTags(nbPeers);
86 -- String nbPeersS = Entities.HTML40.unescape(nbPeers);
87 -+ String nbPeersS = StringEscapeUtils.unescapeHtml(nbPeers);
88 - nbPeersS = nbPeersS.replaceAll(",", "");
89 - nbPeersS = nbPeersS.replaceAll(" ", "");
90 - try {
91 -@@ -148,7 +148,7 @@ public class WebResult extends Result {
92 - public void setNbSeedsFromHTML(String nbSeeds) {
93 - if(nbSeeds != null) {
94 - nbSeeds = removeHTMLTags(nbSeeds);
95 -- String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
96 -+ String nbSeedsS = StringEscapeUtils.unescapeHtml(nbSeeds);
97 - nbSeedsS = nbSeedsS.replaceAll(",", "");
98 - nbSeedsS = nbSeedsS.replaceAll(" ", "");
99 - try {
100 -@@ -163,7 +163,7 @@ public class WebResult extends Result {
101 - public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
102 - if(nbSuperSeeds != null) {
103 - nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
104 -- String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
105 -+ String nbSuperSeedsS = StringEscapeUtils.unescapeHtml(nbSuperSeeds);
106 - nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
107 - nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
108 - try {
109 -@@ -230,7 +230,7 @@ public class WebResult extends Result {
110 - public void setPublishedDateFromHTML(String publishedDate) {
111 - if(publishedDate != null) {
112 - publishedDate = removeHTMLTags(publishedDate);
113 -- String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
114 -+ String publishedDateS = StringEscapeUtils.unescapeHtml(publishedDate).replace((char)160,(char)32);
115 - this.publishedDate = dateParser.parseDate(publishedDateS);
116 - }
117 - }
118 -@@ -239,7 +239,7 @@ public class WebResult extends Result {
119 - public void setSizeFromHTML(String size) {
120 - if(size != null) {
121 - size = removeHTMLTags(size);
122 -- String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
123 -+ String sizeS = StringEscapeUtils.unescapeHtml(size).replace((char)160,(char)32);
124 - sizeS = sizeS.replaceAll("<[^>]+>", " ");
125 - //Add a space between the digits and unit if there is none
126 - sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
127 -@@ -285,7 +285,7 @@ public class WebResult extends Result {
128 - public void setVotesFromHTML(String votes_str) {
129 - if(votes_str != null) {
130 - votes_str = removeHTMLTags(votes_str);
131 -- votes_str = Entities.HTML40.unescape(votes_str);
132 -+ votes_str = StringEscapeUtils.unescapeHtml(votes_str);
133 - votes_str = votes_str.replaceAll(",", "");
134 - votes_str = votes_str.replaceAll(" ", "");
135 - try {
136 -@@ -299,7 +299,7 @@ public class WebResult extends Result {
137 - public void setVotesDownFromHTML(String votes_str) {
138 - if(votes_str != null) {
139 - votes_str = removeHTMLTags(votes_str);
140 -- votes_str = Entities.HTML40.unescape(votes_str);
141 -+ votes_str = StringEscapeUtils.unescapeHtml(votes_str);
142 - votes_str = votes_str.replaceAll(",", "");
143 - votes_str = votes_str.replaceAll(" ", "");
144 - try {
145
146 diff --git a/net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch b/net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch
147 deleted file mode 100644
148 index ee3b07047ec..00000000000
149 --- a/net-p2p/vuze/files/vuze-5.6.0.0-invalid-characters.patch
150 +++ /dev/null
151 @@ -1,26 +0,0 @@
152 -diff --git a/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java b/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
153 -index 34e898c..2e5bcaa 100644
154 ---- a/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
155 -+++ b/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
156 -@@ -49,17 +49,17 @@ public class DateParserRegex extends DateParser {
157 -
158 - private static final String[] MONTHS_LIST = new String[] {
159 - " january janvier enero januar",
160 -- " february fevrier f�vrier febrero februar",
161 -- " march mars marzo marz marz m�rz" ,
162 -+ " february fevrier febrero februar",
163 -+ " march mars marzo marz marz",
164 - " april avril abril april ",
165 - " may mai mayo mai",
166 - " june juin junio juni",
167 - " july juillet julio juli",
168 -- " august aout ao�t agosto august",
169 -+ " august aout agosto august",
170 - " september septembre septiembre september",
171 - " october octobre octubre oktober",
172 - " november novembre noviembre november",
173 -- " december decembre d�cembre diciembre dezember"};
174 -+ " december decembre diciembre dezember"};
175 -
176 - public DateParserRegex() {
177 - this("GMT-7",true,null);
178
179 diff --git a/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild b/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
180 deleted file mode 100644
181 index fe78a487f71..00000000000
182 --- a/net-p2p/vuze/vuze-5.7.2.0-r1.ebuild
183 +++ /dev/null
184 @@ -1,144 +0,0 @@
185 -# Copyright 1999-2018 Gentoo Authors
186 -# Distributed under the terms of the GNU General Public License v2
187 -
188 -EAPI=6
189 -
190 -JAVA_PKG_IUSE="source"
191 -
192 -inherit eutils java-pkg-2 java-ant-2 versionator xdg-utils
193 -
194 -MY_PV=$(replace_all_version_separators "")
195 -MY_SRC="Vuze_${MY_PV}"
196 -
197 -DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
198 -HOMEPAGE="http://www.vuze.com/"
199 -SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
200 -LICENSE="GPL-2 BSD"
201 -
202 -SLOT="0"
203 -KEYWORDS="amd64 ppc64 x86"
204 -
205 -# bundles parts of http://www.programmers-friend.org/
206 -# bundles bcprov - 1.37 required but not in the tree
207 -CDEPEND="
208 - dev-java/log4j:0
209 - dev-java/swt:3.8[cairo]
210 - dev-java/commons-cli:1
211 - dev-java/json-simple:0
212 - dev-java/commons-lang:2.1"
213 -
214 -RDEPEND="
215 - ${CDEPEND}
216 - >=virtual/jre-1.6"
217 -
218 -DEPEND="
219 - ${CDEPEND}
220 - app-arch/unzip
221 - dev-util/desktop-file-utils
222 - >=virtual/jdk-1.6"
223 -
224 -PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
225 -
226 -src_unpack() {
227 - mkdir -p "${S}" || die
228 - cd "${S}" || die
229 - unpack ${A}
230 -
231 - # build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
232 - if [[ -f build.xml ]]; then
233 - die "upstream has build.xml again, don't overwrite"
234 - fi
235 - cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
236 -}
237 -
238 -src_prepare() {
239 - default
240 -
241 - # upstream likes randomly changing a subset of files to CRLF every release
242 - edos2unix $(find "${S}" -type f -name "*.java")
243 -
244 - epatch "${FILESDIR}"/${PN}-5.3.0.0-java5.patch
245 - epatch "${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
246 - epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
247 - epatch "${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch
248 - epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
249 - epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-commons.patch
250 - epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
251 - epatch "${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch
252 - epatch "${FILESDIR}"/${PN}-5.6.0.0-invalid-characters.patch
253 -# epatch "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
254 -
255 - # OSX / Windows
256 - rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java || die
257 - rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java || die
258 - rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
259 -
260 - # Tree2 file does not compile on linux
261 - rm -rf "${S}"/org/eclipse || die
262 - # Bundled apache
263 - rm -rf "${S}"/org/apache || die
264 - # Bundled json
265 - rm -rf "${S}"/org/json || die
266 - # Bundled bcprov
267 - # currently disabled - requires bcprov 1.37
268 - #rm -rf "${S}"/org/bouncycastle || die
269 -
270 - rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
271 - mkdir -p "${S}"/build/libs || die
272 -}
273 -
274 -JAVA_ANT_REWRITE_CLASSPATH="true"
275 -EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
276 -
277 -src_compile() {
278 - local mem
279 - use amd64 && mem="320"
280 - use x86 && mem="256"
281 - use ppc && mem="192"
282 - use ppc64 && mem="256"
283 - use sparc && mem="320"
284 - export ANT_OPTS="-Xmx${mem}m"
285 - java-pkg-2_src_compile
286 -
287 - # bug #302058 - build.xml excludes .txt but upstream jar has it...
288 - jar uf dist/Azureus2.jar ChangeLog.txt || die
289 -}
290 -
291 -src_install() {
292 - java-pkg_dojar dist/Azureus2.jar
293 - dodoc ChangeLog.txt
294 -
295 - java-pkg_dolauncher "${PN}" \
296 - --main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
297 - --java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
298 - --pkg_args '--ui=${UI}'
299 - dosym vuze /usr/bin/azureus
300 -
301 - # https://bugs.gentoo.org/show_bug.cgi?id=204132
302 - java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
303 -
304 - newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
305 - domenu "${FILESDIR}"/${PN}.desktop
306 -
307 - use source && java-pkg_dosrc "${S}"/{com,edu,org}
308 -}
309 -
310 -pkg_postinst() {
311 - ewarn "Running Vuze as root is not supported and may result in untracked"
312 - ewarn "updates to shared components and then collisions on updates"
313 - echo
314 - elog "Vuze was formerly called Azureus and many references to the old name remain."
315 - elog
316 - elog "After running Vuze for the first time, configuration options will be"
317 - elog "placed in '~/.azureus/gentoo.config'."
318 - elog
319 - elog "If you need to change some startup options, you should modify this file"
320 - elog "rather than the startup script. You can enable the console UI by"
321 - elog "editing this config file."
322 - echo
323 - xdg_desktop_database_update
324 -}
325 -
326 -pkg_postrm() {
327 - xdg_desktop_database_update
328 -}
Report Message
Find on MARC Find on Google Groups