commit: b3330b9f798e149e23bb170febc6becba4e68b26
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Tue Apr 19 10:59:26 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> 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 <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Florian Schmaus <flow <AT> 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
