From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF195158083 for ; Thu, 12 Sep 2024 05:17:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EECF8E29CD; Thu, 12 Sep 2024 05:17:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D51B5E29CD for ; Thu, 12 Sep 2024 05:17:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B58E33FD3F for ; Thu, 12 Sep 2024 05:17:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DE2E14D0 for ; Thu, 12 Sep 2024 05:17:38 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1726118256.f1c399d9d33e4c84ffb88cfe59b5268a43d93382.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/biglybt/, net-p2p/biglybt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch X-VCS-Directories: net-p2p/biglybt/files/ net-p2p/biglybt/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: f1c399d9d33e4c84ffb88cfe59b5268a43d93382 X-VCS-Branch: master Date: Thu, 12 Sep 2024 05:17:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 00e726df-12fa-4b1b-be8f-5108277922d7 X-Archives-Hash: 901b25b56ec887af2435c8f2d2ea26ba commit: f1c399d9d33e4c84ffb88cfe59b5268a43d93382 Author: Miroslav Šulc gentoo org> AuthorDate: Thu Sep 12 05:17:26 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Sep 12 05:17:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c399d9 net-p2p/biglybt: fixed ambiguous call with commons-cli >= 1.7.0 Signed-off-by: Miroslav Šulc gentoo.org> .../{biglybt-3.6.0.0-r2.ebuild => biglybt-3.6.0.0-r3.ebuild} | 1 + net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild b/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild similarity index 98% rename from net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild rename to net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild index 3bd27ae401f8..05df130f4bb3 100644 --- a/net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild +++ b/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild @@ -48,6 +48,7 @@ PATCHES=( "${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch" "${FILESDIR}/biglybt-3.5.0.0-Entities.javadoc.patch" "${FILESDIR}/biglybt-3.6.0.0-disable-PluginUpdatePlugin.patch" + "${FILESDIR}/biglybt-3.6.0.0-fix-ambiguous.patch" ) src_prepare() { diff --git a/net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch b/net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch new file mode 100644 index 000000000000..8464f866570a --- /dev/null +++ b/net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch @@ -0,0 +1,11 @@ +--- a/uis/src/com/biglybt/ui/console/multiuser/commands/UserCommand.java ++++ b/uis/src/com/biglybt/ui/console/multiuser/commands/UserCommand.java +@@ -187,7 +187,7 @@ public class UserCommand extends IConsoleCommand { + + UserProfile profile = new UserProfile(userName, userType); + profile.setPassword(password); +- String defaultSaveDirectory = commandLine.getOptionValue('d', null); ++ String defaultSaveDirectory = commandLine.getOptionValue('d', (String) null); + profile.setDefaultSaveDirectory(defaultSaveDirectory); + + getUserManager().addUser(profile);