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/biglybt/plugins/azupdater/, net-p2p/biglybt/
Date: Sun, 19 Mar 2023 06:38:20
Message-Id: 1679207489.819bc7c53e56d5c83e4a4484eb7c14a911439742.fordfrog@gentoo
1 commit: 819bc7c53e56d5c83e4a4484eb7c14a911439742
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Tue Jan 17 12:06:49 2023 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 19 06:31:29 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819bc7c5
7
8 net-p2p/biglybt: add 3.3.0.0, drop 3.2.0.0-r2
9
10 restricts to jdk:11
11 switches dependency swt:4.10 -> swt:4.26
12
13 Closes: https://bugs.gentoo.org/888859
14 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
15 Closes: https://github.com/gentoo/gentoo/pull/29142/commits/ddd2e81ca98f7e545354e657317b7ff5a1efe11b
16 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
17
18 net-p2p/biglybt/Manifest | 2 +-
19 ...ybt-3.2.0.0-r2.ebuild => biglybt-3.3.0.0.ebuild} | 20 +++++++-------------
20 net-p2p/biglybt/metadata.xml | 2 ++
21 net-p2p/biglybt/plugins/azupdater/Updater.jar | Bin 0 -> 23974 bytes
22 net-p2p/biglybt/plugins/azupdater/azupdater_2.1.zip | Bin 0 -> 27241 bytes
23 .../plugins/azupdater/azupdaterpatcher_2.0.jar | Bin 0 -> 2970 bytes
24 net-p2p/biglybt/plugins/azupdater/plugin.properties | 4 ++++
25 .../biglybt/plugins/azupdater/plugin.properties_2.1 | 3 +++
26 8 files changed, 17 insertions(+), 14 deletions(-)
27
28 diff --git a/net-p2p/biglybt/Manifest b/net-p2p/biglybt/Manifest
29 index c61bfad3b978..1ca6ef7e01e8 100644
30 --- a/net-p2p/biglybt/Manifest
31 +++ b/net-p2p/biglybt/Manifest
32 @@ -1 +1 @@
33 -DIST biglybt-3.2.0.0.tar.gz 34985099 BLAKE2B 385a6cf4f89b0922f06a2a5c7e89a4c9b717922f491717ade3cb13251c88e497cd2f807fa67ce3384bc3fcf3f37af368d20c2bb8984eff9d4237519d2be0f89d SHA512 0a39243271153758482ac3eaef50e4a83464cf67779b531fb29d7289fa49f2ec7dbe5c1c9de1d6b3bed555a6c581c4e95563e333aad4a9e32cf158db1325fef0
34 +DIST biglybt-3.3.0.0.tar.gz 39452405 BLAKE2B 40a11d9b9d085457cfcfe2c62d30b77a971169f879e55ec5f75b049a0d9639d750cbc8d6a64912ab9beb6fc3c0a4065303f3f64ad48247a55e05089d8fb1d6b3 SHA512 29533b1c135018a4d487afa3b88e92674033b55ed2369c58c7721d7b0b74dcb141fc4e45a683eb9d4123879db94d3c9bbaca41e74a438562a383923eb4f889de
35
36 diff --git a/net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild b/net-p2p/biglybt/biglybt-3.3.0.0.ebuild
37 similarity index 85%
38 rename from net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild
39 rename to net-p2p/biglybt/biglybt-3.3.0.0.ebuild
40 index 8847795e7c12..0729bc588663 100644
41 --- a/net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild
42 +++ b/net-p2p/biglybt/biglybt-3.3.0.0.ebuild
43 @@ -1,13 +1,10 @@
44 # Copyright 1999-2023 Gentoo Authors
45 # Distributed under the terms of the GNU General Public License v2
46
47 -# Skeleton command:
48 -# java-ebuilder --generate-ebuild --workdir . --pom core/pom.xml --download-uri https://github.com/BiglySoftware/BiglyBT/archive/v3.2.0.0.tar.gz --slot 0 --keywords "~amd64" --ebuild biglybt-3.2.0.0.ebuild
49 -
50 EAPI=8
51
52 JAVA_PKG_IUSE="doc source"
53 -MAVEN_ID="com.biglybt:biglybt-core:3.1.0.1"
54 +MAVEN_ID="com.biglybt:biglybt-core:3.3.0.0"
55
56 inherit java-pkg-2 java-pkg-simple
57
58 @@ -25,7 +22,7 @@ KEYWORDS="~amd64 ~ppc64"
59
60 CP_DEPEND="
61 dev-java/commons-cli:1
62 - dev-java/swt:4.10
63 + dev-java/swt:4.27
64 "
65
66 # Compile dependencies
67 @@ -38,8 +35,9 @@ CP_DEPEND="
68 # Due to removal of AENameServiceDescriptor it would fail to start under jdk:1.8
69 # StartServer ERROR: unable to bind to 127.0.0.1:6880 listening for passed torrent info: \
70 # sun.net.spi.nameservice.NameServiceDescriptor: Provider com.biglybt.core.util.spi.AENameServiceDescriptor not found
71 +# Restricting to jdk:11 for https://bugs.gentoo.org/888859
72 DEPEND="
73 - >=virtual/jdk-11:*
74 + virtual/jdk:11
75 ${CP_DEPEND}
76 "
77
78 @@ -54,6 +52,7 @@ DOCS=(
79 ChangeLog.txt
80 README.md
81 TRANSLATE.md
82 + issue_template.md
83 )
84
85 PATCHES=(
86 @@ -66,6 +65,7 @@ S="${WORKDIR}/BiglyBT-${PV}"
87
88 src_prepare() {
89 default
90 + java-pkg-2_src_prepare
91 # AENameServiceDescriptor fails to compile with jdk >= 11
92 # https://github.com/BiglySoftware/BiglyBT/pull/2611
93 # "error: package sun.net.spi.nameservice does not exist"
94 @@ -111,13 +111,7 @@ src_compile() {
95 }
96
97 src_install() {
98 - java-pkg_dojar "biglybt-core.jar"
99 - java-pkg_dojar "BiglyBT.jar"
100 - java-pkg_dolauncher "biglybt" --main com.biglybt.ui.Main
101 -
102 - if use doc; then
103 - java-pkg_dojavadoc target/api
104 - fi
105 + java-pkg-simple_src_install
106
107 if use source; then
108 java-pkg_dosrc "core/src/*"
109
110 diff --git a/net-p2p/biglybt/metadata.xml b/net-p2p/biglybt/metadata.xml
111 index 05d9678fe88c..a660313d0473 100644
112 --- a/net-p2p/biglybt/metadata.xml
113 +++ b/net-p2p/biglybt/metadata.xml
114 @@ -5,6 +5,8 @@
115 <email>java@g.o</email>
116 </maintainer>
117 <upstream>
118 + <bugs-to>https://github.com/BiglySoftware/BiglyBT/issues</bugs-to>
119 + <doc>https://github.com/BiglySoftware/BiglyBT/wiki</doc>
120 <remote-id type="github">BiglySoftware/BiglyBT</remote-id>
121 </upstream>
122 </pkgmetadata>
123
124 diff --git a/net-p2p/biglybt/plugins/azupdater/Updater.jar b/net-p2p/biglybt/plugins/azupdater/Updater.jar
125 new file mode 100644
126 index 000000000000..a9ea8471c077
127 Binary files /dev/null and b/net-p2p/biglybt/plugins/azupdater/Updater.jar differ
128
129 diff --git a/net-p2p/biglybt/plugins/azupdater/azupdater_2.1.zip b/net-p2p/biglybt/plugins/azupdater/azupdater_2.1.zip
130 new file mode 100644
131 index 000000000000..4fb02bc0dedb
132 Binary files /dev/null and b/net-p2p/biglybt/plugins/azupdater/azupdater_2.1.zip differ
133
134 diff --git a/net-p2p/biglybt/plugins/azupdater/azupdaterpatcher_2.0.jar b/net-p2p/biglybt/plugins/azupdater/azupdaterpatcher_2.0.jar
135 new file mode 100644
136 index 000000000000..601624350f93
137 Binary files /dev/null and b/net-p2p/biglybt/plugins/azupdater/azupdaterpatcher_2.0.jar differ
138
139 diff --git a/net-p2p/biglybt/plugins/azupdater/plugin.properties b/net-p2p/biglybt/plugins/azupdater/plugin.properties
140 new file mode 100644
141 index 000000000000..5243168ce751
142 --- /dev/null
143 +++ b/net-p2p/biglybt/plugins/azupdater/plugin.properties
144 @@ -0,0 +1,4 @@
145 +plugin.version=2.1
146 +plugin.class=com.biglybt.update.UpdaterUpdateChecker;com.biglybt.update.UpdaterPatcher
147 +plugin.name=BiglyBT Update Support;BiglyBT Updater Support Patcher
148 +plugin.install_if_missing=yes
149
150 diff --git a/net-p2p/biglybt/plugins/azupdater/plugin.properties_2.1 b/net-p2p/biglybt/plugins/azupdater/plugin.properties_2.1
151 new file mode 100644
152 index 000000000000..9eb95f0168de
153 --- /dev/null
154 +++ b/net-p2p/biglybt/plugins/azupdater/plugin.properties_2.1
155 @@ -0,0 +1,3 @@
156 +plugin.class=com.biglybt.update.UpdaterUpdateChecker;com.biglybt.update.UpdaterPatcher
157 +plugin.name=BiglyBT Update Support;BiglyBT Updater Support Patcher
158 +plugin.version=2.1