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

["David Seifert" <soap@gentoo.org>]

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

sci-misc/boinc: Update to EAPI 6

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.2.44.ebuild |  8 +++++---
 sci-misc/boinc/boinc-7.4.52.ebuild | 13 ++++++++++---
 sci-misc/boinc/boinc-7.6.33.ebuild | 13 ++++++++++---
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/sci-misc/boinc/boinc-7.2.44.ebuild b/sci-misc/boinc/boinc-7.2.44.ebuild
index c36fd44..7503d03 100644
--- a/sci-misc/boinc/boinc-7.2.44.ebuild
+++ b/sci-misc/boinc/boinc-7.2.44.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 WX_GTK_VER=2.8
 
-inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets
+inherit autotools eutils linux-info systemd user versionator wxwidgets
 
 MY_PV=$(get_version_component_range 1-2)
 
@@ -77,6 +77,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# prevent bad changes in compile flags, bug 286701
 	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
 
@@ -121,7 +123,7 @@ pkg_preinst() {
 	# elog user about the need of being in video group
 	local groups="${PN}"
 	if use cuda; then
-		group+=",video"
+		groups+=",video"
 	fi
 	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
 }

diff --git a/sci-misc/boinc/boinc-7.4.52.ebuild b/sci-misc/boinc/boinc-7.4.52.ebuild
index 3daf627..52326a2 100644
--- a/sci-misc/boinc/boinc-7.4.52.ebuild
+++ b/sci-misc/boinc/boinc-7.4.52.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 WX_GTK_VER=3.0
 
-inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets
+inherit autotools eutils linux-info systemd user versionator wxwidgets
 
 MY_PV=$(get_version_component_range 1-2)
 
@@ -51,6 +51,11 @@ DEPEND="${RDEPEND}
 	app-text/docbook2X
 "
 
+PATCHES=(
+	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
+	"${FILESDIR}"/fix_webview.patch
+)
+
 S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 
 pkg_setup() {
@@ -77,6 +82,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# prevent bad changes in compile flags, bug 286701
 	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
 
@@ -121,7 +128,7 @@ pkg_preinst() {
 	# elog user about the need of being in video group
 	local groups="${PN}"
 	if use cuda; then
-		group+=",video"
+		groups+=",video"
 	fi
 	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
 }

diff --git a/sci-misc/boinc/boinc-7.6.33.ebuild b/sci-misc/boinc/boinc-7.6.33.ebuild
index 3daf627..52326a2 100644
--- a/sci-misc/boinc/boinc-7.6.33.ebuild
+++ b/sci-misc/boinc/boinc-7.6.33.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 WX_GTK_VER=3.0
 
-inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets
+inherit autotools eutils linux-info systemd user versionator wxwidgets
 
 MY_PV=$(get_version_component_range 1-2)
 
@@ -51,6 +51,11 @@ DEPEND="${RDEPEND}
 	app-text/docbook2X
 "
 
+PATCHES=(
+	# >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462
+	"${FILESDIR}"/fix_webview.patch
+)
+
 S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 
 pkg_setup() {
@@ -77,6 +82,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# prevent bad changes in compile flags, bug 286701
 	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
 
@@ -121,7 +128,7 @@ pkg_preinst() {
 	# elog user about the need of being in video group
 	local groups="${PN}"
 	if use cuda; then
-		group+=",video"
+		groups+=",video"
 	fi
 	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
 }