public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/, sci-misc/boinc/files/
@ 2017-08-19 19:01 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2017-08-19 19:01 UTC (permalink / raw
  To: gentoo-commits

commit:     42e99588ad3b1c7822cf9f150d4af33eb9c73517
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Sat Aug 19 15:39:18 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 19:01:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e99588

sci-misc/boinc: Fix typos in init script

This commit fixes Gentoo Bug #626958
  "sci-misc/boinc-7.6.33-r5 typos in /etc/init.d/boinc"

In five places the eerror function was spelled "eeror", which is
obviously wrong. This commit fixes that.

As the init script isn't correctly working in all error cases without
these fixes, the ebuilds got revision bumped to forece the
installation of the fixed version.

Bug: https://bugs.gentoo.org/show_bug.cgi?id=626958
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../boinc/{boinc-7.2.44-r5.ebuild => boinc-7.2.44-r6.ebuild}   |  0
 .../boinc/{boinc-7.4.52-r5.ebuild => boinc-7.4.52-r6.ebuild}   |  0
 .../boinc/{boinc-7.6.33-r5.ebuild => boinc-7.6.33-r6.ebuild}   |  0
 sci-misc/boinc/files/boinc.init.in                             | 10 +++++-----
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-misc/boinc/boinc-7.2.44-r5.ebuild b/sci-misc/boinc/boinc-7.2.44-r6.ebuild
similarity index 100%
rename from sci-misc/boinc/boinc-7.2.44-r5.ebuild
rename to sci-misc/boinc/boinc-7.2.44-r6.ebuild

diff --git a/sci-misc/boinc/boinc-7.4.52-r5.ebuild b/sci-misc/boinc/boinc-7.4.52-r6.ebuild
similarity index 100%
rename from sci-misc/boinc/boinc-7.4.52-r5.ebuild
rename to sci-misc/boinc/boinc-7.4.52-r6.ebuild

diff --git a/sci-misc/boinc/boinc-7.6.33-r5.ebuild b/sci-misc/boinc/boinc-7.6.33-r6.ebuild
similarity index 100%
rename from sci-misc/boinc/boinc-7.6.33-r5.ebuild
rename to sci-misc/boinc/boinc-7.6.33-r6.ebuild

diff --git a/sci-misc/boinc/files/boinc.init.in b/sci-misc/boinc/files/boinc.init.in
index a5ea8dd13bb..b46a06e3d38 100644
--- a/sci-misc/boinc/files/boinc.init.in
+++ b/sci-misc/boinc/files/boinc.init.in
@@ -15,13 +15,13 @@ create_work_directory() {
 	if [ ! -d "${RUNTIMEDIR}" ]; then
 		einfo "Directory ${RUNTIMEDIR} does not exist, creating now."
 		if ! mkdir -p "${RUNTIMEDIR}"; then
-			eeror "Directory ${RUNTIMEDIR} could not be created!"
+			eerror "Directory ${RUNTIMEDIR} could not be created!"
 			return 1
 		fi
 
 		# ensure proper ownership
 		if ! chown "${USER}:${GROUP}" "${RUNTIMEDIR}"; then
-			eeror "Changing ownership of '${RUNTIMEDIR}' to '${USER}:${GROUP}' failed!"
+			eerror "Changing ownership of '${RUNTIMEDIR}' to '${USER}:${GROUP}' failed!"
 			return 1
 		fi
 	fi
@@ -33,7 +33,7 @@ create_work_directory() {
 		fi
 
 		if ! ln -s "${sslcrt}" "${RUNTIMEDIR}"/ca-bundle.crt; then
-			eeror "Symlinking '${sslcrt}' failed!"
+			eerror "Symlinking '${sslcrt}' failed!"
 			return 1
 		fi
 	fi
@@ -58,14 +58,14 @@ fix_lib_symlinks() {
 
 		# Remove broken symlink
 		if ! rm -f "${tgt}"; then
-			eeror "Removing '${tgt}' failed!"
+			eerror "Removing '${tgt}' failed!"
 			return 1
 		fi
 	fi
 
 	# symlink the correct path
 	if ! ln -snf "${src}" "${tgt}"; then
-		eeror "Symlinking '${src}' to '${tgt}' failed!"
+		eerror "Symlinking '${src}' to '${tgt}' failed!"
 		return 1
 	fi
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/, sci-misc/boinc/files/
@ 2018-04-24 21:57 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-04-24 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     124fd3da717a11809d37a151e954c3aac8c7d829
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Wed Mar 21 11:39:26 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 21:56:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124fd3da

sci-misc/boinc: 7.8.6 version bump

Besides the version bump the xlocale patch has been renamed to
include the client release series. This has been done to counter
future changes which might make the current patch to fail.

Further the ebuild got cleaned up. The static-libs USE flag has been removed,
it was not used anywhere.

Tested-by: Sven Eden <yamakuzure <AT> gmx.net>
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7531

 sci-misc/boinc/Manifest                            |  1 +
 .../{boinc-7.8.4.ebuild => boinc-7.8.4-r1.ebuild}  |  2 +-
 .../{boinc-7.8.4.ebuild => boinc-7.8.6.ebuild}     | 29 +++++++++++-----------
 .../{fix_xlocale.patch => 7.8-fix_xlocale.patch}   |  0
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 669f224b49a..cedc7247b7f 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,2 +1,3 @@
 DIST boinc-7.8.4.tar.gz 52035132 BLAKE2B 4234bd6f3ad3bbb4d7d518e45c16b8843de35f37d2cfd40ff149d85d14cb6d6bed2cbd682ba1d16099c1261eb000f8bb2e4f637b47d12e84e43266b4de076ed0 SHA512 d888f6c1586b57cdad7c4c783b2e58ae3bc3da8d0183eaacfe43f9798519e65129324222e6190a8ee1f00be2dfd31ee54fe2a88ef77950506e29552ce32de8aa
+DIST boinc-7.8.6.tar.gz 52037690 BLAKE2B 21d356488d8ea7e665f1b47e8ef0a0055d8b1a11e6e2aeea0b0ee7839fc7c0498b97ff9bc0183cd7391b5c86590ffc8234d823a743688a833ffcbe83797fd679 SHA512 e565fff30bc7214ae48548ae726544be3c8b09455a8c78a9e30410fd6cffe3b04b2e5c7f54381fa4190aa8adb259243b7d6443b6760c038ed8347edfed1ba997
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046

diff --git a/sci-misc/boinc/boinc-7.8.4.ebuild b/sci-misc/boinc/boinc-7.8.4-r1.ebuild
similarity index 99%
copy from sci-misc/boinc/boinc-7.8.4.ebuild
copy to sci-misc/boinc/boinc-7.8.4-r1.ebuild
index b1ddba69aff..066eded5748 100644
--- a/sci-misc/boinc/boinc-7.8.4.ebuild
+++ b/sci-misc/boinc/boinc-7.8.4-r1.ebuild
@@ -56,7 +56,7 @@ PATCHES=(
 	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
 	"${FILESDIR}"/fix_webview.patch
 	# xlocale.h was removed in modern glibc, bug 639108
-	"${FILESDIR}"/fix_xlocale.patch
+	"${FILESDIR}"/${MY_PV}-fix_xlocale.patch
 )
 
 S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"

diff --git a/sci-misc/boinc/boinc-7.8.4.ebuild b/sci-misc/boinc/boinc-7.8.6.ebuild
similarity index 94%
rename from sci-misc/boinc/boinc-7.8.4.ebuild
rename to sci-misc/boinc/boinc-7.8.6.ebuild
index b1ddba69aff..79674f89662 100644
--- a/sci-misc/boinc/boinc-7.8.4.ebuild
+++ b/sci-misc/boinc/boinc-7.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,51 +12,51 @@ MY_PV=$(get_version_component_range 1-2)
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
 SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz
-	X? ( http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
+	X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
 RESTRICT="mirror"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl static-libs"
+IUSE="X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl"
 
 REQUIRED_USE="^^ ( curl_ssl_gnutls curl_ssl_libressl 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.
-RDEPEND="
-	!sci-misc/boinc-bin
-	!app-admin/quickswitch
+COMMON_DEPEND="
 	>=app-misc/ca-certificates-20080809
-	net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-	sys-apps/util-linux
-	sys-libs/zlib
 	cuda? (
 		>=dev-util/nvidia-cuda-toolkit-2.1
 		>=x11-drivers/nvidia-drivers-180.22
 	)
+	net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+	sys-apps/util-linux
+	sys-libs/zlib
 	X? (
+		>=x11-libs/libnotify-0.7
 		dev-db/sqlite:3
 		media-libs/freeglut
-		sys-libs/glibc:2.2
 		virtual/jpeg:0=
 		x11-libs/gtk+:3
-		>=x11-libs/libnotify-0.7
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
 	)
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.4
 	app-text/docbook2X
+	sys-devel/gettext
 	X? ( virtual/imagemagick-tools[png,tiff] )
 "
+RDEPEND="${COMMON_DEPEND}
+	!app-admin/quickswitch
+"
 
 PATCHES=(
 	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
 	"${FILESDIR}"/fix_webview.patch
 	# xlocale.h was removed in modern glibc, bug 639108
-	"${FILESDIR}"/fix_xlocale.patch
+	"${FILESDIR}"/${MY_PV}-fix_xlocale.patch
 )
 
 S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
@@ -128,6 +128,7 @@ src_install() {
 
 	# cleanup cruft
 	rm -rf "${ED%/}"/etc || die "rm failed"
+	find "${D}" -name '*.la' -delete || die "Removing .la files failed"
 
 	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
 	newinitd ${PN}.init ${PN}

diff --git a/sci-misc/boinc/files/fix_xlocale.patch b/sci-misc/boinc/files/7.8-fix_xlocale.patch
similarity index 100%
rename from sci-misc/boinc/files/fix_xlocale.patch
rename to sci-misc/boinc/files/7.8-fix_xlocale.patch


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/, sci-misc/boinc/files/
@ 2022-04-23 10:24 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2022-04-23 10:24 UTC (permalink / raw
  To: gentoo-commits

commit:     f1880e6e442b143855549405b0a4745a983fed38
Author:     Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Sun Apr 17 12:46:31 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 10:22:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1880e6e

sci-misc/boinc: add 7.18.1

Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sci-misc/boinc/Manifest                           |   1 +
 sci-misc/boinc/boinc-7.18.1.ebuild                | 207 ++++++++++++++++++++++
 sci-misc/boinc/files/boinc-7.18-fix_webview.patch |  13 ++
 3 files changed, 221 insertions(+)

diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index a8af88e0f15c..02edd84d7b4e 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,2 +1,3 @@
 DIST boinc-7.16.17.tar.gz 49628624 BLAKE2B 87e266a29506ecaa41fd18a2521b08c291548a4e31f7748001e5214e6f1fada1ded8bb8b559635d4f9c7c256cd7829dcf9132c02448c559d5ceb13524ca42e0f SHA512 e9882f37ad5c83ed020155c8192228322932f83b88ed00d025dcda63bff2dca109ecdcbaf98b48c4522b841f545f32352e5c158ae0a41de0a1f2941ac8135221
+DIST boinc-7.18.1.tar.gz 50851883 BLAKE2B 64d321c8c56d7c34a08646dc16de5ddbb9b8e4be57b673fa77515845d967e28b5cf1fda677293e2fc8cf36a18ac0b7e7feebfbd8e434ebed41b8280c7395950d SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046

diff --git a/sci-misc/boinc/boinc-7.18.1.ebuild b/sci-misc/boinc/boinc-7.18.1.ebuild
new file mode 100644
index 000000000000..44f5b5d810ad
--- /dev/null
+++ b/sci-misc/boinc/boinc-7.18.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_cut 1-2)
+WX_GTK_VER=3.0-gtk3
+
+inherit autotools desktop flag-o-matic linux-info systemd wxwidgets xdg-utils
+
+DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
+HOMEPAGE="https://boinc.ssl.berkeley.edu/"
+
+SRC_URI="X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/BOINC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI+=" https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="X cuda curl_ssl_gnutls +curl_ssl_openssl"
+
+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? (
+		>=dev-util/nvidia-cuda-toolkit-2.1
+		>=x11-drivers/nvidia-drivers-180.22
+	)
+	net-misc/curl[curl_ssl_gnutls(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+	sys-apps/util-linux
+	sys-libs/zlib
+	X? (
+		dev-db/sqlite:3
+		media-libs/freeglut
+		virtual/jpeg:0=
+		x11-libs/gtk+:3
+		x11-libs/libICE
+		>=x11-libs/libnotify-0.7
+		x11-libs/libSM
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
+		virtual/jpeg
+	)
+"
+BDEPEND="app-text/docbook-xml-dtd:4.4
+	app-text/docbook2X
+	sys-devel/gettext
+	X? ( virtual/imagemagick-tools[png,tiff] )
+"
+RDEPEND="${DEPEND}
+	!app-admin/quickswitch
+"
+
+PATCHES=(
+	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
+	"${FILESDIR}"/${PN}-${MY_PV}-fix_webview.patch
+)
+
+pkg_setup() {
+	# Bug 578750
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might be missing vsyscall support."
+		elif kernel_is -ge 4 4 \
+			&& linux_chkconfig_present LEGACY_VSYSCALL_NONE; then
+			ewarn "You do not have vsyscall emulation enabled."
+			ewarn "This will prevent some boinc projects from running."
+			ewarn "Please enable vsyscall emulation:"
+			ewarn "    CONFIG_LEGACY_VSYSCALL_EMULATE=y"
+			ewarn "in /usr/src/linux/.config, to be found at"
+			ewarn "    Processor type and features --->"
+			ewarn "        vsyscall table for legacy applications (None) --->"
+			ewarn "            (X) Emulate"
+			ewarn "Alternatively, you can enable CONFIG_LEGACY_VSYSCALL_NATIVE."
+			ewarn "However, this has security implications and is not recommended."
+		fi
+	fi
+}
+
+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() {
+	use X && setup-wxwidgets
+
+	append-libs -L"${ESYSROOT}"/usr/$(get_libdir) -L"${ESYSROOT}"/$(get_libdir)
+
+	econf --disable-server \
+		--enable-client \
+		--enable-dynamic-client-linkage \
+		--disable-static \
+		--enable-unicode \
+		--with-ssl \
+		$(use_with X x) \
+		$(use_enable X manager) \
+		$(usex X --with-wx-config="${WX_CONFIG}" --without-wxdir)
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/${PN}
+
+	if use X; then
+		# Create new icons. bug 593362
+		local s SIZES=(16 22 24 32 36 48 64 72 96 128 192 256)
+		for s in "${SIZES[@]}"; do
+			# The convert command is not checked, because it will issue warnings and exit with
+			# an error code if imagemagick is used and was merged with USE="-xml", although the
+			# conversion has worked. See #766093
+			# Instead, newicon will fail if the conversion did not produce the icon.
+			convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png
+			newicon -s $s "${WORKDIR}"/boinc_${s}.png boinc.png
+		done
+		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
+
+		# Rename the desktop file to boincmgr.desktop to (hot)fix bug 599910
+		mv "${ED}"/usr/share/applications/boincmgr{-${PN},}.desktop || \
+			die "Failed to rename desktop file"
+	fi
+
+	# cleanup cruft
+	rm -r "${ED}"/etc || die "rm failed"
+	find "${D}" -name '*.la' -delete || die "Removing .la files failed"
+
+	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
+	newinitd ${PN}.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+	if use X; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update
+	fi
+
+	elog
+	elog "You are using the source compiled version of boinc."
+	use X && elog "The graphical manager can be found at /usr/bin/boincmgr"
+	elog
+	elog "You need to attach to a project to do anything useful with boinc."
+	elog "You can do this by running /etc/init.d/boinc attach"
+	elog "The howto for configuration is located at:"
+	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
+	elog
+	# Add warning about the new password for the client, bug 121896.
+	if use X; then
+		elog "If you need to use the graphical manager the password is in:"
+		elog "/var/lib/boinc/gui_rpc_auth.cfg"
+		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
+		elog "/etc/conf.d/boinc"
+		elog "You should change this password to something more memorable (can be even blank)."
+		elog "Remember to launch init script before using manager. Or changing the password."
+		elog
+	fi
+	elog "To be able to use CUDA or OpenCL you should add the boinc user to the video group."
+	elog "Run as root:"
+	elog "gpasswd -a boinc video"
+	elog
+	# Add information about BOINC supporting OpenCL
+	elog "BOINC supports OpenCL. To use it you have to eselect"
+	if use cuda; then
+		elog "nvidia as the OpenCL implementation, as you are using CUDA."
+	else
+		elog "the correct OpenCL implementation for your graphic card."
+	fi
+	elog
+}
+
+pkg_postrm() {
+	if use X; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update
+	fi
+}

diff --git a/sci-misc/boinc/files/boinc-7.18-fix_webview.patch b/sci-misc/boinc/files/boinc-7.18-fix_webview.patch
new file mode 100644
index 000000000000..0b1f82e1f628
--- /dev/null
+++ b/sci-misc/boinc/files/boinc-7.18-fix_webview.patch
@@ -0,0 +1,13 @@
+This patch is an update to the existing fix_webview.patch for 7.18
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1262,7 +1262,7 @@ else
+     CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -DNDEBUG"
+ fi
+ 
+-CLIENTGUILIBS="${WX_LIBS}"
++CLIENTGUILIBS="${WX_LIBS} $($WX_CONFIG_WITH_ARGS --libs webview)"
+ 
+ if test "${enable_client_release}" = "yes" ; then
+    if test "x${WX_LIBS_STATIC}" = "x" ; then


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/, sci-misc/boinc/files/
@ 2022-04-23 10:24 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2022-04-23 10:24 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/, sci-misc/boinc/files/
@ 2022-04-24 20:14 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2022-04-24 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     7a0414526e4942bf4767aaa2c9a9cfa5fd7f605a
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 19:43:52 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 20:10:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a041452

sci-misc/boinc: fix dep, openrc: ALLOW_REMOTE_RPC=no, GROUP=(id -gn $USER)

Replace the deprecated virtual/jpeg with media-libs/libjpeg-turbo.

Use 'boinc' user's primary group per default. This syncs the behavior of
the openrc-run script with the systemd service file. We can now also
drop acct-group/boinc, since nothing in sci-misc/boinc depends on it.

Also set ALLOW_REMOTE_RPC=no, instead of yes, if absent. Allowing remote
RPCs, if not explicitly enabled by the user, that is, per default, is
not sensible from a security perspective.
Note that the shipped boinc.conf already sets ALLOW_REMOTE_RPC=no.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sci-misc/boinc/{boinc-7.18.1.ebuild => boinc-7.18.1-r1.ebuild} | 3 +--
 sci-misc/boinc/boinc-9999.ebuild                               | 3 +--
 sci-misc/boinc/files/boinc.conf                                | 4 +++-
 sci-misc/boinc/files/boinc.init.in                             | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-misc/boinc/boinc-7.18.1.ebuild b/sci-misc/boinc/boinc-7.18.1-r1.ebuild
similarity index 99%
rename from sci-misc/boinc/boinc-7.18.1.ebuild
rename to sci-misc/boinc/boinc-7.18.1-r1.ebuild
index 2d86dc42372a..3395522f0874 100644
--- a/sci-misc/boinc/boinc-7.18.1.ebuild
+++ b/sci-misc/boinc/boinc-7.18.1-r1.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? (
@@ -43,6 +42,7 @@ DEPEND="
 	X? (
 		dev-db/sqlite:3
 		media-libs/freeglut
+		media-libs/libjpeg-turbo:=
 		x11-libs/gtk+:3
 		x11-libs/libICE
 		>=x11-libs/libnotify-0.7
@@ -50,7 +50,6 @@ DEPEND="
 		x11-libs/libXi
 		x11-libs/libXmu
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
-		virtual/jpeg
 	)
 "
 BDEPEND="app-text/docbook-xml-dtd:4.4

diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild
index 21a46ecfa659..78012a2d9c57 100644
--- a/sci-misc/boinc/boinc-9999.ebuild
+++ b/sci-misc/boinc/boinc-9999.ebuild
@@ -32,7 +32,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? (
@@ -45,6 +44,7 @@ DEPEND="
 	X? (
 		dev-db/sqlite:3
 		media-libs/freeglut
+		media-libs/libjpeg-turbo:=
 		x11-libs/gtk+:3
 		x11-libs/libICE
 		>=x11-libs/libnotify-0.7
@@ -52,7 +52,6 @@ DEPEND="
 		x11-libs/libXi
 		x11-libs/libXmu
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
-		virtual/jpeg
 	)
 "
 BDEPEND="app-text/docbook-xml-dtd:4.4

diff --git a/sci-misc/boinc/files/boinc.conf b/sci-misc/boinc/files/boinc.conf
index 22fcca0d3001..856be30a2402 100644
--- a/sci-misc/boinc/files/boinc.conf
+++ b/sci-misc/boinc/files/boinc.conf
@@ -2,7 +2,9 @@
 
 # Owner of BOINC process (must be existing)
 USER="boinc"
-GROUP="boinc"
+# Group of the BOINC process. Defaults to the user's primary group if
+# not set.
+#GROUP="boinc"
 
 # Directory with runtime data: Work units, project binaries, user info etc.
 RUNTIMEDIR="/var/lib/boinc"

diff --git a/sci-misc/boinc/files/boinc.init.in b/sci-misc/boinc/files/boinc.init.in
index 763b69694444..9ac9b11a930d 100644
--- a/sci-misc/boinc/files/boinc.init.in
+++ b/sci-misc/boinc/files/boinc.init.in
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="attach resume suspend"
@@ -91,12 +91,12 @@ opencl_check() {
 env_check() {
 	# Make sure the configuration is sane
 	: ${USER:="boinc"}
-	: ${GROUP:="boinc"}
+	: ${GROUP:="$(id -ng ${USER})"}
 	: ${RUNTIMEDIR:="/var/lib/boinc"}
 	: ${BOINCBIN:="$(which boinc_client)"}
 	: ${BOINC_PIDFILE:="/var/run/boinc_client.pid"}
 	: ${BOINCCMD:="$(which /usr/bin/boinccmd)"}
-	: ${ALLOW_REMOTE_RPC:="yes"}
+	: ${ALLOW_REMOTE_RPC:="no"}
 	: ${NICELEVEL:="19"}
 	# ARGS is not checked, it could have been explicitly set
 	# to be empty by the user.


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/, sci-misc/boinc/files/
@ 2022-08-01  8:35 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2022-08-01  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     b19f0b8c64154a126e0cc38af89b4a58434c1c43
Author:     Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Wed Jul 27 11:41:27 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 08:34:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19f0b8c

sci-misc/boinc: Simplify the init script

It is no longer neccessary to maintain CUDA/OpenCL symlinks.

[ flow: remove sed which became effectless ]

Signed-off-by: Sven Eden <sven.eden <AT> prydeworx.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Modified-by: Florian Schmaus <flow <AT> gentoo.org>

 sci-misc/boinc/boinc-7.20.2-r2.ebuild |  1 -
 sci-misc/boinc/boinc-9999.ebuild      |  1 -
 sci-misc/boinc/files/boinc.init.in    | 49 -----------------------------------
 3 files changed, 51 deletions(-)

diff --git a/sci-misc/boinc/boinc-7.20.2-r2.ebuild b/sci-misc/boinc/boinc-7.20.2-r2.ebuild
index 4f714313eeff..2375df6ac7ea 100644
--- a/sci-misc/boinc/boinc-7.20.2-r2.ebuild
+++ b/sci-misc/boinc/boinc-7.20.2-r2.ebuild
@@ -161,7 +161,6 @@ src_install() {
 	rm -r "${ED}"/etc || die "rm failed"
 	find "${D}" -name '*.la' -delete || die "Removing .la files failed"
 
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
 	newinitd ${PN}.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 }

diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild
index b6be3bb05451..9689e98c8f56 100644
--- a/sci-misc/boinc/boinc-9999.ebuild
+++ b/sci-misc/boinc/boinc-9999.ebuild
@@ -164,7 +164,6 @@ src_install() {
 	rm -r "${ED}"/etc || die "rm failed"
 	find "${D}" -name '*.la' -delete || die "Removing .la files failed"
 
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
 	newinitd ${PN}.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 }

diff --git a/sci-misc/boinc/files/boinc.init.in b/sci-misc/boinc/files/boinc.init.in
index 9ac9b11a930d..c95b49825fbe 100644
--- a/sci-misc/boinc/files/boinc.init.in
+++ b/sci-misc/boinc/files/boinc.init.in
@@ -41,53 +41,6 @@ create_work_directory() {
 	return 0
 }
 
-fix_lib_symlinks() {
-	local src="$1"
-	local tgt="$2"
-
-	# If the source does not exist, we can not do anything
-	if [ ! -f "${src}" ] ; then
-		return 1
-	fi
-
-	# Check whether the symlink is already there and in order
-	if [ -L "${tgt}" ] ; then
-		if [ -f "${tgt}" ] ; then
-			return 0
-		fi
-
-		# Remove broken symlink
-		if ! rm -f "${tgt}"; then
-			eerror "Removing '${tgt}' failed!"
-			return 1
-		fi
-	fi
-
-	# symlink the correct path
-	if ! ln -snf "${src}" "${tgt}"; then
-		eerror "Symlinking '${src}' to '${tgt}' failed!"
-		return 1
-	fi
-
-	return 0
-}
-
-cuda_check() {
-	local libsource="/opt/cuda/@libdir@/libcudart.so"
-	local libtarget="${RUNTIMEDIR}/libcudart.so"
-
-	fix_lib_symlinks "${libsource}" "${libtarget}" || return 1
-	return 0
-}
-
-opencl_check() {
-	local libsource="/usr/@libdir@/libOpenCL.so"
-	local libtarget="${RUNTIMEDIR}/libOpenCL.so"
-
-	fix_lib_symlinks "${libsource}" "${libtarget}" || return 1
-	return 0
-}
-
 env_check() {
 	# Make sure the configuration is sane
 	: ${USER:="boinc"}
@@ -120,8 +73,6 @@ env_check() {
 start_pre() {
 	env_check || return 1
 	create_work_directory || return 1
-	cuda_check || einfo "CUDA not supported"
-	opencl_check || einfo "OpenCL not supported"
 
 	if [ ! -f "${RUNTIMEDIR}/lockfile" ]; then
 		einfo "File \"${RUNTIMEDIR}/lockfile\" does not exist, assuming first run."


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-01  8:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-01  8:35 [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/, sci-misc/boinc/files/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2022-04-24 20:14 Florian Schmaus
2022-04-23 10:24 Florian Schmaus
2022-04-23 10:24 Florian Schmaus
2018-04-24 21:57 Andreas Sturmlechner
2017-08-19 19:01 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox