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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C5DB13933E for ; Mon, 19 Jul 2021 09:55:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 557BEE0BC0; Mon, 19 Jul 2021 09:55:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C1F7E0B6F for ; Mon, 19 Jul 2021 09:55:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BA4A342B82 for ; Mon, 19 Jul 2021 09:55:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B0DF84C for ; Mon, 19 Jul 2021 09:55:21 +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: <1626682226.820c0379631ff7d17476d2080c1ee4687013f5c0.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sci-misc/boinc-wrapper/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild sci-misc/boinc-wrapper/metadata.xml X-VCS-Directories: sci-misc/boinc-wrapper/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 820c0379631ff7d17476d2080c1ee4687013f5c0 X-VCS-Branch: master Date: Mon, 19 Jul 2021 09:55:21 +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: 056230dd-8adf-4c95-8f40-6edf3421d1b6 X-Archives-Hash: 5970f52898cac0f34271753b708705be commit: 820c0379631ff7d17476d2080c1ee4687013f5c0 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Mon Jul 19 07:54:44 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Jul 19 08:10:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=820c0379 sci-misc/boinc-wrapper: various improvements Notable changes * writing config.h manually instead of calling ./configure * changed dependency operator from '>=' to '~' Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> .../boinc-wrapper/boinc-wrapper-7.16.16.ebuild | 47 ++++++++++++---------- .../boinc-wrapper/boinc-wrapper-7.16.17.ebuild | 45 ++++++++++++--------- sci-misc/boinc-wrapper/metadata.xml | 2 +- 3 files changed, 52 insertions(+), 42 deletions(-) diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild index becebc0ab..e282280fd 100644 --- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild +++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild @@ -1,50 +1,55 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools toolchain-funcs +inherit toolchain-funcs +MY_PN=${PN%%-*} MY_PV=$(ver_cut 1-2) - -DESCRIPTION="use non-BOINC apps with BOINC" +DESCRIPTION="Wrapper to use non-BOINC apps with BOINC" HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp" -SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> boinc-${PV}.tar.gz" -KEYWORDS="~amd64 ~x86" -S="${WORKDIR}/boinc-client_release-${MY_PV}-${PV}/samples/wrapper" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" +KEYWORDS="~amd64 ~arm64 ~x86" +S="${WORKDIR}/${MY_PN}-client_release-${MY_PV}-${PV}/samples/${PN#*-}" LICENSE="LGPL-3+ regexp-UofT" SLOT="0" +# sci-misc/boinc doesn't have all necessary headers, so +# we have to include from build root. All that said, +# versions must not mismatch. RDEPEND=" ~sci-misc/boinc-${PV} - ~dev-libs/boinc-zip-${PV} + >=dev-libs/boinc-zip-${PV} " DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch ) -DOCS=( ReadMe.txt job.xml ) - -src_prepare() { - default +DOCS=( job.xml ) +src_configure() { cd ../.. || die - eautoreconf + bash ./generate_svn_version.sh || die -} -src_configure() { - cd ../.. || die - econf --enable-pkg-devel --disable-static --disable-fcgi --without-x -} + # autotools would take an eternity to configure + cat <<-EOF > "config.h" + #ifndef BOINC_CONFIG_H + #define BOINC_CONFIG_H + + #define HAVE_SYS_RESOURCE_H 1 + #define HAVE_SYS_TIME_H 1 + #define HAVE_SYS_WAIT_H 1 + + #endif + EOF -src_compile() { tc-export CC CXX - default } src_install() { - default + einstalldocs newbin wrapper boinc-wrapper } diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild index f25f7d399..e282280fd 100644 --- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild +++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild @@ -3,48 +3,53 @@ EAPI=8 -inherit autotools toolchain-funcs +inherit toolchain-funcs +MY_PN=${PN%%-*} MY_PV=$(ver_cut 1-2) - -DESCRIPTION="use non-BOINC apps with BOINC" +DESCRIPTION="Wrapper to use non-BOINC apps with BOINC" HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp" -SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> boinc-${PV}.tar.gz" -KEYWORDS="~amd64 ~x86" -S="${WORKDIR}/boinc-client_release-${MY_PV}-${PV}/samples/wrapper" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" +KEYWORDS="~amd64 ~arm64 ~x86" +S="${WORKDIR}/${MY_PN}-client_release-${MY_PV}-${PV}/samples/${PN#*-}" LICENSE="LGPL-3+ regexp-UofT" SLOT="0" +# sci-misc/boinc doesn't have all necessary headers, so +# we have to include from build root. All that said, +# versions must not mismatch. RDEPEND=" - >=sci-misc/boinc-${PV} + ~sci-misc/boinc-${PV} >=dev-libs/boinc-zip-${PV} " DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch ) -DOCS=( ReadMe.txt job.xml ) - -src_prepare() { - default +DOCS=( job.xml ) +src_configure() { cd ../.. || die - eautoreconf + bash ./generate_svn_version.sh || die -} -src_configure() { - cd ../.. || die - econf --enable-pkg-devel --disable-static --disable-fcgi --without-x -} + # autotools would take an eternity to configure + cat <<-EOF > "config.h" + #ifndef BOINC_CONFIG_H + #define BOINC_CONFIG_H + + #define HAVE_SYS_RESOURCE_H 1 + #define HAVE_SYS_TIME_H 1 + #define HAVE_SYS_WAIT_H 1 + + #endif + EOF -src_compile() { tc-export CC CXX - default } src_install() { - default + einstalldocs newbin wrapper boinc-wrapper } diff --git a/sci-misc/boinc-wrapper/metadata.xml b/sci-misc/boinc-wrapper/metadata.xml index a07d56d79..ce271dd13 100644 --- a/sci-misc/boinc-wrapper/metadata.xml +++ b/sci-misc/boinc-wrapper/metadata.xml @@ -1,7 +1,7 @@ - + cyber+gentoo@sysrq.in Anna