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 972AD158094 for ; Mon, 11 Jul 2022 06:54:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C74BE0B4A; Mon, 11 Jul 2022 06:54:51 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0426CE0B48 for ; Mon, 11 Jul 2022 06:54:51 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6CB93410C2 for ; Mon, 11 Jul 2022 06:54:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40DF6542 for ; Mon, 11 Jul 2022 06:54:47 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1657424167.88cc11da55f9224341be015595d62397bc535b4d.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: eclass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: eclass/boinc-app.eclass X-VCS-Directories: eclass/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 88cc11da55f9224341be015595d62397bc535b4d X-VCS-Branch: master Date: Mon, 11 Jul 2022 06:54:47 +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: b5641a1d-6989-47e1-a7fc-2b79bfd87977 X-Archives-Hash: 2629b070dad1bc68df0c0f2e5479443b commit: 88cc11da55f9224341be015595d62397bc535b4d Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Jul 10 03:36:07 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Jul 10 03:36:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=88cc11da boinc-app.eclass: add acct-user deps Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> eclass/boinc-app.eclass | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/eclass/boinc-app.eclass b/eclass/boinc-app.eclass index 2b6fc5e40..540fc8ea0 100644 --- a/eclass/boinc-app.eclass +++ b/eclass/boinc-app.eclass @@ -5,7 +5,7 @@ # @MAINTAINER: # Anna Vyalkova # @SUPPORTED_EAPIS: 8 -# @BLURB: Eclass that provides base functions for installing BOINC applications. +# @BLURB: base functions for installing BOINC applications # @DESCRIPTION: # This eclass provides base functions for installation of software developed # for the BOINC platform. @@ -77,7 +77,7 @@ in order to use this application with BOINC.} # Generate appropriate (R)DEPEND for wrapper-enabled or # native application. boinc-app_add_deps() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" if [[ $1 == "--wrapper" ]]; then RDEPEND="sci-misc/boinc-wrapper" @@ -85,6 +85,9 @@ boinc-app_add_deps() { DEPEND="sci-misc/boinc" RDEPEND="sci-misc/boinc" fi + + DEPEND="${DEPEND} acct-user/boinc" + RDEPEND="${RDEPEND} acct-user/boinc" } # @FUNCTION: boinc_master_url_check @@ -92,9 +95,9 @@ boinc-app_add_deps() { # @DESCRIPTION: # Make sure BOINC_MASTER_URL has a value. boinc_master_url_check() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" - [[ ! ${BOINC_MASTER_URL} ]] && \ + [[ -n ${BOINC_MASTER_URL} ]] || \ die "BOINC_MASTER_URL is not set" return 0 } @@ -103,7 +106,7 @@ boinc_master_url_check() { # @USAGE: # @RETURN: non-prefixed default BOINC runtime directory get_boincdir() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" echo /var/lib/boinc } @@ -121,7 +124,7 @@ get_boincdir() { # -> boinc.berkeley.edu_example # @CODE get_project_dirname() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" boinc_master_url_check @@ -137,7 +140,7 @@ get_project_dirname() { # @USAGE: # @RETURN: non-prefixed directory where applications and files should be installed get_project_root() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" echo "$(get_boincdir)/projects/$(get_project_dirname)" } @@ -163,7 +166,7 @@ _boinc-app_fix_permissions() { # The default appinfo_prepare(). It replaces all occurences # of @PV@ with its corresponding value. boinc-app_appinfo_prepare() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" sed -i "$1" \ -e "s:@PV@:${PV}:g" \ @@ -196,7 +199,7 @@ boinc-app_appinfo_prepare() { # } # @CODE doappinfo() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" (( $# == 1 )) || \ die "${FUNCNAME} takes exactly one argument" @@ -224,7 +227,7 @@ doappinfo() { # The default foreach_wrapper_job(). It replaces all occurences # of @PV@, @EPREFIX@ and @LIBDIR@ strings with their corresponding values. boinc-wrapper_foreach_wrapper_job() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" sed -i "$1" \ -e "s:@PV@:${PV}:g" \ @@ -260,7 +263,7 @@ boinc-wrapper_foreach_wrapper_job() { # # Keep your job.xml files in sync with app_info.xml! dowrapper() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" for app in "$@"; do local wrapperjob="${app}_job_${PV}.xml" @@ -293,7 +296,7 @@ dowrapper() { # Display helpful instructions on how to make the BOINC client use installed # applications. boinc-app_pkg_postinst() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" if [[ -f "${EROOT}/$(get_boincdir)/master_$(get_project_dirname).xml" ]]; then if [[ -z ${REPLACING_VERSIONS} ]]; then @@ -328,7 +331,7 @@ boinc-app_pkg_postinst() { # Display helpful instructions on how to cleanly uninstall unmerged # applications. boinc-app_pkg_postrm() { - debug-print-function ${FUNCNAME} "${@}"] + debug-print-function ${FUNCNAME} "${@}" if [[ -z ${REPLACED_BY_VERSION} ]]; then local gui_rpc_auth="$(get_boincdir)/gui_rpc_auth.cfg"