sys-apps/firetools : EAPI bump

4 files changed, 22 insertions, 33 deletions

diff --git a/metadata/md5-cache/sys-apps/firetools-0.9.46 b/metadata/md5-cache/sys-apps/firetools-0.9.46
deleted file mode 100644
index 45f9b823..00000000
--- a/metadata/md5-cache/sys-apps/firetools-0.9.46
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=|| ( sys-apps/firejail sys-apps/firejail-lts ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 ) x11-terms/xterm sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Graphical user interface of app-emulation/firejail
-EAPI=6
-HOMEPAGE=https://l3net.wordpress.com/projects/firejail
-INHERIT=autotools
-IUSE=qt4 qt5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=|| ( sys-apps/firejail sys-apps/firejail-lts ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 ) x11-terms/xterm
-REQUIRED_USE=^^ ( qt4 qt5 )
-SLOT=0
-SRC_URI=https://github.com/netblue30/firetools/archive/0.9.46.tar.gz -> firetools-0.9.46.tar.gz
-_eclasses_=autotools	ed3ef2014ee93d24bde80f0c0ea9732e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cc968f137edf5947c1b9905e14b1e561
diff --git a/metadata/md5-cache/sys-apps/firetools-0.9.46-r1 b/metadata/md5-cache/sys-apps/firetools-0.9.46-r1
new file mode 100644
index 00000000..89b35a69
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/firetools-0.9.46-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=|| ( sys-apps/firejail sys-apps/firejail-lts ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 x11-terms/xterm
+DESCRIPTION=Graphical user interface of app-emulation/firejail
+EAPI=7
+HOMEPAGE=https://l3net.wordpress.com/projects/firejail
+INHERIT=qmake-utils
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=|| ( sys-apps/firejail sys-apps/firejail-lts ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 x11-terms/xterm
+SLOT=0
+SRC_URI=https://github.com/netblue30/firetools/archive/0.9.46.tar.gz -> firetools-0.9.46.tar.gz
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=0e045f1c9a1fd4d2de6ed0aa0c8474a0
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 07aaa40f..354f926c 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -39,7 +39,7 @@ net-libs/webkit-gtk 2.34.1-r100: Open source web browser engine
 net-wireless/broadcom-sta 6.30.223.271-r2: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
 net-wireless/rtl8821cu 5.8.1: Realtek RTL8821CU USB Wi-Fi adapter driver for Linux
 sys-apps/baselayout 2.7-r11: Filesystem baselayout and init scripts
-sys-apps/firetools 0.9.46: Graphical user interface of app-emulation/firejail
+sys-apps/firetools 0.9.46-r1: Graphical user interface of app-emulation/firejail
 sys-apps/lsb-release 1.4-r11: LSB version query program
 sys-apps/openrc 0.42.1-r7: OpenRC manages the services, startup and shutdown of a host
 sys-auth/elogind 246.10-r10: The systemd project's logind, extracted to a standalone package
diff --git a/sys-apps/firetools/firetools-0.9.46.ebuild b/sys-apps/firetools/firetools-0.9.46-r1.ebuild
index e94d1bbd..17121ff3 100644
--- a/sys-apps/firetools/firetools-0.9.46.ebuild
+++ b/sys-apps/firetools/firetools-0.9.46-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools
+inherit qmake-utils
 
 DESCRIPTION="Graphical user interface of app-emulation/firejail"
 HOMEPAGE="https://l3net.wordpress.com/projects/firejail"
@@ -12,28 +12,19 @@ SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
+IUSE=""
 DEPEND="
 	|| (
 		sys-apps/firejail
 		sys-apps/firejail-lts
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
 	x11-terms/xterm
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	default
-	eautoreconf
+src_configure() {
+	econf --with-qmake="$(qt5_get_bindir)"/qmake
 }