From 2018227e9344edb9da15fc6a4a8298086cc2aa77 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 2 Jun 2019 21:45:28 +0100
Subject: gentoo resync : 02.06.2019

---
 media-sound/fmit/Manifest              |  2 +-
 media-sound/fmit/fmit-1.0.15-r1.ebuild | 55 --------------------------------
 media-sound/fmit/fmit-1.0.15-r2.ebuild | 58 ++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 56 deletions(-)
 delete mode 100644 media-sound/fmit/fmit-1.0.15-r1.ebuild
 create mode 100644 media-sound/fmit/fmit-1.0.15-r2.ebuild

(limited to 'media-sound/fmit')

diff --git a/media-sound/fmit/Manifest b/media-sound/fmit/Manifest
index bd68e7ed6e86..a6c4a6d303bd 100644
--- a/media-sound/fmit/Manifest
+++ b/media-sound/fmit/Manifest
@@ -1,3 +1,3 @@
 DIST fmit-1.0.15.tar.gz 295365 BLAKE2B 9424c1fac390adc7fb8746ce05b354b31bc9f4ef8dc49bd8ca2c1362d9b57c1c0d8b10e110faae9d48363dd02f80967c767ade0e67096c27bcf5ae1c9d1fa8ca SHA512 44537669391f5043efe35b53d9693f8ab6a151918583d35439c1b29feca4a707225038512c9a2de734ada9e9acb3b4b191b866038edaed9fe8d1fee09c540aac
-EBUILD fmit-1.0.15-r1.ebuild 1568 BLAKE2B 4d0f1604ac942cb82384a887c2f8e2c0213eff0894b899711d56e6311474fa5644852bf86e1a5a1c4a941e374e5d1ef5aaedb6c31331226563c9ae1fd7678ad6 SHA512 d98a45e4207de40ead50af4dc46f533869428312d47cf97cdfbd1edb37c6972984d05f9ff9b609d5e50b433c26e4659b79ef41b6b0652bc859b0a0bbaa6fb9e0
+EBUILD fmit-1.0.15-r2.ebuild 1570 BLAKE2B 34c007975c899da4d94e4f8d4509c66937fed56e4cd3c84638b7e45465152d45b4dd133cc916cfd1f687af58870374eadf13bfc48626aaecb78c9155afde83bf SHA512 8aa800e5e6697e8560ea378b7f3e8fc2d8fa533d50eebefe6b703c96705b6573a1e3b3c800c57fd95b531683da82213fba7aa404825b9fd0230da217f29719bd
 MISC metadata.xml 251 BLAKE2B 41d57d683fe855b6ee6b161b1c9bcc193e33ed5c184df3738f693f0c078978a6d7bfde323243822cd5e0679122e6241158f0e6ecd237fe8f0e7e770c95d7fd19 SHA512 16072c41732d3c5486b4066a8f17cc829688c24772a002ea72c1deae3dcd78f4ee72bd7948782ca970fdb2e5cba66a16db205a384de036186814b2345f2f103c
diff --git a/media-sound/fmit/fmit-1.0.15-r1.ebuild b/media-sound/fmit/fmit-1.0.15-r1.ebuild
deleted file mode 100644
index d7e9c9594e38..000000000000
--- a/media-sound/fmit/fmit-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Free Music Instrument Tuner"
-HOMEPAGE="https://gillesdegottex.github.io/fmit"
-SRC_URI="https://github.com/gillesdegottex/fmit/archive/v${PV}.tar.gz \
-							-> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa jack oss portaudio"
-
-RDEPEND=">=sci-libs/fftw-3.3.4:3.0=
-	dev-qt/qtmultimedia:5
-	dev-qt/qtopengl:5
-	dev-qt/qtsvg:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )"
-
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_prepare() {
-	# Fix the path to readme file to prevent errors on start up
-	sed -i "/QFile readmefile/c\QFile readmefile \
-		(\"/usr/share/doc/${PF}/README.txt\");" \
-		src/main.cpp || die "README sed failed"
-	# Fix the PREFIX location, insert real path.
-	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
-		src/main.cpp || die "PREFIX fix sed failed"
-	# Fix the PREFIX location, insert real path.
-	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
-		src/modules/MicrotonalView.cpp || die "PREFIX fix sed failed"
-	default
-}
-
-src_configure() {
-	local config flag
-	for flag in alsa jack portaudio oss; do
-		use ${flag} && config+=" acs_${flag}"
-	done
-
-	"$(qt5_get_bindir)"/lrelease fmit.pro || die "Running lrelease failed"
-
-	eqmake5 CONFIG+="${config}" fmit.pro PREFIX="${D}"/usr \
-		PREFIXSHORTCUT="${D}"/usr DISTDIR=/usr
-}
diff --git a/media-sound/fmit/fmit-1.0.15-r2.ebuild b/media-sound/fmit/fmit-1.0.15-r2.ebuild
new file mode 100644
index 000000000000..163fafa5f86d
--- /dev/null
+++ b/media-sound/fmit/fmit-1.0.15-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Free Music Instrument Tuner"
+HOMEPAGE="https://gillesdegottex.github.io/fmit"
+SRC_URI="https://github.com/gillesdegottex/fmit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack oss portaudio"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=sci-libs/fftw-3.3.4:3.0=
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	portaudio? ( media-libs/portaudio )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+src_prepare() {
+	# Fix the path to readme file to prevent errors on start up
+	sed -i "/QFile readmefile/c\QFile readmefile \
+		(\"/usr/share/doc/${PF}/README.txt\");" \
+		src/main.cpp || die "README sed failed"
+	# Fix the PREFIX location, insert real path.
+	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
+		src/main.cpp || die "PREFIX fix sed failed"
+	# Fix the PREFIX location, insert real path.
+	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
+		src/modules/MicrotonalView.cpp || die "PREFIX fix sed failed"
+	default
+}
+
+src_configure() {
+	local config flag
+	for flag in alsa jack portaudio oss; do
+		use ${flag} && config+=" acs_${flag}"
+	done
+
+	"$(qt5_get_bindir)"/lrelease fmit.pro || die "Running lrelease failed"
+
+	eqmake5 CONFIG+="${config}" fmit.pro PREFIX="${D}"/usr \
+		PREFIXSHORTCUT="${D}"/usr DISTDIR=/usr
+}
-- 
cgit v1.2.3