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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 774BA15808D for ; Sat, 23 Apr 2022 10:24:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACD7AE08C8; Sat, 23 Apr 2022 10:24:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 0246CE081B for ; Sat, 23 Apr 2022 10:24:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 20F01341AB1 for ; Sat, 23 Apr 2022 10:24:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8391F3BF for ; Sat, 23 Apr 2022 10:24:26 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1650709373.b3330b9f798e149e23bb170febc6becba4e68b26.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/, sci-misc/boinc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-misc/boinc/boinc-7.18.1.ebuild sci-misc/boinc/boinc-9999.ebuild sci-misc/boinc/files/fix_webview.patch X-VCS-Directories: sci-misc/boinc/ sci-misc/boinc/files/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: b3330b9f798e149e23bb170febc6becba4e68b26 X-VCS-Branch: master Date: Sat, 23 Apr 2022 10:24:26 +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: 182d329d-f753-45ad-859d-db0fcc9443ca X-Archives-Hash: 821c5b3d0a659b824de6838383c8c96d commit: b3330b9f798e149e23bb170febc6becba4e68b26 Author: Matt Jolly footclan ninja> AuthorDate: Tue Apr 19 10:59:26 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sat Apr 23 10:22:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3330b9f sci-misc/boinc: update 9999 * Now matches 7.18 ebuild with changes for current master. Signed-off-by: Matt Jolly footclan.ninja> Signed-off-by: Florian Schmaus gentoo.org> sci-misc/boinc/boinc-7.18.1.ebuild | 1 - sci-misc/boinc/boinc-9999.ebuild | 26 ++++++++------------------ sci-misc/boinc/files/fix_webview.patch | 11 ----------- 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/sci-misc/boinc/boinc-7.18.1.ebuild b/sci-misc/boinc/boinc-7.18.1.ebuild index 88f456e68454..fd553c6cd6be 100644 --- a/sci-misc/boinc/boinc-7.18.1.ebuild +++ b/sci-misc/boinc/boinc-7.18.1.ebuild @@ -30,7 +30,6 @@ REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_openssl ) " # libcurl must not be using an ssl backend boinc does not support. # If the libcurl ssl backend changes, boinc should be recompiled. DEPEND=" - acct-group/boinc acct-user/boinc >=app-misc/ca-certificates-20080809 cuda? ( diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild index 897b7f6af916..a49065351f63 100644 --- a/sci-misc/boinc/boinc-9999.ebuild +++ b/sci-misc/boinc/boinc-9999.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -MY_PV=7.16 +# For live ebuilds this should be set to the latest available patch in ${FILESDIR} +# It does not need to reflect the actual internal version reported by BOINC unless that patch is broken. +MY_PV=7.18 WX_GTK_VER=3.0-gtk3 inherit autotools desktop flag-o-matic linux-info systemd wxwidgets xdg-utils @@ -29,8 +31,7 @@ REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_openssl ) " # libcurl must not be using an ssl backend boinc does not support. # If the libcurl ssl backend changes, boinc should be recompiled. -COMMON_DEPEND=" - acct-group/boinc +DEPEND=" acct-user/boinc >=app-misc/ca-certificates-20080809 cuda? ( @@ -54,13 +55,12 @@ COMMON_DEPEND=" virtual/jpeg ) " -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.4 +BDEPEND="app-text/docbook-xml-dtd:4.4 app-text/docbook2X sys-devel/gettext X? ( virtual/imagemagick-tools[png,tiff] ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !app-admin/quickswitch " @@ -93,22 +93,12 @@ pkg_setup() { } src_prepare() { - # bug #732024 - if test "x$(get_libdir)" = "xlib64"; then - sed -i -e 's,/:/lib:/usr/lib:,:/lib64:/usr/lib64:,g' m4/sah_check_lib.m4 || die - fi - default # prevent bad changes in compile flags, bug 286701 sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed" eautoreconf - - # bug #732024 - if test "x$(get_libdir)" = "xlib64"; then - sed -i -e 's,/lib\([ /;:"]\),/lib64\1,g' configure || die - fi } src_configure() { diff --git a/sci-misc/boinc/files/fix_webview.patch b/sci-misc/boinc/files/fix_webview.patch deleted file mode 100644 index 6c141eb7c829..000000000000 --- a/sci-misc/boinc/files/fix_webview.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac 2016-07-06 11:16:41.000000000 +0200 -+++ b/configure.ac 2016-07-06 11:45:51.088155620 +0200 -@@ -1250,7 +1250,7 @@ - CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -DNDEBUG" - fi - --CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS}" -+CLIENTGUILIBS="${WX_LIBS} $($WX_CONFIG_WITH_ARGS --libs webview) ${SQLITE3_LIBS}" - - if test "${enable_client_release}" = "yes" ; then - if test "x${WX_LIBS_STATIC}" = "x" ; then