[gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/, sci-misc/boinc/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

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

sci-misc/boinc: 7.8.6 version bump

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

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

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

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

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

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

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

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