public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/
@ 2016-05-04 22:01 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2016-05-04 22:01 UTC (permalink / raw
  To: gentoo-commits

commit:     77700d6221afc3a293241b8547a9904be2bd434b
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Fri Apr 29 08:52:09 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May  4 22:00:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77700d62

sci-misc/boinc: Upgraded init script

Gentoo-Bug: 574260

After hot-fixing bug 574260, the following fixes/additions, suggested
by Jan Chren were made:

- #!/sbin/runscript -> #!/sbin/openrc-run
- Variables from /etc/conf.d/boinc are checked, and empty variables
  are pre-filled with sane defaults.
- split start() to start_pre() and start()
- removed check_baselayout()
- replaced /etc/init.d/boinc with ${RC_SERVICE}
- replaced echo with einfo ""
- replaced ${SVCNAME} with ${RC_SVCNAME}
- removed unset for local vars

Package-Manager: portage-2.2.28

 sci-misc/boinc/Manifest         |  1 -
 sci-misc/boinc/files/boinc.init | 94 ++++++++++++++++++++++++++++++-----------
 2 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 01bb35e..4f1d78d 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,4 +1,3 @@
-DIST boinc-7.2.0.tar.xz 25138432 SHA256 714ac3a10bec41afc224e8343f5bc221a488eefca4592dbc9ce4eea2c10cad5e SHA512 4ee360c14117cf4bbc26dfb48682462cdd15ca04b16f40b76562c0f5fa1a4531775762a1ce1f59960b4d0166a5d429af1279199f5140d3e112c72361ad01c46e WHIRLPOOL 3d41bf1f80d04aa9ec576da18bbb6a8078c98060bd6167dcf6a75fa34619fb95831695fb145a8f4400ec0d99a743f42539751667fcbc505fba7c747c0e0bedfd
 DIST boinc-7.2.42.tar.gz 45420832 SHA256 c4e9c6aef80db15afa3617804f6cdbf15586865d260b242a06197681a8ac86e6 SHA512 c702597b2469e40cdb1fe4d47ac7b808a2f5702d7199e8bc4f2e50ec7a1058057f4edc6baec9ff64b877da788a13bd74049348286c7cbc98a7f73232f25749d0 WHIRLPOOL ddade063072bef0a9dfcba50ce3878c8d0318e8ed607af045e7c7561296742dd66612d68d013be627692a3dbf54296b02dbc50533cd1d0d4a6b2deb53c99305e
 DIST boinc-7.4.42.tar.gz 44075908 SHA256 2656727628cae8b15c39e48e08e0521aae345dd1cf4674c6730150500b30145f SHA512 6eabb130d38c55b551ce216afcb8b4a27d9755c4a20dfc30e7ab0c7e8ba5ab5af6995348ec5fee6b9711aa85f7fdbcef78b05894873d8780f20c9e29e17c8ad1 WHIRLPOOL 3b61de0a5a443d457ceda3c01bf824fa5d9a72c7e5d8e8da1bf35f1510a7d3fb72dbbf8ce329b2f8ca18c82afc16852df0cd047d4870b06537ddff473277d655
 DIST boinc-7.6.31.tar.gz 43534132 SHA256 133490409d4a8513024253dd22ccf6ab26f210226db97f2021fd75eb79a27f08 SHA512 b2f35e7446bf01f4557a0d3c18ccad49a3e71d72fd25d69ff2e023ac51b1293ce3a7066ca0959e35301d1d99fc66eabf11dd89845ac120326f27fcdfa30fcdeb WHIRLPOOL 0d5de909dbe8a7f961d221f01e2ffc57bacc72fc91ac26bdf30fff73f4ce80c1b60f5a7e782da8b8cda222a23455275fd96f18b902c77c971aa86a4c4a010641

diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index 6ed9041..1d78d0a 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -1,19 +1,21 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 extra_started_commands="attach"
 
+
 depend() {
 	# we can use dns and net, but we can also in most cases live without them
 	use dns net ntp-client ntpd
 }
 
+
 create_work_directory() {
 	if [ ! -d "${RUNTIMEDIR}" ]; then
-		einfo "Directory ${RUNTIMEDIR} not existing, creating now."
-		mkdir "${RUNTIMEDIR}"
+		einfo "Directory ${RUNTIMEDIR} does not exist, creating now."
+		mkdir -p "${RUNTIMEDIR}"
 		if [ ! -d "${RUNTIMEDIR}" ]; then
 			eeror "Directory ${RUNTIMEDIR} could not be created!"
 			return 1
@@ -22,8 +24,11 @@ create_work_directory() {
 	if [ ! -e "${RUNTIMEDIR}"/ca-bundle.crt ] ; then
 		ln -s /etc/ssl/certs/ca-certificates.crt "${RUNTIMEDIR}"/ca-bundle.crt
 	fi
+
+	return 0
 }
 
+
 cuda_check() {
 	if [ -f /opt/cuda/lib/libcudart.so ]; then
 		# symlink wont harm :]
@@ -31,15 +36,42 @@ cuda_check() {
 	fi
 }
 
-check_baselayout() {
-	if [ "${RC_VERSION:-0}" = "0" ]; then
-		eerror "This script cannot be used for baselayout-1."
+
+env_check() {
+	# Make sure the configuration is sane
+	${USER:="boinc"}
+	${GROUP:="boinc"}
+	${RUNTIMEDIR:="/var/lib/boinc"}
+	${BOINCBIN:="$(which boinc_client)"}
+	${ALLOW_REMOTE_RPC:="yes"}
+	${NICELEVEL:="19"}
+	# ARGS is not checked, it could have been explicitly set
+	# to be empty by the user.
+
+	# If the client was not found (how?) something is seriously wrong
+	if [ ! -x "$BOINCBIN" ] ; then
+		eerror "No boinc_client found!"
 		return 1
 	fi
+
+	return 0
 }
 
-start() {
-	check_baselayout || return 1
+
+need_passwd_arg() {
+	local vers=$(${BOINCBIN} --version | cut -d '.' --output-delimiter='' -f 1,2)
+	[ -z "$vers" ] && vers=0
+	[ $vers -lt 74 ] && return 0
+
+	# From version 7.4 on, the default is to read
+	# gui_rpc_auth.cfg for the password.
+
+	return 1
+}
+
+
+start_pre() {
+	env_check || return 1
 	create_work_directory || return 1
 	cuda_check
 
@@ -50,24 +82,36 @@ start() {
 		einfo "File \"${RUNTIMEDIR}/lockfile\" does not exist, assuming first run."
 		einfo "You need to setup an account on the BOINC project homepage beforehand!"
 		einfo "Go to http://boinc.berkeley.edu/ and locate your project."
-		einfo "Then either run /etc/init.d/boinc attach or connect with a gui client"
+		einfo "Then either run ${RC_SERVICE} attach or connect with a gui client"
 		einfo "and attach to a project with that."
-		echo
+		einfo ""
 		ewarn "Note that for attaching to some project you need your network up and running."
 		ewarn "network is needed only for jobs fetching afterwards"
 	fi
 
+	return 0
+}
+
+
+start() {
 	if [ "${ALLOW_REMOTE_RPC}" = "yes" ]; then
 		ARGS="${ARGS} --allow_remote_gui_rpc"
 	fi
 
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon -S -N ${NICELEVEL} -u ${USER} -q -x "${BOINCBIN}" -- ${ARGS} --daemon --dir "${RUNTIMEDIR}" --redirectio
+	ARGS="${ARGS} --daemon --dir "${RUNTIMEDIR}" --redirectio"
+
+	ebegin "Starting ${RC_SVCNAME}"
+	start-stop-daemon -S -N ${NICELEVEL} -u ${USER} -q -x "${BOINCBIN}" -- ${ARGS}
 	eend $?
 }
 
+
 attach() {
-	local password url key
+	local password=""
+	local url=""
+	local key=""
+
+	env_check || return 1
 
 	einfo "If you cant find your account key just try to obtain it by using:"
 	einfo "    boinccmd --passwd PASSWORD_FROM_GUI_RPC_AUTH --lookup_account URL EMAIL PASSWORD"
@@ -81,26 +125,28 @@ attach() {
 		"${RC_SERVICE}" start
 	fi
 
-	password=$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")
+	if need_passwd_arg; then
+		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
+	fi
 
-	ebegin "${SVCNAME}: Attaching to project"
-	start-stop-daemon -u ${USER} -q -x boinccmd -- --passwd "${password}" --project_attach ${url} ${key}
+	ebegin "${RC_SVCNAME}: Attaching to project"
+	start-stop-daemon -u ${USER} -q -d "${RUNTIMEDIR}" -x boinccmd -- ${password} --project_attach ${url} ${key}
 	eend $?
 
-	unset password url key
-
 	sleep 10
 	tail "${RUNTIMEDIR}/stdoutdae.txt"
 }
 
 stop() {
-	local password
+	local password=""
 
-	password=$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")
+	env_check || return 1
 
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon -u ${USER} -q -x boinccmd -- --passwd "${password}" --quit
-	eend $?
+	if need_passwd_arg; then
+		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
+	fi
 
-	unset password
+	ebegin "Stopping ${RC_SVCNAME}"
+	start-stop-daemon -u ${USER} -q -d "${RUNTIMEDIR}" -x boinccmd -- ${password} --quit
+	eend $?
 }


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/
@ 2016-05-05 12:44 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2016-05-05 12:44 UTC (permalink / raw
  To: gentoo-commits

commit:     790b10547476baba875701da659349976cadd0ff
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 12:43:52 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May  5 12:44:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=790b1054

sci-misc/boinc: Fix variable default statements in init scripts

Package-Manager: portage-2.2.28

 .../boinc/{boinc-7.2.42.ebuild => boinc-7.2.42-r1.ebuild}   |  0
 .../{boinc-7.4.42-r2.ebuild => boinc-7.4.42-r3.ebuild}      |  0
 .../{boinc-7.6.31-r1.ebuild => boinc-7.6.31-r2.ebuild}      |  0
 sci-misc/boinc/files/boinc.init                             | 13 +++++++------
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sci-misc/boinc/boinc-7.2.42.ebuild b/sci-misc/boinc/boinc-7.2.42-r1.ebuild
similarity index 100%
rename from sci-misc/boinc/boinc-7.2.42.ebuild
rename to sci-misc/boinc/boinc-7.2.42-r1.ebuild

diff --git a/sci-misc/boinc/boinc-7.4.42-r2.ebuild b/sci-misc/boinc/boinc-7.4.42-r3.ebuild
similarity index 100%
rename from sci-misc/boinc/boinc-7.4.42-r2.ebuild
rename to sci-misc/boinc/boinc-7.4.42-r3.ebuild

diff --git a/sci-misc/boinc/boinc-7.6.31-r1.ebuild b/sci-misc/boinc/boinc-7.6.31-r2.ebuild
similarity index 100%
rename from sci-misc/boinc/boinc-7.6.31-r1.ebuild
rename to sci-misc/boinc/boinc-7.6.31-r2.ebuild

diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index 1d78d0a..e20c8df 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -39,12 +39,12 @@ cuda_check() {
 
 env_check() {
 	# Make sure the configuration is sane
-	${USER:="boinc"}
-	${GROUP:="boinc"}
-	${RUNTIMEDIR:="/var/lib/boinc"}
-	${BOINCBIN:="$(which boinc_client)"}
-	${ALLOW_REMOTE_RPC:="yes"}
-	${NICELEVEL:="19"}
+	: ${USER:="boinc"}
+	: ${GROUP:="boinc"}
+	: ${RUNTIMEDIR:="/var/lib/boinc"}
+	: ${BOINCBIN:="$(which boinc_client)"}
+	: ${ALLOW_REMOTE_RPC:="yes"}
+	: ${NICELEVEL:="19"}
 	# ARGS is not checked, it could have been explicitly set
 	# to be empty by the user.
 
@@ -137,6 +137,7 @@ attach() {
 	tail "${RUNTIMEDIR}/stdoutdae.txt"
 }
 
+
 stop() {
 	local password=""
 


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/
@ 2016-11-12 15:39 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2016-11-12 15:39 UTC (permalink / raw
  To: gentoo-commits

commit:     cdcd619623d85b22cf53304952ab00cf880626a6
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Sat Nov 12 15:23:42 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 15:39:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcd6196

sci-misc/boinc: Fix linker errors with wxGTK for boinc-7.6.33

Gentoo-Bug: 587462

>=x11-libs/wxGTK-3.0.2.0-r3 has webview removed. This patch adds
webview to the CLIENTGUILIBS.

Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2768

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-misc/boinc/boinc-7.6.33-r1.ebuild  | 157 +++++++++++++++++++++++++++++++++
 sci-misc/boinc/files/fix_webview.patch |  11 +++
 2 files changed, 168 insertions(+)

diff --git a/sci-misc/boinc/boinc-7.6.33-r1.ebuild b/sci-misc/boinc/boinc-7.6.33-r1.ebuild
new file mode 100644
index 00000000..7d8033c
--- /dev/null
+++ b/sci-misc/boinc/boinc-7.6.33-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER=3.0
+
+inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets
+
+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"
+RESTRICT="mirror"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X cuda curl_ssl_libressl +curl_ssl_openssl static-libs"
+
+REQUIRED_USE="^^ ( 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
+	>=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(-),-curl_ssl_polarssl(-)]
+	sys-apps/util-linux
+	sys-libs/zlib
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-2.1
+		>=x11-drivers/nvidia-drivers-180.22
+	)
+	X? (
+		dev-db/sqlite:3
+		media-libs/freeglut
+		sys-libs/glibc:2.2
+		virtual/jpeg:0=
+		x11-libs/gtk+:2
+		>=x11-libs/libnotify-0.7
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	app-text/docbook-xml-dtd:4.4
+	app-text/docbook2X
+"
+
+S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
+
+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() {
+	# prevent bad changes in compile flags, bug 286701
+	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
+
+	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
+	epatch "${FILESDIR}"/fix_webview.patch
+
+	eautoreconf
+
+	use X && need-wxwidgets unicode
+}
+
+src_configure() {
+	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
+		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png
+		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
+	fi
+
+	# cleanup cruft
+	rm -rf "${ED}"/etc || die "rm failed"
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_preinst() {
+	enewgroup ${PN}
+	# note this works only for first install so we have to
+	# elog user about the need of being in video group
+	local groups="${PN}"
+	if use cuda; then
+		group+=",video"
+	fi
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
+}
+
+pkg_postinst() {
+	echo
+	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
+	if use cuda; then
+		elog "To be able to use CUDA you should add boinc user to video group."
+		elog "Run as root:"
+		elog "gpasswd -a boinc video"
+	fi
+}

diff --git a/sci-misc/boinc/files/fix_webview.patch b/sci-misc/boinc/files/fix_webview.patch
new file mode 100644
index 00000000..6c141eb
--- /dev/null
+++ b/sci-misc/boinc/files/fix_webview.patch
@@ -0,0 +1,11 @@
+--- 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] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/
@ 2016-11-12 15:39 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2016-11-12 15:39 UTC (permalink / raw
  To: gentoo-commits

commit:     ab959214be1c6b67588681761f14073f3f051270
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Sat Nov 12 15:23:43 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 15:39:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab959214

sci-misc/boinc: Cleanup of obsolete ebuilds and files

Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2768

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-misc/boinc/Manifest                  |   5 +-
 sci-misc/boinc/boinc-7.2.42-r2.ebuild    | 150 ------------------------------
 sci-misc/boinc/boinc-7.4.43.ebuild       | 154 -------------------------------
 sci-misc/boinc/boinc-7.6.31-r3.ebuild    | 150 ------------------------------
 sci-misc/boinc/files/generate_tarball.sh | 103 ---------------------
 5 files changed, 1 insertion(+), 561 deletions(-)

diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 1dc63ac..c31dcd0 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,6 +1,3 @@
-DIST boinc-7.2.42.tar.gz 45420832 SHA256 c4e9c6aef80db15afa3617804f6cdbf15586865d260b242a06197681a8ac86e6 SHA512 c702597b2469e40cdb1fe4d47ac7b808a2f5702d7199e8bc4f2e50ec7a1058057f4edc6baec9ff64b877da788a13bd74049348286c7cbc98a7f73232f25749d0 WHIRLPOOL ddade063072bef0a9dfcba50ce3878c8d0318e8ed607af045e7c7561296742dd66612d68d013be627692a3dbf54296b02dbc50533cd1d0d4a6b2deb53c99305e
 DIST boinc-7.2.44.tar.gz 46626134 SHA256 bae214f238b8b3d1826a44e3a9e5d91cbad165e7df6daf8a7f208f36c51c5425 SHA512 60f58eecbe1f8d1a272b338d0c2b2fcbfb95538c448cbfdab25d3e860129b519a2c3b2608a909e285bdf4378c23a71107a6d3c2d3aa519ec906480d81be19ca9 WHIRLPOOL f071fce088769ca35bacc9466e3a863bc619d025e14aa26b96a5a736027e4438a2d660df804d95cc635c4bd83e636c0c79e2712f2953bbc2fd905091ec1a1589
-DIST boinc-7.4.42.tar.gz 44075908 SHA256 2656727628cae8b15c39e48e08e0521aae345dd1cf4674c6730150500b30145f SHA512 6eabb130d38c55b551ce216afcb8b4a27d9755c4a20dfc30e7ab0c7e8ba5ab5af6995348ec5fee6b9711aa85f7fdbcef78b05894873d8780f20c9e29e17c8ad1 WHIRLPOOL 3b61de0a5a443d457ceda3c01bf824fa5d9a72c7e5d8e8da1bf35f1510a7d3fb72dbbf8ce329b2f8ca18c82afc16852df0cd047d4870b06537ddff473277d655
-DIST boinc-7.4.43.tar.gz 44144046 SHA256 f7b6c093e88227093cdc7c7a337eafe3d10ec4071bfe5cdc20dfa9fdd74fcb9b SHA512 3c9b95daa2083c61f7794482fb1a23e2eacd6f08da49e7378450bdffab15458c58405b2945cca24bd724018859b77474e220bef94dd78c7e42eb51f8789ede63 WHIRLPOOL 570d9fb837bcdf74985944894719aea4bdfff174da1d1b60592a895540e3d9d160759658a0fb452a51e796dc5f9111f3f9bd05e2a1e2a54d4fdefcf7847d3598
-DIST boinc-7.6.31.tar.gz 43534132 SHA256 133490409d4a8513024253dd22ccf6ab26f210226db97f2021fd75eb79a27f08 SHA512 b2f35e7446bf01f4557a0d3c18ccad49a3e71d72fd25d69ff2e023ac51b1293ce3a7066ca0959e35301d1d99fc66eabf11dd89845ac120326f27fcdfa30fcdeb WHIRLPOOL 0d5de909dbe8a7f961d221f01e2ffc57bacc72fc91ac26bdf30fff73f4ce80c1b60f5a7e782da8b8cda222a23455275fd96f18b902c77c971aa86a4c4a010641
+DIST boinc-7.4.52.tar.gz 44146174 SHA256 ac27154ad28d9d0a63ba7153ebb7bcbbd0586744c763c91deeb0325d56530192 SHA512 32623552e091bf388e85e5f118a8cd035b677091620d2b171513299428e4b53b94f7bfd75e8d4e9f46de3a7cadd8b498434acc3b9aeffbd3667aa18d65c0bc78 WHIRLPOOL e1035ba513a3adced4d5576e856fc43213cca923f3d016aa86c19784a4efcbaa7e599a2728568e14121a63aa89365b1ae00b99af588824f17371836f9494266e
 DIST boinc-7.6.33.tar.gz 43569544 SHA256 c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d SHA512 c1a98d1a489835abdac72b300c0c8ce82eec9a677ff891c57da4df9875a9bbdd4b45dd9d5ae6ddc2926a0e47ae281fb94ff87815b8aeab0786e15062465e2c20 WHIRLPOOL 118578c4058b3f19fab61982a2f2007379790f37cd077f80f7e4c6a7bed30016142c3236af6274553c19ac1a662b4022ddf6323e22c7dc697ea30ca0bccfbaeb

diff --git a/sci-misc/boinc/boinc-7.2.42-r2.ebuild b/sci-misc/boinc/boinc-7.2.42-r2.ebuild
deleted file mode 100644
index a7c9d06..00000000
--- a/sci-misc/boinc/boinc-7.2.42-r2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER=2.8
-
-inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda static-libs"
-
-RDEPEND="
-	!sci-misc/boinc-bin
-	!app-admin/quickswitch
-	>=app-misc/ca-certificates-20080809
-	dev-libs/openssl:0=
-	net-misc/curl[ssl,-gnutls(-),-nss(-),curl_ssl_openssl(+)]
-	sys-apps/util-linux
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-2.1
-		>=x11-drivers/nvidia-drivers-180.22
-	)
-	X? (
-		dev-db/sqlite:3
-		media-libs/freeglut
-		sys-libs/glibc:2.2
-		virtual/jpeg:0=
-		x11-libs/gtk+:2
-		>=x11-libs/libnotify-0.7
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook2X
-"
-
-S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
-
-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() {
-	# prevent bad changes in compile flags, bug 286701
-	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
-	eautoreconf
-
-	use X && need-wxwidgets unicode
-}
-
-src_configure() {
-	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
-		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png
-		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
-	fi
-
-	# cleanup cruft
-	rm -rf "${ED}"/etc || die "rm failed"
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	local groups="${PN}"
-	if use cuda; then
-		group+=",video"
-	fi
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
-}
-
-pkg_postinst() {
-	echo
-	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
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "Run as root:"
-		elog "gpasswd -a boinc video"
-	fi
-}

diff --git a/sci-misc/boinc/boinc-7.4.43.ebuild b/sci-misc/boinc/boinc-7.4.43.ebuild
deleted file mode 100644
index 3daf627..00000000
--- a/sci-misc/boinc/boinc-7.4.43.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER=3.0
-
-inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets
-
-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"
-RESTRICT="mirror"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda curl_ssl_libressl +curl_ssl_openssl static-libs"
-
-REQUIRED_USE="^^ ( 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
-	>=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(-),-curl_ssl_polarssl(-)]
-	sys-apps/util-linux
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-2.1
-		>=x11-drivers/nvidia-drivers-180.22
-	)
-	X? (
-		dev-db/sqlite:3
-		media-libs/freeglut
-		sys-libs/glibc:2.2
-		virtual/jpeg:0=
-		x11-libs/gtk+:2
-		>=x11-libs/libnotify-0.7
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook2X
-"
-
-S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
-
-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() {
-	# prevent bad changes in compile flags, bug 286701
-	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
-	eautoreconf
-
-	use X && need-wxwidgets unicode
-}
-
-src_configure() {
-	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
-		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png
-		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
-	fi
-
-	# cleanup cruft
-	rm -rf "${ED}"/etc || die "rm failed"
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	local groups="${PN}"
-	if use cuda; then
-		group+=",video"
-	fi
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
-}
-
-pkg_postinst() {
-	echo
-	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
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "Run as root:"
-		elog "gpasswd -a boinc video"
-	fi
-}

diff --git a/sci-misc/boinc/boinc-7.6.31-r3.ebuild b/sci-misc/boinc/boinc-7.6.31-r3.ebuild
deleted file mode 100644
index 6e2e785..00000000
--- a/sci-misc/boinc/boinc-7.6.31-r3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER=3.0
-
-inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda static-libs"
-
-RDEPEND="
-	!sci-misc/boinc-bin
-	!app-admin/quickswitch
-	>=app-misc/ca-certificates-20080809
-	dev-libs/openssl:0=
-	net-misc/curl[ssl,-gnutls(-),-nss(-),curl_ssl_openssl(+)]
-	sys-apps/util-linux
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-2.1
-		>=x11-drivers/nvidia-drivers-180.22
-	)
-	X? (
-		dev-db/sqlite:3
-		media-libs/freeglut
-		sys-libs/glibc:2.2
-		virtual/jpeg:0=
-		x11-libs/gtk+:2
-		>=x11-libs/libnotify-0.7
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook2X
-"
-
-S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
-
-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() {
-	# prevent bad changes in compile flags, bug 286701
-	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
-	eautoreconf
-
-	use X && need-wxwidgets unicode
-}
-
-src_configure() {
-	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
-		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png
-		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
-	fi
-
-	# cleanup cruft
-	rm -rf "${ED}"/etc || die "rm failed"
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	local groups="${PN}"
-	if use cuda; then
-		group+=",video"
-	fi
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
-}
-
-pkg_postinst() {
-	echo
-	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
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "Run as root:"
-		elog "gpasswd -a boinc video"
-	fi
-}

diff --git a/sci-misc/boinc/files/generate_tarball.sh b/sci-misc/boinc/files/generate_tarball.sh
deleted file mode 100644
index eb98b46..00000000
--- a/sci-misc/boinc/files/generate_tarball.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-## $Id$
-## Modified by scarabeus 2008-10-23
-###############################################################################
-# functions
-###############################################################################
-# print out help function
-help() {
-	echo "Welcome to Boinc tarball generator"
-	echo
-	echo "For correct usage set VERSION argument"
-	echo "Example:"
-	echo "$0 -v 6.1.1"
-	exit 0
-}
-###############################################################################
-# argument passing
-###############################################################################
-if [[ $1 == "--help" ]]; then
-	help
-fi
-while getopts v: arg ; do
-	case $arg in
-		v) VERSION=${OPTARG};;
-		*) help;;
-	esac
-done
-if [ -z "${VERSION}" ]; then
-	help
-fi
-###############################################################################
-# variable definition
-###############################################################################
-GIT_URI="git://boinc.berkeley.edu/boinc-v2.git"
-PACKAGE="boinc-${VERSION}"
-BUNDLE_PREFIX="boinc-dist"
-LOG=linux.log
-###############################################################################
-# prepare enviroment
-###############################################################################
-mkdir ${BUNDLE_PREFIX} -p
-rm -rf "${BUNDLE_PREFIX}"/* # CLEANUP
-cd "${BUNDLE_PREFIX}"
-touch "${LOG}"
-echo "" > "${LOG}"	# LOG CLEANUP
-###############################################################################
-# get data from GIT
-###############################################################################
-echo "<Downloading files from GIT repository>"
-echo "<******************************>"
-# No direct archive possible
-git clone ${GIT_URI} ${PACKAGE} >> "${LOG}"
-pushd "${PACKAGE}" > /dev/null
-git checkout -b gentoo client_release/${VERSION%.*}/${VERSION} || exit 0
-popd > /dev/null
-###############################################################################
-# cleanup files we fetched
-###############################################################################
-echo "<Cleaning up data we fetched>"
-echo "<******************************>"
-pushd "${PACKAGE}" > /dev/null
-
-# First remove NON Linux stuff we will not use
-rm -rf mac_installer/ # mac installer scripts
-rm -rf clientgui/mac/ # mac windows
-rm -rf clientscr/ # windows screensaver
-rm -rf clienttray/ # windows systray
-rm -rf win_build/ # windows build stuff
-rm -rf clientlib/ # only windows stuff
-rm -rf client/os2/ # OS2 stuff
-rm -rf client/win/ # windows stuff
-rm -rf mac_build/ # mac build scripts
-rm -rf RSAEuro/ # empty folder
-rm -rf html/ # webpages WTF?
-
-
-# BUNDLED STUFF NEEDED REMOVAL
-rm -rf coprocs/ # CUDA
-rm -rf curl/
-#rm -rf locale/*/*.mo # translations should be generated on user machines
-# Actualy they dont generate them
-rm -rf zlib/
-rm -rf zip/
-rm -rf openssl/
-
-git commit -a -m "Cleaned"
-
-popd > /dev/null
-
-###############################################################################
-# create tbz
-###############################################################################
-git archive --prefix=${PACKAGE}/ --remote=${PACKAGE} gentoo -o ${PACKAGE}.tar
-xz -ve9 "${PACKAGE}".tar | tee -a "${LOG}"
-find ./ -maxdepth 1 -type f -name \*.tar.xz -print | while read FILE ; do
-	echo "FILE: ${FILE}"
-	echo "      SIZE: $(`which du` -h ${FILE} |`which awk` -F' ' '{print $1}')"
-	echo "    MD5SUM: $(`which md5sum` ${FILE} |`which awk` -F' ' '{print $1}')"
-	echo "   SHA1SUM: $(`which sha1sum` ${FILE} |`which awk` -F' ' '{print $1}')"
-	echo
-done
-echo "<<<All done>>>"
-###############################################################################


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/
@ 2017-06-04 17:03 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2017-06-04 17:03 UTC (permalink / raw
  To: gentoo-commits

commit:     2563ac2933be85a58e7bc953e1f80ac0b04f173b
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Wed May 24 07:29:35 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 17:02:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2563ac29

sci-misc/boinc: Fix suspend/resume commands in the init script.

Both suspend and resume do not work any more, at least with boinc-7.6.33.
The reason is, that fetching the project URLs require password authentication.

This commit adds the required steps to no longer get an authentication error
when trying to suspend/resume boinc.

Closes: https://github.com/gentoo/gentoo/pull/4732
Package-Manager: portage-2.3.6

 ...boinc-7.2.44-r3.ebuild => boinc-7.2.44-r4.ebuild} |  0
 ...boinc-7.4.52-r3.ebuild => boinc-7.4.52-r4.ebuild} |  0
 ...boinc-7.6.33-r3.ebuild => boinc-7.6.33-r4.ebuild} |  0
 sci-misc/boinc/files/boinc.init                      | 20 ++++++++++++--------
 4 files changed, 12 insertions(+), 8 deletions(-)

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

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

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

diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index ceeeac87145..23450a6857c 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -184,15 +184,17 @@ resume() {
 	env_check || return 1
 
 	local password=""
-	local master_urls=( \
-		$("${BOINCCMD}" --get_project_status | \
-		  sed -n 's/\s*master URL: //p') \
-	)
 
 	if need_passwd_arg; then
 		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
 	fi
 
+	local master_urls=( \
+		$(cd "${RUNTIMEDIR}" ; \
+		  "${BOINCCMD}" ${password} --get_project_status | \
+		  sed -n 's/\s*master URL: //p') \
+	)
+
 	for url in "${master_urls[@]}"; do
 		ebegin "Resuming $url"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \
@@ -207,15 +209,17 @@ suspend() {
 	env_check || return 1
 
 	local password=""
-	local master_urls=( \
-		$("${BOINCCMD}" --get_project_status | \
-		  sed -n 's/\s*master URL: //p') \
-	)
 
 	if need_passwd_arg; then
 		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
 	fi
 
+	local master_urls=( \
+		$(cd "${RUNTIMEDIR}" ; \
+		  "${BOINCCMD}" ${password} --get_project_status | \
+		  sed -n 's/\s*master URL: //p') \
+	)
+
 	for url in "${master_urls[@]}"; do
 		ebegin "Suspending $url"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/
@ 2017-07-05  9:11 Michał Górny
  0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2017-07-05  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     2e1256f586edfdfae022945f278e3d28ac997ecf
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Tue Jun  6 17:20:12 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 09:08:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e1256f5

sci-misc/boinc: Fix bashisms in init script and enhance OpenCL support

This commit fixes the following issues:

 - https://bugs.gentoo.org/show_bug.cgi?id=620818
   The previous init script consisted of many bashisms that have been removed.

 - BOINC supports OpenCL unconditionally. This commit adds an informational
   text about its support to the ebuilds.

 - For OpenCL to work, the currently used libOpenCL.so must be symlinked into
   the BOINC working directory, just like libcudart.so. The init script has been
   updated to take care of symlinking libOpenCL.so.

Closes: https://github.com/gentoo/gentoo/pull/4887
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 ...inc-7.2.44-r4.ebuild => boinc-7.2.44-r5.ebuild} |  11 +-
 ...inc-7.4.52-r4.ebuild => boinc-7.4.52-r5.ebuild} |  11 +-
 ...inc-7.6.33-r4.ebuild => boinc-7.6.33-r5.ebuild} |  12 +-
 sci-misc/boinc/files/{boinc.init => boinc.init.in} | 126 ++++++++++++---------
 sci-misc/boinc/metadata.xml                        |   2 +-
 5 files changed, 107 insertions(+), 55 deletions(-)

diff --git a/sci-misc/boinc/boinc-7.2.44-r4.ebuild b/sci-misc/boinc/boinc-7.2.44-r5.ebuild
similarity index 92%
rename from sci-misc/boinc/boinc-7.2.44-r4.ebuild
rename to sci-misc/boinc/boinc-7.2.44-r5.ebuild
index 58ea2259b58..a5b8a0a8c2d 100644
--- a/sci-misc/boinc/boinc-7.2.44-r4.ebuild
+++ b/sci-misc/boinc/boinc-7.2.44-r5.ebuild
@@ -122,7 +122,8 @@ src_install() {
 	# cleanup cruft
 	rm -rf "${ED%/}"/etc || die "rm failed"
 
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
+	newinitd ${PN}.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
@@ -163,4 +164,12 @@ pkg_postinst() {
 		elog "Run as root:"
 		elog "gpasswd -a boinc video"
 	fi
+	# 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
 }

diff --git a/sci-misc/boinc/boinc-7.4.52-r4.ebuild b/sci-misc/boinc/boinc-7.4.52-r5.ebuild
similarity index 92%
rename from sci-misc/boinc/boinc-7.4.52-r4.ebuild
rename to sci-misc/boinc/boinc-7.4.52-r5.ebuild
index eacfd2ea862..55454c00e45 100644
--- a/sci-misc/boinc/boinc-7.4.52-r4.ebuild
+++ b/sci-misc/boinc/boinc-7.4.52-r5.ebuild
@@ -127,7 +127,8 @@ src_install() {
 	# cleanup cruft
 	rm -rf "${ED%/}"/etc || die "rm failed"
 
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
+	newinitd ${PN}.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
@@ -168,4 +169,12 @@ pkg_postinst() {
 		elog "Run as root:"
 		elog "gpasswd -a boinc video"
 	fi
+	# 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
 }

diff --git a/sci-misc/boinc/boinc-7.6.33-r4.ebuild b/sci-misc/boinc/boinc-7.6.33-r5.ebuild
similarity index 92%
rename from sci-misc/boinc/boinc-7.6.33-r4.ebuild
rename to sci-misc/boinc/boinc-7.6.33-r5.ebuild
index eacfd2ea862..59a13dfeba9 100644
--- a/sci-misc/boinc/boinc-7.6.33-r4.ebuild
+++ b/sci-misc/boinc/boinc-7.6.33-r5.ebuild
@@ -127,7 +127,8 @@ src_install() {
 	# cleanup cruft
 	rm -rf "${ED%/}"/etc || die "rm failed"
 
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die
+	newinitd ${PN}.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
@@ -167,5 +168,14 @@ pkg_postinst() {
 		elog "To be able to use CUDA you should add boinc user to video group."
 		elog "Run as root:"
 		elog "gpasswd -a boinc video"
+		elog
+	fi
+	# 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
 }

diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init.in
similarity index 66%
rename from sci-misc/boinc/files/boinc.init
rename to sci-misc/boinc/files/boinc.init.in
index 23450a6857c..a5ea8dd13bb 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init.in
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="attach resume suspend"
@@ -9,46 +9,84 @@ depend() {
 	use dns net ntp-client ntpd
 }
 
-
 create_work_directory() {
-	if [[ ! -d "${RUNTIMEDIR}" ]]; then
+	local sslcrt="/etc/ssl/certs/ca-certificates.crt"
+
+	if [ ! -d "${RUNTIMEDIR}" ]; then
 		einfo "Directory ${RUNTIMEDIR} does not exist, creating now."
-		mkdir -p "${RUNTIMEDIR}"
-		if [[ ! -d "${RUNTIMEDIR}" ]]; then
+		if ! mkdir -p "${RUNTIMEDIR}"; then
 			eeror "Directory ${RUNTIMEDIR} could not be created!"
 			return 1
 		fi
 
 		# ensure proper ownership
-		chown "${USER}:${GROUP}" "${RUNTIMEDIR}"
+		if ! chown "${USER}:${GROUP}" "${RUNTIMEDIR}"; then
+			eeror "Changing ownership of '${RUNTIMEDIR}' to '${USER}:${GROUP}' failed!"
+			return 1
+		fi
 	fi
 
-	if [[ ! -e "${RUNTIMEDIR}"/ca-bundle.crt ]]; then
-		ln -s /etc/ssl/certs/ca-certificates.crt "${RUNTIMEDIR}"/ca-bundle.crt
+	if [ ! -e "${RUNTIMEDIR}"/ca-bundle.crt ]; then
+		if [ ! -f "${sslcrt}" ]; then
+			eerror "'${sslcrt}' does not exist!"
+			return 1
+		fi
+
+		if ! ln -s "${sslcrt}" "${RUNTIMEDIR}"/ca-bundle.crt; then
+			eeror "Symlinking '${sslcrt}' failed!"
+			return 1
+		fi
 	fi
 
 	return 0
 }
 
+fix_lib_symlinks() {
+	local src="$1"
+	local tgt="$2"
 
-cuda_check() {
-	local libtarget="${RUNTIMEDIR}/libcudart.so"
-	local libsource="$(ls -t /opt/cuda/lib*/libcudart.so 2>/dev/null | head -n 1)"
+	# 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 a broken symlink
-	if [[ -h "${libtarget}" ]] \
-	&& [[ "${libsource}" != "$(readlink "${libtarget}")" ]]; then
-		rm -f "${libtarget}"
+		# Remove broken symlink
+		if ! rm -f "${tgt}"; then
+			eeror "Removing '${tgt}' failed!"
+			return 1
+		fi
 	fi
 
 	# symlink the correct path
-	if [[ -n "${libsource}" ]] \
-	&& [[ -f "${libsource}" ]] \
-	&& [[ ! -h "${libtarget}" ]]; then
-		ln -snf "$libsource" "${libtarget}"
+	if ! ln -snf "${src}" "${tgt}"; then
+		eeror "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
@@ -64,26 +102,25 @@ env_check() {
 	# to be empty by the user.
 
 	# If the client was not found (how?) something is seriously wrong
-	if [[ ! -x "$BOINCBIN" ]]; then
+	if [ ! -x "${BOINCBIN}" ]; then
 		eerror "No boinc_client found!"
 		return 1
 	fi
 
 	# The boinccmd is crucial, or we can not attach, suspend or resume
 	# the boinc client
-	if [[ ! -x "$BOINCCMD" ]]; then
-		eerror "No boinccmd_program found!"
+	if [ ! -x "${BOINCCMD}" ]; then
+		eerror "No boinccmd program found!"
 		return 1
 	fi
 
 	return 0
 }
 
-
 need_passwd_arg() {
 	local vers=$(${BOINCBIN} --version | tr -d .)
-	[ -z "$vers" ] && vers="00"
-	[ $(expr substr "$vers" 1 2) -lt 74 ] && return 0
+	[ -z "${vers}" ] && vers="00"
+	[ $(expr substr "${vers}" 1 2) -lt 74 ] && return 0
 
 	# From version 7.4 on, the default is to read
 	# gui_rpc_auth.cfg for the password.
@@ -91,13 +128,13 @@ need_passwd_arg() {
 	return 1
 }
 
-
 start_pre() {
 	env_check || return 1
 	create_work_directory || return 1
-	cuda_check
+	cuda_check || einfo "CUDA not supported"
+	opencl_check || einfo "OpenCL not supported"
 
-	if [[ ! -f "${RUNTIMEDIR}/lockfile" ]]; then
+	if [ ! -f "${RUNTIMEDIR}/lockfile" ]; then
 		einfo "File \"${RUNTIMEDIR}/lockfile\" does not exist, assuming first run."
 		einfo "You need to setup an account on the BOINC project homepage beforehand!"
 		einfo "Go to http://boinc.berkeley.edu/ and locate your project."
@@ -111,9 +148,8 @@ start_pre() {
 	return 0
 }
 
-
 start() {
-	if [[ "${ALLOW_REMOTE_RPC}" = "yes" ]]; then
+	if [ "${ALLOW_REMOTE_RPC}" = "yes" ]; then
 		ARGS="${ARGS} --allow_remote_gui_rpc"
 	fi
 
@@ -122,12 +158,11 @@ start() {
 	ebegin "Starting ${RC_SVCNAME}"
 	start-stop-daemon --start --nicelevel ${NICELEVEL} \
 		--user "${USER}:${GROUP}" --quiet --make-pidfile \
-		--pidfile "$BOINC_PIDFILE" --background \
+		--pidfile "${BOINC_PIDFILE}" --background \
 		--exec "${BOINCBIN}" -- ${ARGS}
 	eend $?
 }
 
-
 attach() {
 	local password=""
 	local url=""
@@ -157,11 +192,10 @@ attach() {
 		-- ${password} --project_attach ${url} ${key}
 	eend $?
 
-	sleep 10s
+	sleep 10
 	tail "${RUNTIMEDIR}/stdoutdae.txt"
 }
 
-
 stop() {
 	local password=""
 	local stop_timeout="SIGTERM/60/SIGTERM/30/SIGKILL/30"
@@ -174,12 +208,11 @@ stop() {
 
 	ebegin "Stopping ${RC_SVCNAME}"
 	start-stop-daemon --stop --quiet --progress \
-		--retry $stop_timeout \
+		--retry ${stop_timeout} \
 		--pidfile "${BOINC_PIDFILE}"
 	eend $?
 }
 
-
 resume() {
 	env_check || return 1
 
@@ -189,14 +222,10 @@ resume() {
 		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
 	fi
 
-	local master_urls=( \
-		$(cd "${RUNTIMEDIR}" ; \
+	for url in $(cd "${RUNTIMEDIR}" ; \
 		  "${BOINCCMD}" ${password} --get_project_status | \
-		  sed -n 's/\s*master URL: //p') \
-	)
-
-	for url in "${master_urls[@]}"; do
-		ebegin "Resuming $url"
+		  sed -n 's/\s*master URL: //p'); do
+		ebegin "Resuming ${url}"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \
 			--chdir "${RUNTIMEDIR}" --exec "${BOINCCMD}" \
 			-- ${password} --project ${url} resume
@@ -204,7 +233,6 @@ resume() {
 	done
 }
 
-
 suspend() {
 	env_check || return 1
 
@@ -214,14 +242,10 @@ suspend() {
 		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
 	fi
 
-	local master_urls=( \
-		$(cd "${RUNTIMEDIR}" ; \
+	for url in $(cd "${RUNTIMEDIR}" ; \
 		  "${BOINCCMD}" ${password} --get_project_status | \
-		  sed -n 's/\s*master URL: //p') \
-	)
-
-	for url in "${master_urls[@]}"; do
-		ebegin "Suspending $url"
+		  sed -n 's/\s*master URL: //p'); do
+		ebegin "Suspending ${url}"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \
 			--chdir "${RUNTIMEDIR}" --exec "${BOINCCMD}" \
 			-- ${password} --project ${url} suspend

diff --git a/sci-misc/boinc/metadata.xml b/sci-misc/boinc/metadata.xml
index c65c76f57f7..5e74c0cc24c 100644
--- a/sci-misc/boinc/metadata.xml
+++ b/sci-misc/boinc/metadata.xml
@@ -19,7 +19,7 @@
   Use nvidia cuda toolkit for speeding up computations.
   NOTE: works only for subset of nvidia graphic cards so make sure your card
   is supported before opening a bug about it.
-  </flag>
+    </flag>
   </use>
   <upstream>
     <remote-id type="github">BOINC/boinc</remote-id>


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/
@ 2017-12-27 11:56 Mart Raudsepp
  0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2017-12-27 11:56 UTC (permalink / raw
  To: gentoo-commits

commit:     36450a88d1529f5ee657e7dc328c9a98a7367706
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Sun Dec 24 14:31:32 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 11:56:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36450a88

sci-misc/boinc: Remove xlocale.h usage, fixes bug 639108

>=sys-libs/glibc-2.26 dropped xlocale.h support.

From https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
 > The nonstandard header xlocale.h has been removed in this release. It was
 > never intended to be included directly by programs other than glibc itself,
 > and it was a strict subset of the standard header locale.h.

This commit removes the inclusion of xlocale.h, and substitutes it with
locale.h where necessary.

Tested-by: Sven Eden <yamakuzure <AT> gmx.net>
Bug: https://bugs.gentoo.org/639108
Closes: https://bugs.gentoo.org/639108
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-misc/boinc/boinc-7.8.4.ebuild      |  2 ++
 sci-misc/boinc/files/fix_xlocale.patch | 42 ++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/sci-misc/boinc/boinc-7.8.4.ebuild b/sci-misc/boinc/boinc-7.8.4.ebuild
index b4628e19804..3c1024ee2da 100644
--- a/sci-misc/boinc/boinc-7.8.4.ebuild
+++ b/sci-misc/boinc/boinc-7.8.4.ebuild
@@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
 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
 )
 
 S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"

diff --git a/sci-misc/boinc/files/fix_xlocale.patch b/sci-misc/boinc/files/fix_xlocale.patch
new file mode 100644
index 00000000000..8b80258cf6c
--- /dev/null
+++ b/sci-misc/boinc/files/fix_xlocale.patch
@@ -0,0 +1,42 @@
+--- a/configure.ac	2017-12-18 17:45:19.829854890 +0100
++++ b/configure.ac	2017-12-18 17:46:13.845853923 +0100
+@@ -602,7 +602,7 @@
+    echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS" >&5
+    echo "DEBUG: GLUT_LIBS = $GLUT_LIBS" >&5
+ 
+-   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h xlocale.h])
++   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h])
+ 
+    AC_CHECK_LIB([jpeg], [jpeg_start_compress],[have_jpeg=1],[have_jpeg=0])
+    AC_CHECK_HEADER([jpeglib.h],[have_jpeg=1],[have_jpeg=0])
+@@ -986,9 +986,6 @@
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
+-#ifdef HAVE_XLOCALE_H
+-#include <xlocale.h>
+-#endif
+ ]])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+--- a/lib/gui_rpc_client.h	2017-12-18 17:47:22.826852688 +0100
++++ b/lib/gui_rpc_client.h	2017-12-18 17:48:42.384851263 +0100
+@@ -807,7 +807,6 @@
+ 
+ #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)
+ // uselocale() is not available in OS 10.3.9 so use weak linking
+-#include <xlocale.h>
+ extern int		freelocale(locale_t) __attribute__((weak_import));
+ extern locale_t	newlocale(int, __const char *, locale_t) __attribute__((weak_import));
+ extern locale_t	uselocale(locale_t) __attribute__((weak_import));
+--- a/clientgui/AsyncRPC.cpp	2017-12-18 17:47:30.727852546 +0100
++++ b/clientgui/AsyncRPC.cpp	2017-12-18 17:48:56.785851005 +0100
+@@ -20,7 +20,7 @@
+ #endif
+ 
+ #if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))
+-#include <xlocale.h>
++#include <locale.h>
+ #endif
+ 
+ #include "stdwx.h"


^ permalink raw reply related	[flat|nested] 11+ messages in thread

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

commit:     a954c781733024fddc2d9f15bc69d9a074ba063e
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Wed Mar 21 11:42:19 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=a954c781

sci-misc/boinc: New version 7.9.3 and new xlocale patch

The client release series 7.10 is currently a "pre-release", so the
series has the lower client version 7.9.3 as its newest release.

As predicted the old xlocale patch does not fit any more, so a new
patch was created.

Tested-by: Sven Eden <yamakuzure <AT> gmx.net>
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-misc/boinc/Manifest                     |   1 +
 sci-misc/boinc/boinc-7.9.3.ebuild           | 196 ++++++++++++++++++++++++++++
 sci-misc/boinc/files/7.10-fix_xlocale.patch |  37 ++++++
 3 files changed, 234 insertions(+)

diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index a04ac5afb50..f2bd0f57b26 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,2 +1,3 @@
 DIST boinc-7.8.6.tar.gz 52037690 BLAKE2B 21d356488d8ea7e665f1b47e8ef0a0055d8b1a11e6e2aeea0b0ee7839fc7c0498b97ff9bc0183cd7391b5c86590ffc8234d823a743688a833ffcbe83797fd679 SHA512 e565fff30bc7214ae48548ae726544be3c8b09455a8c78a9e30410fd6cffe3b04b2e5c7f54381fa4190aa8adb259243b7d6443b6760c038ed8347edfed1ba997
+DIST boinc-7.9.3.tar.gz 49628586 BLAKE2B a053645f5e5c41610863c19be028963fb2e92fc0015b9df5377e734af968f1a70e4913cdc2052fd4a396dd1a9a782464e3ffc96a4b59a166f25c387de4c30d6d SHA512 d85880ec8e58d53af2cc5c9e357a29fbefe149450f33dea6fed5847b8e8c8bd9c9c5a309180c801c77fbedd740ebef83c1b410e8bc514e35fe210af57552bad5
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046

diff --git a/sci-misc/boinc/boinc-7.9.3.ebuild b/sci-misc/boinc/boinc-7.9.3.ebuild
new file mode 100644
index 00000000000..784d06069db
--- /dev/null
+++ b/sci-misc/boinc/boinc-7.9.3.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0-gtk3
+
+inherit autotools eutils gnome2-utils linux-info systemd user wxwidgets
+
+MY_PV="7.10"
+
+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? ( 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"
+
+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.
+COMMON_DEPEND="
+	>=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_libressl(-)=,-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/libnotify-0.7
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit]
+	)
+"
+DEPEND="${RDEPEND}
+	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}"/${MY_PV}-fix_xlocale.patch
+)
+
+S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
+
+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() {
+	default
+
+	# prevent bad changes in compile flags, bug 286701
+	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
+
+	eautoreconf
+
+	use X && need-wxwidgets unicode
+}
+
+src_configure() {
+	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
+			convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png || die
+			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 -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}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	enewgroup ${PN}
+	# note this works only for first install so we have to
+	# elog user about the need of being in video group
+	local groups="${PN}"
+	if use cuda; then
+		groups+=",video"
+	fi
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
+}
+
+pkg_postinst() {
+	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_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
+	if use cuda; then
+		elog "To be able to use CUDA you should add boinc user to video group."
+		elog "Run as root:"
+		elog "gpasswd -a boinc video"
+		elog
+	fi
+	# 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 [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_icon_cache_update
+	fi
+}

diff --git a/sci-misc/boinc/files/7.10-fix_xlocale.patch b/sci-misc/boinc/files/7.10-fix_xlocale.patch
new file mode 100644
index 00000000000..6d2360138f8
--- /dev/null
+++ b/sci-misc/boinc/files/7.10-fix_xlocale.patch
@@ -0,0 +1,37 @@
+--- a/configure.ac	2018-03-21 12:08:02.287768932 +0100
++++ b/configure.ac	2018-03-21 12:09:32.918771652 +0100
+@@ -592,7 +592,7 @@
+    echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS" >&5
+    echo "DEBUG: GLUT_LIBS = $GLUT_LIBS" >&5
+ 
+-   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h xlocale.h])
++   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h])
+ 
+    AC_CHECK_LIB([jpeg], [jpeg_start_compress],[have_jpeg=1],[have_jpeg=0])
+    AC_CHECK_HEADER([jpeglib.h],[have_jpeg=1],[have_jpeg=0])
+--- a/lib/gui_rpc_client.h	2018-03-21 12:07:51.300768602 +0100
++++ b/lib/gui_rpc_client.h	2018-03-21 12:09:11.671771015 +0100
+@@ -810,8 +810,8 @@
+ 
+ #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)
+ // uselocale() is not available in OS 10.3.9 so use weak linking
+-#if HAVE_XLOCALE_H
+-#include <xlocale.h>
++#if HAVE_LOCALE_H
++#include <locale.h>
+ #endif
+ extern int		freelocale(locale_t) __attribute__((weak_import));
+ extern locale_t	newlocale(int, __const char *, locale_t) __attribute__((weak_import));
+--- a/clientgui/AsyncRPC.cpp	2018-03-21 12:08:17.241769380 +0100
++++ b/clientgui/AsyncRPC.cpp	2018-03-21 12:08:50.664770384 +0100
+@@ -19,8 +19,8 @@
+ #pragma implementation "AsyncRPC.h"
+ #endif
+ 
+-#if HAVE_XLOCALE_H
+-#include <xlocale.h>
++#if HAVE_LOCALE_H
++#include <locale.h>
+ #endif
+ 
+ #include "stdwx.h"


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/
@ 2021-01-18 13:38 Joonas Niilola
  0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2021-01-18 13:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e9b2020e1f608225d8fd30a16b4b7a1dcb9f214f
Author:     Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Sun Nov  8 14:21:41 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 13:37:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b2020e

sci-misc/boinc: V7.16.14 bump, EAPI 7 upgrade, bug fixes, GLEP 81

This version bump also fixes the following issues:
* The user/group management is now done according to GLEP 81
* /etc/init.d/boinc: Ensure correct RUNTIMEDIR permissions (#684074)
* /etc/init.d/boinc: The password does no longer need to be submitted
* Hardcoded library search paths to /lib and /usr/lib have been
  removed or switched to /lib64 and /usr/lib64, if those are the
  regular library directories on the emerging system. (#732024)

Closes: https://bugs.gentoo.org/684074
Closes: https://bugs.gentoo.org/717580
Closes: https://bugs.gentoo.org/732024
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sven Eden <sven.eden <AT> prydeworx.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sci-misc/boinc/Manifest                            |   1 +
 sci-misc/boinc/boinc-7.16.14.ebuild                | 205 +++++++++++++++++++++
 sci-misc/boinc/files/boinc-7.16-fix_webview.patch  |  11 ++
 .../boinc/files/boinc-7.16-remove-usr_lib.patch    |  89 +++++++++
 sci-misc/boinc/files/boinc.init.in                 |  53 +-----
 sci-misc/boinc/metadata.xml                        |  44 +++--
 6 files changed, 342 insertions(+), 61 deletions(-)

diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index a1b9dd4a5e7..c9a98cfa036 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,4 +1,5 @@
 DIST boinc-7.14.2.tar.gz 52236336 BLAKE2B fa97d3af9e9a650db409b24386e7950369ab2247469cd83d717d1b6dccb7952a0997763dad2285532cef6807f0460eb320edb3a162b6b20a70bae12159ec6b7f SHA512 dcb6d60893e8baad6282d5e4728387352e942375d988df9c2ad00022deaa9bc5ace967a1346e1b43b25342d2e477ab42e28640935d94e6950ee3716732c9c1af
+DIST boinc-7.16.14.tar.gz 49623696 BLAKE2B dde4163040d122cf4707e4747b18120f64c31af5ea4ca778709d9dd3c2fb019eb10ecb6ee367b73ea245cb5ed93bac710f268db2e0408b32120c750915473575 SHA512 9315cd8344571ac64eecf12676a2d3d6c021577ecee7a92eff253185f7ddf5bf4d64503a819c625afafd258ad28c3879839016c431aa3099083a90194c7e6454
 DIST boinc-7.8.6.tar.gz 52037690 BLAKE2B 21d356488d8ea7e665f1b47e8ef0a0055d8b1a11e6e2aeea0b0ee7839fc7c0498b97ff9bc0183cd7391b5c86590ffc8234d823a743688a833ffcbe83797fd679 SHA512 e565fff30bc7214ae48548ae726544be3c8b09455a8c78a9e30410fd6cffe3b04b2e5c7f54381fa4190aa8adb259243b7d6443b6760c038ed8347edfed1ba997
 DIST boinc-7.9.3.tar.gz 49628586 BLAKE2B a053645f5e5c41610863c19be028963fb2e92fc0015b9df5377e734af968f1a70e4913cdc2052fd4a396dd1a9a782464e3ffc96a4b59a166f25c387de4c30d6d SHA512 d85880ec8e58d53af2cc5c9e357a29fbefe149450f33dea6fed5847b8e8c8bd9c9c5a309180c801c77fbedd740ebef83c1b410e8bc514e35fe210af57552bad5
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046

diff --git a/sci-misc/boinc/boinc-7.16.14.ebuild b/sci-misc/boinc/boinc-7.16.14.ebuild
new file mode 100644
index 00000000000..409c97fc025
--- /dev/null
+++ b/sci-misc/boinc/boinc-7.16.14.ebuild
@@ -0,0 +1,205 @@
+# 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 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 ~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_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.
+COMMON_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_libressl(-)=,-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
+	)
+"
+DEPEND="${RDEPEND}
+	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}"/${PN}-${MY_PV}-fix_webview.patch
+	# bug #732024
+	"${FILESDIR}"/${PN}-${MY_PV}-remove-usr_lib.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
+
+	use X && setup-wxwidgets
+
+	# bug #732024
+	if test "x$(get_libdir)" = "xlib64"; then
+	    sed -i -e 's,/lib\([ /;:"]\),/lib64\1,g' configure || die
+	fi
+}
+
+src_configure() {
+	LDFLAGS="-L${EPREFIX}/usr/$(get_libdir) -L${EPREFIX}/$(get_libdir) ${LDFLAGS}" \
+	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
+			convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png || die
+			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 -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}
+	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.16-fix_webview.patch b/sci-misc/boinc/files/boinc-7.16-fix_webview.patch
new file mode 100644
index 00000000000..4f58b2725b3
--- /dev/null
+++ b/sci-misc/boinc/files/boinc-7.16-fix_webview.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2020-11-08 00:31:06.304751639 +0100
++++ b/configure.ac	2020-11-08 00:32:03.848754956 +0100
+@@ -1238,7 +1238,7 @@
+     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

diff --git a/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch b/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch
new file mode 100644
index 00000000000..c9750a03b66
--- /dev/null
+++ b/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch
@@ -0,0 +1,89 @@
+--- a/m4/ax_check_glut.m4	2020-11-08 01:03:40.797864295 +0100
++++ b/m4/ax_check_glut.m4	2020-11-08 01:04:53.407868481 +0100
+@@ -41,7 +41,7 @@
+     else
+       ax_try_lib="${ax_lib}"
+     fi
+-    LIBS="-L${prefix}/lib ${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
++    LIBS="${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
+     AC_LINK_IFELSE(
+     [AC_LANG_PROGRAM([[
+ #define FREEGLUT_STATIC 1
+@@ -50,7 +50,7 @@
+ # endif
+ # include <GL/glut.h>]],
+                      [[glutMainLoop()]])],
+-    [ax_cv_check_glut_libglut="-L${prefix}/lib ${ax_try_lib}"; break])
++    [ax_cv_check_glut_libglut="${ax_try_lib}"; break])
+ 
+   done
+   LIBS=${ax_save_LIBS}
+--- a/m4/ax_check_glu.m4	2020-11-08 01:03:48.221864723 +0100
++++ b/m4/ax_check_glu.m4	2020-11-08 01:04:53.405868480 +0100
+@@ -19,7 +19,7 @@
+     else
+       ax_try_lib="${ax_lib}"
+     fi
+-    LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
++    LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+     #
+     # libGLU typically links with libstdc++ on POSIX platforms. However,
+     # setting the language to C++ means that test program source is named
+@@ -37,7 +37,7 @@
+ # endif
+ # include <GL/glu.h>]],
+                      [[gluBeginCurve(0)]])],
+-    [ax_cv_check_glu_libglu="-L${prefix}/lib ${ax_try_lib}"; break])
++    [ax_cv_check_glu_libglu="${ax_try_lib}"; break])
+     if test X$ax_compiler_ms = Xyes; then
+       AC_LANG_POP([C])
+     fi
+--- a/m4/ax_check_gl.m4	2020-11-08 01:03:57.178865240 +0100
++++ b/m4/ax_check_gl.m4	2020-11-08 01:04:53.401868480 +0100
+@@ -39,7 +39,7 @@
+       GL_CFLAGS="-I${x_includes} -I${prefix}/include ${GL_CFLAGS}"
+     fi
+     if test -n "$x_libraries"; then
+-      GL_LIBS="-L${x_libraries} -L${prefix}/lib -lX11 ${GL_LIBS}"
++      GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}"
+     fi
+   fi
+ 
+@@ -58,7 +58,7 @@
+     else
+       ax_try_lib="${ax_lib}"
+     fi
+-    LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
++    LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+     AC_LINK_IFELSE(
+     [AC_LANG_PROGRAM([[
+ # if HAVE_WINDOWS_H && defined(_WIN32)
+@@ -66,7 +66,7 @@
+ # endif
+ # include <GL/gl.h>]],
+                      [[glBegin(0)]])],
+-    [ax_cv_check_gl_libgl="-L${prefix}/lib ${ax_try_lib}"; break])
++    [ax_cv_check_gl_libgl="${ax_try_lib}"; break])
+   done
+   LIBS=${ax_save_LIBS}
+   CPPFLAGS=${ax_save_CPPFLAGS}])
+--- a/m4/check_ssl.m4	2020-11-11 08:29:37.638655925 +0100
++++ b/m4/check_ssl.m4	2020-11-11 08:31:28.319659865 +0100
+@@ -46,7 +46,7 @@
+       SSLDIR="${ssldir}"
+       SSL_CFLAGS="-I$ssldir/include -I$ssldir/include/openssl";
+       SSL_CXXFLAGS="-I$ssldir/include -I$ssldir/include/openssl";
+-      SSL_LIBS="-L$ssldir -L$ssldir/lib -lssl -lcrypto"
++      SSL_LIBS="-lssl -lcrypto"
+       AC_CHECK_LIB([dl], [dlopen], 
+           [SSL_LIBS="${SSL_LIBS} ${sah_lib_last}"])
+       AC_CHECK_LIB([z], [gzopen], 
+@@ -58,7 +58,7 @@
+       SSLDIR="${ssldir}"
+       SSL_CFLAGS="-I$ssldir/include/"
+       SSL_CXXFLAGS="-I$ssldir/include/"
+-      SSL_LIBS="-L$ssldir -L$ssldir/lib -lssl -lcrypto"
++      SSL_LIBS="-lssl -lcrypto"
+       AC_CHECK_LIB([dl], [dlopen], 
+           [SSL_LIBS="${SSL_LIBS} ${sah_lib_last}"])
+       AC_CHECK_LIB([z], [gzopen], 

diff --git a/sci-misc/boinc/files/boinc.init.in b/sci-misc/boinc/files/boinc.init.in
index b46a06e3d38..763b6969444 100644
--- a/sci-misc/boinc/files/boinc.init.in
+++ b/sci-misc/boinc/files/boinc.init.in
@@ -18,12 +18,12 @@ create_work_directory() {
 			eerror "Directory ${RUNTIMEDIR} could not be created!"
 			return 1
 		fi
+	fi
 
-		# ensure proper ownership
-		if ! chown "${USER}:${GROUP}" "${RUNTIMEDIR}"; then
-			eerror "Changing ownership of '${RUNTIMEDIR}' to '${USER}:${GROUP}' failed!"
-			return 1
-		fi
+	# ensure proper ownership
+	if ! chown "${USER}:${GROUP}" "${RUNTIMEDIR}"; then
+		eerror "Changing ownership of '${RUNTIMEDIR}' to '${USER}:${GROUP}' failed!"
+		return 1
 	fi
 
 	if [ ! -e "${RUNTIMEDIR}"/ca-bundle.crt ]; then
@@ -117,17 +117,6 @@ env_check() {
 	return 0
 }
 
-need_passwd_arg() {
-	local vers=$(${BOINCBIN} --version | tr -d .)
-	[ -z "${vers}" ] && vers="00"
-	[ $(expr substr "${vers}" 1 2) -lt 74 ] && return 0
-
-	# From version 7.4 on, the default is to read
-	# gui_rpc_auth.cfg for the password.
-
-	return 1
-}
-
 start_pre() {
 	env_check || return 1
 	create_work_directory || return 1
@@ -164,7 +153,6 @@ start() {
 }
 
 attach() {
-	local password=""
 	local url=""
 	local key=""
 
@@ -182,14 +170,10 @@ attach() {
 		"${RC_SERVICE}" start
 	fi
 
-	if need_passwd_arg; then
-		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
-	fi
-
 	ebegin "${RC_SVCNAME}: Attaching to project"
 	start-stop-daemon --user "${USER}:${GROUP}" --quiet \
 		--chdir "${RUNTIMEDIR}" --exec "${BOINCCMD}" \
-		-- ${password} --project_attach ${url} ${key}
+		-- --project_attach ${url} ${key}
 	eend $?
 
 	sleep 10
@@ -197,15 +181,10 @@ attach() {
 }
 
 stop() {
-	local password=""
 	local stop_timeout="SIGTERM/60/SIGTERM/30/SIGKILL/30"
 
 	env_check || return 1
 
-	if need_passwd_arg; then
-		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
-	fi
-
 	ebegin "Stopping ${RC_SVCNAME}"
 	start-stop-daemon --stop --quiet --progress \
 		--retry ${stop_timeout} \
@@ -216,19 +195,13 @@ stop() {
 resume() {
 	env_check || return 1
 
-	local password=""
-
-	if need_passwd_arg; then
-		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
-	fi
-
 	for url in $(cd "${RUNTIMEDIR}" ; \
-		  "${BOINCCMD}" ${password} --get_project_status | \
+		  "${BOINCCMD}" --get_project_status | \
 		  sed -n 's/\s*master URL: //p'); do
 		ebegin "Resuming ${url}"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \
 			--chdir "${RUNTIMEDIR}" --exec "${BOINCCMD}" \
-			-- ${password} --project ${url} resume
+			-- --project ${url} resume
 		eend $?
 	done
 }
@@ -236,19 +209,13 @@ resume() {
 suspend() {
 	env_check || return 1
 
-	local password=""
-
-	if need_passwd_arg; then
-		password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\""
-	fi
-
 	for url in $(cd "${RUNTIMEDIR}" ; \
-		  "${BOINCCMD}" ${password} --get_project_status | \
+		  "${BOINCCMD}" --get_project_status | \
 		  sed -n 's/\s*master URL: //p'); do
 		ebegin "Suspending ${url}"
 		start-stop-daemon --user "${USER}:${GROUP}" --quiet \
 			--chdir "${RUNTIMEDIR}" --exec "${BOINCCMD}" \
-			-- ${password} --project ${url} suspend
+			-- --project ${url} suspend
 		eend $?
 	done
 }

diff --git a/sci-misc/boinc/metadata.xml b/sci-misc/boinc/metadata.xml
index ca04e552419..3d995182329 100644
--- a/sci-misc/boinc/metadata.xml
+++ b/sci-misc/boinc/metadata.xml
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-<longdescription lang="en">
-  BOINC (Berkeley Open Infrastructure for Network Computing) is a software
-  platform for distributed computing using volunteered computer resources.
-</longdescription>
-  <use>
-    <flag name="cuda">
-  Use nvidia cuda toolkit for speeding up computations.
-  NOTE: works only for subset of nvidia graphic cards so make sure your card
-  is supported before opening a bug about it.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">BOINC/boinc</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		BOINC (Berkeley Open Infrastructure for Network Computing) is a software
+		platform for distributed computing using volunteered computer resources.
+	</longdescription>
+	<use>
+		<flag name="cuda">
+			Use nvidia cuda toolkit for speeding up computations.
+			NOTE: works only for subset of nvidia graphic cards so make sure your card
+			is supported before opening a bug about it.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">BOINC/boinc</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 11+ messages in thread

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

commit:     b278d4d538bec7ca3673a51b8bb38a86b8432555
Author:     Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Tue Apr 19 11:07:59 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 10:22:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b278d4d5

sci-misc/boinc: drop 7.16.17

Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/25064
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sci-misc/boinc/Manifest                            |   1 -
 sci-misc/boinc/boinc-7.16.17.ebuild                | 207 ---------------------
 sci-misc/boinc/files/boinc-7.16-fix_webview.patch  |  11 --
 .../boinc/files/boinc-7.16-remove-usr_lib.patch    |  89 ---------
 4 files changed, 308 deletions(-)

diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 02edd84d7b4e..97a54e30850d 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,3 +1,2 @@
-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.16.17.ebuild b/sci-misc/boinc/boinc-7.16.17.ebuild
deleted file mode 100644
index 44f5b5d810ad..000000000000
--- a/sci-misc/boinc/boinc-7.16.17.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# 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.16-fix_webview.patch b/sci-misc/boinc/files/boinc-7.16-fix_webview.patch
deleted file mode 100644
index 4f58b2725b31..000000000000
--- a/sci-misc/boinc/files/boinc-7.16-fix_webview.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2020-11-08 00:31:06.304751639 +0100
-+++ b/configure.ac	2020-11-08 00:32:03.848754956 +0100
-@@ -1238,7 +1238,7 @@
-     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

diff --git a/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch b/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch
deleted file mode 100644
index c9750a03b666..000000000000
--- a/sci-misc/boinc/files/boinc-7.16-remove-usr_lib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/m4/ax_check_glut.m4	2020-11-08 01:03:40.797864295 +0100
-+++ b/m4/ax_check_glut.m4	2020-11-08 01:04:53.407868481 +0100
-@@ -41,7 +41,7 @@
-     else
-       ax_try_lib="${ax_lib}"
-     fi
--    LIBS="-L${prefix}/lib ${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
-+    LIBS="${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
-     AC_LINK_IFELSE(
-     [AC_LANG_PROGRAM([[
- #define FREEGLUT_STATIC 1
-@@ -50,7 +50,7 @@
- # endif
- # include <GL/glut.h>]],
-                      [[glutMainLoop()]])],
--    [ax_cv_check_glut_libglut="-L${prefix}/lib ${ax_try_lib}"; break])
-+    [ax_cv_check_glut_libglut="${ax_try_lib}"; break])
- 
-   done
-   LIBS=${ax_save_LIBS}
---- a/m4/ax_check_glu.m4	2020-11-08 01:03:48.221864723 +0100
-+++ b/m4/ax_check_glu.m4	2020-11-08 01:04:53.405868480 +0100
-@@ -19,7 +19,7 @@
-     else
-       ax_try_lib="${ax_lib}"
-     fi
--    LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
-+    LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
-     #
-     # libGLU typically links with libstdc++ on POSIX platforms. However,
-     # setting the language to C++ means that test program source is named
-@@ -37,7 +37,7 @@
- # endif
- # include <GL/glu.h>]],
-                      [[gluBeginCurve(0)]])],
--    [ax_cv_check_glu_libglu="-L${prefix}/lib ${ax_try_lib}"; break])
-+    [ax_cv_check_glu_libglu="${ax_try_lib}"; break])
-     if test X$ax_compiler_ms = Xyes; then
-       AC_LANG_POP([C])
-     fi
---- a/m4/ax_check_gl.m4	2020-11-08 01:03:57.178865240 +0100
-+++ b/m4/ax_check_gl.m4	2020-11-08 01:04:53.401868480 +0100
-@@ -39,7 +39,7 @@
-       GL_CFLAGS="-I${x_includes} -I${prefix}/include ${GL_CFLAGS}"
-     fi
-     if test -n "$x_libraries"; then
--      GL_LIBS="-L${x_libraries} -L${prefix}/lib -lX11 ${GL_LIBS}"
-+      GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}"
-     fi
-   fi
- 
-@@ -58,7 +58,7 @@
-     else
-       ax_try_lib="${ax_lib}"
-     fi
--    LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
-+    LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
-     AC_LINK_IFELSE(
-     [AC_LANG_PROGRAM([[
- # if HAVE_WINDOWS_H && defined(_WIN32)
-@@ -66,7 +66,7 @@
- # endif
- # include <GL/gl.h>]],
-                      [[glBegin(0)]])],
--    [ax_cv_check_gl_libgl="-L${prefix}/lib ${ax_try_lib}"; break])
-+    [ax_cv_check_gl_libgl="${ax_try_lib}"; break])
-   done
-   LIBS=${ax_save_LIBS}
-   CPPFLAGS=${ax_save_CPPFLAGS}])
---- a/m4/check_ssl.m4	2020-11-11 08:29:37.638655925 +0100
-+++ b/m4/check_ssl.m4	2020-11-11 08:31:28.319659865 +0100
-@@ -46,7 +46,7 @@
-       SSLDIR="${ssldir}"
-       SSL_CFLAGS="-I$ssldir/include -I$ssldir/include/openssl";
-       SSL_CXXFLAGS="-I$ssldir/include -I$ssldir/include/openssl";
--      SSL_LIBS="-L$ssldir -L$ssldir/lib -lssl -lcrypto"
-+      SSL_LIBS="-lssl -lcrypto"
-       AC_CHECK_LIB([dl], [dlopen], 
-           [SSL_LIBS="${SSL_LIBS} ${sah_lib_last}"])
-       AC_CHECK_LIB([z], [gzopen], 
-@@ -58,7 +58,7 @@
-       SSLDIR="${ssldir}"
-       SSL_CFLAGS="-I$ssldir/include/"
-       SSL_CXXFLAGS="-I$ssldir/include/"
--      SSL_LIBS="-L$ssldir -L$ssldir/lib -lssl -lcrypto"
-+      SSL_LIBS="-lssl -lcrypto"
-       AC_CHECK_LIB([dl], [dlopen], 
-           [SSL_LIBS="${SSL_LIBS} ${sah_lib_last}"])
-       AC_CHECK_LIB([z], [gzopen], 


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/
@ 2022-08-01 10:30 Florian Schmaus
  0 siblings, 0 replies; 11+ messages in thread
From: Florian Schmaus @ 2022-08-01 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     b95bc9d5e8e3d87f75c2cc56822b184eec299a45
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 10:23:38 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 10:28:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95bc9d5

sci-misc/boinc: fix newinit call

That one is on me.

My last-minute modifcation of b19f0b8c6415 ("sci-misc/boinc: Simplify
the init script") did not respect that the removed sed was not using
--in-place.

Fixes: b19f0b8c6415 ("sci-misc/boinc: Simplify the init script")
Closes: https://bugs.gentoo.org/862783
Closes: https://bugs.gentoo.org/862786
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sci-misc/boinc/boinc-7.20.2-r2.ebuild              | 2 +-
 sci-misc/boinc/boinc-9999.ebuild                   | 2 +-
 sci-misc/boinc/files/{boinc.init.in => boinc.init} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/boinc/boinc-7.20.2-r2.ebuild b/sci-misc/boinc/boinc-7.20.2-r2.ebuild
index f14534027d69..f7d156f21794 100644
--- a/sci-misc/boinc/boinc-7.20.2-r2.ebuild
+++ b/sci-misc/boinc/boinc-7.20.2-r2.ebuild
@@ -161,7 +161,7 @@ src_install() {
 	rm -r "${ED}"/etc || die "rm failed"
 	find "${D}" -name '*.la' -delete || die "Removing .la files failed"
 
-	newinitd ${PN}.init ${PN}
+	newinitd "${FILESDIR}"/${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 07b9716f2970..bb39d825d04c 100644
--- a/sci-misc/boinc/boinc-9999.ebuild
+++ b/sci-misc/boinc/boinc-9999.ebuild
@@ -164,7 +164,7 @@ src_install() {
 	rm -r "${ED}"/etc || die "rm failed"
 	find "${D}" -name '*.la' -delete || die "Removing .la files failed"
 
-	newinitd ${PN}.init ${PN}
+	newinitd "${FILESDIR}"/${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
similarity index 100%
rename from sci-misc/boinc/files/boinc.init.in
rename to sci-misc/boinc/files/boinc.init


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-08-01 10:30 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-23 10:24 [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/, sci-misc/boinc/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2022-08-01 10:30 Florian Schmaus
2021-01-18 13:38 Joonas Niilola
2018-04-24 21:57 Andreas Sturmlechner
2017-12-27 11:56 Mart Raudsepp
2017-07-05  9:11 Michał Górny
2017-06-04 17:03 Michał Górny
2016-11-12 15:39 David Seifert
2016-11-12 15:39 David Seifert
2016-05-05 12:44 David Seifert
2016-05-04 22:01 David Seifert

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