[gentoo-commits] repo/gentoo:master commit in: app-text/searchmonkey/files/, app-text/searchmonkey/

[David Seifert]

commit:     f89080ade0695b072ef63d3b25dca88a22a68c4f
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon Jul 31 22:32:59 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:09:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f89080ad

app-text/searchmonkey: Fix building with GCC-6 and EAPI bump

Bug: https://bugs.gentoo.org/show_bug.cgi?id=602166
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5260

 .../searchmonkey/files/searchmonkey-2.0.0-gcc6.patch    | 14 ++++++++++++++
 ...monkey-2.0.0.ebuild => searchmonkey-2.0.0-r1.ebuild} | 17 ++++++++++++-----
 app-text/searchmonkey/searchmonkey-2.0.0.ebuild         |  7 +++++--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch
new file mode 100644
index 00000000000..ede01afa39e
--- /dev/null
+++ b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/602166
+
+diff -Naur a/mainwindow.cpp b/mainwindow.cpp
+--- a/mainwindow.cpp	2017-07-31 18:06:33.206668001 -0400
++++ b/mainwindow.cpp	2017-07-31 18:07:09.685940997 -0400
+@@ -781,7 +781,7 @@
+  ******************************************************************************/
+ void MainWindow::find  () throw() {
+ 
+-	auto autoSettingsReset asr(sui);  // dtor calls sui->reset()
++	autoSettingsReset asr(sui);  // dtor calls sui->reset()
+ 
+ 	bool modeAdvanced = ui->actionAdvanced->isChecked();
+ 	qDebug() << "modeAdvanced-" << modeAdvanced;

diff --git a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild
similarity index 75%
copy from app-text/searchmonkey/searchmonkey-2.0.0.ebuild
copy to app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild
index 86dd56320b3..34061ebf525 100644
--- a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
+++ b/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit qt4-r2
+inherit eutils qmake-utils
 
 MY_PN=${PN}2
 MY_P=${PN}_v${PV}
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/S${MY_PN:1}/${PV}%20%5Bstable%5D/${M
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -26,7 +26,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-gcc4.7.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4.7.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_compile() {
+	eqmake4
+}
 
 src_install() {
 	newbin ${PN} ${MY_PN}

diff --git a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
index 86dd56320b3..c69ce672912 100644
--- a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
+++ b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-gcc4.7.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4.7.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_install() {
 	newbin ${PN} ${MY_PN}