Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/files/, net-p2p/vuze/
Date: Wed, 24 Jan 2018 22:38:33
Message-Id: 1516833495.ebbf781dc96a408c120d790a3a0a469f61bb34c1.chewi@gentoo
1 commit: ebbf781dc96a408c120d790a3a0a469f61bb34c1
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 24 22:31:01 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 24 22:38:15 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebbf781d
7
8 net-p2p/vuze: Drop old 5.6.0.0
9
10 Package-Manager: Portage-2.3.20, Repoman-2.3.6
11
12 net-p2p/vuze/Manifest | 1 -
13 net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch | 60 ---------
14 net-p2p/vuze/vuze-5.6.0.0.ebuild | 144 ----------------------
15 3 files changed, 205 deletions(-)
16
17 diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
18 index 0bd82660814..36aa6b09c44 100644
19 --- a/net-p2p/vuze/Manifest
20 +++ b/net-p2p/vuze/Manifest
21 @@ -1,4 +1,3 @@
22 DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a7305587d36ef863257b7b86e911f7012e73f532b3b4648000cfff5fa2fd2cd1848f0742791232ceee54f158a9c219 SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf
23 -DIST Vuze_5600_source.zip 10398501 BLAKE2B 3c6a1a8967bb3a603dfcb248cc5d5dd8aaf4a7efdfba9efa529fa98f0ad945574ffe574084d223fadb3710e6aa690d86dd8d67ea77febbe6a28b730f97ba313e SHA512 dfe557cb1f50be935c78ee4431bc14db5f0107eebab8545cf925de8b0d48bb91ca77f7feab54a5fd91aaaf50bd3c68c1519cf49c2eb4d145ff7794bf9f22cfd7
24 DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
25 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
26
27 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
28 deleted file mode 100644
29 index 070dae2d756..00000000000
30 --- a/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch
31 +++ /dev/null
32 @@ -1,60 +0,0 @@
33 ---- a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
34 -+++ b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
35 -@@ -229,57 +229,6 @@ public class SWTThread {
36 - }
37 - });
38 -
39 -- if (Constants.isOSX) {
40 --
41 -- // On Cocoa, we get a Close trigger on display. Need to check if all
42 -- // platforms send this.
43 -- display.addListener(SWT.Close, new Listener() {
44 -- public void handleEvent(Event event) {
45 -- event.doit = UIFunctionsManager.getUIFunctions().dispose(false, false);
46 -- }
47 -- });
48 --
49 -- String platform = SWT.getPlatform();
50 -- // use reflection here so we decouple generic SWT from OSX specific stuff to an extent
51 --
52 -- if (platform.equals("carbon")) {
53 -- try {
54 --
55 -- Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
56 --
57 -- Constructor<?> constructor = ehancerClass.getConstructor(new Class[] {});
58 --
59 -- constructor.newInstance(new Object[] {});
60 --
61 -- } catch (Throwable e) {
62 --
63 -- Debug.printStackTrace(e);
64 -- }
65 -- } else if (platform.equals("cocoa")) {
66 -- try {
67 --
68 -- Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CocoaUIEnhancer");
69 --
70 -- Method mGetInstance = ehancerClass.getMethod("getInstance", new Class[0]);
71 -- Object claObj = mGetInstance.invoke(null, new Object[0] );
72 --
73 -- Method mHookAppMenu = claObj.getClass().getMethod("hookApplicationMenu", new Class[] {});
74 -- if (mHookAppMenu != null) {
75 -- mHookAppMenu.invoke(claObj, new Object[0]);
76 -- }
77 --
78 -- Method mHookDocOpen = claObj.getClass().getMethod("hookDocumentOpen", new Class[] {});
79 -- if (mHookDocOpen != null) {
80 -- mHookDocOpen.invoke(claObj, new Object[0]);
81 -- }
82 --
83 -- } catch (Throwable e) {
84 --
85 -- Debug.printStackTrace(e);
86 -- }
87 -- }
88 -- }
89 --
90 - if (app != null) {
91 - app.runInSWTThread();
92 - runner = new Thread(new AERunnable() {
93
94 diff --git a/net-p2p/vuze/vuze-5.6.0.0.ebuild b/net-p2p/vuze/vuze-5.6.0.0.ebuild
95 deleted file mode 100644
96 index 561de94cf7a..00000000000
97 --- a/net-p2p/vuze/vuze-5.6.0.0.ebuild
98 +++ /dev/null
99 @@ -1,144 +0,0 @@
100 -# Copyright 1999-2016 Gentoo Foundation
101 -# Distributed under the terms of the GNU General Public License v2
102 -
103 -EAPI="5"
104 -
105 -JAVA_PKG_IUSE="source"
106 -
107 -inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
108 -
109 -MY_PV=$(replace_all_version_separators "")
110 -MY_SRC="Vuze_${MY_PV}"
111 -
112 -DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
113 -HOMEPAGE="http://www.vuze.com/"
114 -SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
115 -LICENSE="GPL-2 BSD"
116 -
117 -SLOT="0"
118 -KEYWORDS="~amd64 ~ppc64 ~x86"
119 -IUSE=""
120 -
121 -# bundles parts of http://www.programmers-friend.org/
122 -# bundles bcprov - 1.37 required but not in the tree
123 -RDEPEND="
124 - dev-java/commons-cli:1
125 - dev-java/commons-lang:2.1
126 - dev-java/json-simple:0
127 - dev-java/log4j:0
128 - dev-java/swt:3.8[cairo]
129 - >=virtual/jre-1.6:*"
130 -
131 -DEPEND="${RDEPEND}
132 - app-arch/unzip
133 - dev-util/desktop-file-utils
134 - >=virtual/jdk-1.6:*"
135 -
136 -PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
137 -
138 -pkg_pretend() {
139 - if ! has_version dev-java/swt:3.8[webkit]; then
140 - echo
141 - ewarn "dev-java/swt:3.8 was built without webkit support."
142 - ewarn "Web features such as Vuze HD Network will be disabled."
143 - fi
144 -}
145 -
146 -src_unpack() {
147 - mkdir -p "${S}" && cd "${S}"
148 - unpack ${A}
149 -
150 - # build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
151 - [[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
152 - cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
153 -}
154 -
155 -java_prepare() {
156 - # upstream likes randomly changing a subset of files to CRLF every release
157 - edos2unix $(find "${S}" -type f -name "*.java")
158 -
159 - epatch "${FILESDIR}"/${PN}-5.3.0.0-java5.patch
160 - epatch "${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
161 - epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
162 - epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-osx.patch
163 - epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
164 - epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-commons.patch
165 - epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
166 - epatch "${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch
167 - epatch "${FILESDIR}"/${PN}-5.6.0.0-invalid-characters.patch
168 -# epatch "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
169 -
170 - # OSX / Windows
171 - rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
172 - rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java
173 - rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
174 -
175 - # Tree2 file does not compile on linux
176 - rm -rf "${S}"/org/eclipse || die
177 - # Bundled apache
178 - rm -rf "${S}"/org/apache || die
179 - # Bundled json
180 - rm -rf "${S}"/org/json || die
181 - # Bundled bcprov
182 - # currently disabled - requires bcprov 1.37
183 - #rm -rf "${S}"/org/bouncycastle || die
184 -
185 - rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
186 - mkdir -p "${S}"/build/libs || die
187 -}
188 -
189 -JAVA_ANT_REWRITE_CLASSPATH="true"
190 -EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
191 -
192 -src_compile() {
193 - local mem
194 - use amd64 && mem="320"
195 - use x86 && mem="192"
196 - use ppc && mem="192"
197 - use ppc64 && mem="256"
198 - use sparc && mem="320"
199 - export ANT_OPTS="-Xmx${mem}m"
200 - java-pkg-2_src_compile
201 -
202 - # bug #302058 - build.xml excludes .txt but upstream jar has it...
203 - jar uf dist/Azureus2.jar ChangeLog.txt || die
204 -}
205 -
206 -src_install() {
207 - java-pkg_dojar dist/Azureus2.jar
208 - dodoc ChangeLog.txt
209 -
210 - java-pkg_dolauncher "${PN}" \
211 - --main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
212 - --java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
213 - --pkg_args '--ui=${UI}'
214 - dosym vuze /usr/bin/azureus
215 -
216 - # https://bugs.gentoo.org/show_bug.cgi?id=204132
217 - java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
218 -
219 - newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
220 - domenu "${FILESDIR}"/${PN}.desktop
221 -
222 - use source && java-pkg_dosrc "${S}"/{com,edu,org}
223 -}
224 -
225 -pkg_postinst() {
226 - ewarn "Running Vuze as root is not supported and may result in untracked"
227 - ewarn "updates to shared components and then collisions on updates"
228 - echo
229 - elog "Vuze was formerly called Azureus and many references to the old name remain."
230 - elog
231 - elog "After running Vuze for the first time, configuration options will be"
232 - elog "placed in '~/.azureus/gentoo.config'."
233 - elog
234 - elog "If you need to change some startup options, you should modify this file"
235 - elog "rather than the startup script. You can enable the console UI by"
236 - elog "editing this config file."
237 - echo
238 - fdo-mime_desktop_database_update
239 -}
240 -
241 -pkg_postrm() {
242 - fdo-mime_desktop_database_update
243 -}