| [proaudio] proaudio/proaudio: [3098] fmit: removed old version; 9999: general bump |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3098
Author: dominique
Date: 2017-08-14 12:07:39 +0200 (Mon, 14 Aug 2017)
Log Message:
-----------
fmit: removed old version; 9999: general bump
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/fmit/ChangeLog
trunk/overlays/proaudio/media-sound/fmit/Manifest
trunk/overlays/proaudio/media-sound/fmit/fmit-9999.ebuild
trunk/overlays/proaudio/media-sound/fmit/metadata.xml
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/fmit/fmit-0.99.2.ebuild
Modified: trunk/overlays/proaudio/media-sound/fmit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/fmit/ChangeLog 2017-08-13 18:35:37 UTC (rev 3097)
+++ trunk/overlays/proaudio/media-sound/fmit/ChangeLog 2017-08-14 10:07:39 UTC (rev 3098)
@@ -1,7 +1,10 @@
# ChangeLog for media-sound/fmit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+ 14 Aug 2017; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+ -fmit-0.99.2.ebuild: more recent version is in portage.
+ fmit-9999.ebuild: use git; general bump
+
04 Mar 2013; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
fmit-0.99.2.ebuild, fmit-9999.ebuild:
modify depends x11-libs/qt-* -> dev-qt/
Modified: trunk/overlays/proaudio/media-sound/fmit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/fmit/Manifest 2017-08-13 18:35:37 UTC (rev 3097)
+++ trunk/overlays/proaudio/media-sound/fmit/Manifest 2017-08-14 10:07:39 UTC (rev 3098)
@@ -1,5 +1,3 @@
-DIST fmit-0.99.2-Source.tar.bz2 156875 SHA256 234f927b09833b86a6889376983c431fd42b831b7b68d749b1234143b6f32383 SHA512 a5306380ba36a188edb2d3687ffb60c6e1aae07de03cba895715176d624cb438e900b8f5f4401a05d6dd788d52fc2e123e1cada4b0671dedc3f2d1b9fbaf088f WHIRLPOOL d2b840779b3b8456e1fe91327482f3b9df0496dfac04c313b4535ff8dd7a6d0cf6e936961967cdb66b2abd2d37b032b9feffe1bbffc5ca17e229a10f1ce80208
-EBUILD fmit-0.99.2.ebuild 1011 SHA256 c533796ec62132ddac098c8451ab6f23b3d76a4457be210e921da4cb803b4640 SHA512 ca93da14fd8b90415bc9396dbf046669d15af5d95853a02543b6afcac0c675f049da80111278266db0e75972ffda794421f32dd93db303b9dbfc22a65a406a1b WHIRLPOOL 9bf18ea9d62d71b084b57e4ec0e2ad5c0756d525f99cde04d8799da426cc29e6ffe2756726a5c1fd2a4a63fd126d0dad49b72f501f0ee685faf3e5632bb0991a
-EBUILD fmit-9999.ebuild 983 SHA256 4f6ec9f59f00212b6f753c96c0010b309fd38fba6c91c7b088fdea7643c7704a SHA512 a013efdda1be02eb1e864c8faacd061d3f7913aa4ed8b52104ea94ec3ad244a6d1ea8ea8b4037d47e281274ee7362c0ccb04c41491c740eb3938ff1e22df8cf4 WHIRLPOOL bf523d64b29f20e849807986a593bc96b6455cd421617720791d7f0a4fc4d277e3f7417d4d96f3d152c0065a70cce1179105d07b1e66ecba49f90b9a38caa554
-MISC ChangeLog 995 SHA256 30b4c80568c3ab9adfcf7fc35720bd831e415ea0b917a7e353735d967313e443 SHA512 87df0edba9e3c944541d5d0946eca1d00893d78f07e048646a75a504a29f632e67eb4bdfb6f169e7049cfc683afa1ddd15d7f2bf20b7c9748d667c36ff81dca1 WHIRLPOOL acf82a909bb6e590b009fc21635644a968310de484801012a7c725ced9d5080406a200594f4f5f4baff5366f940acc5f6362773ef33e2c30c8c0de62679c317a
-MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
+EBUILD fmit-9999.ebuild 1527 SHA256 1041e8a58f6ca5800da2de8e575ad82c659a8cf8eaedaf50c063df89ec317e7c SHA512 d1210e62fa49c0b400d0175ec37deaf4fe4f07b93fd1c97b58fce2b75f59fef58a08d0ac2c1311b98a7d3763c54dcc5a7a8d42a38834bd9e3fcc5d0b4db6f245 WHIRLPOOL 75a7f02b3a9e1182a5d4d2b58db2a458c726e89b893f1f8f10175189235bc4c7a1adf167c61850b1c0d5222979db8557ef0a5b97e569c55b7b7225d2e3c20cbb
+MISC ChangeLog 1149 SHA256 d95c50dd86975035307f50a7d49a6da2fff1a01385e2eb0af3b741d9182c81fe SHA512 16a2e68d931fd24765c057a4879fe7ae033e299ab1c4ff4a1a1a4984bb800e341e3ec36b6a72add446c0dbfd3bf3ec377c1b753db455819f2ff770a081871890 WHIRLPOOL e503e415a604faec9fdae8a076edbc4834f0dd31431fbf428eb19aacc480f75d83a92675a6417b4a2a4940f882dda438ffef52d225112ea08f76e6dc7b0d61b0
+MISC metadata.xml 261 SHA256 3812db1cff66d287c945fc7987f7d2cb37fea10ad28fdae3b7277beb8cfe7392 SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1 WHIRLPOOL 539e44c7fa67fe66d40aea271af64a7da8cb15c7f990400572ea7372b6268575cf1bf1d536772276b8df4340a7919392d21120a7f7321d198a24460b3b383154
Deleted: trunk/overlays/proaudio/media-sound/fmit/fmit-0.99.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/fmit/fmit-0.99.2.ebuild 2017-08-13 18:35:37 UTC (rev 3097)
+++ trunk/overlays/proaudio/media-sound/fmit/fmit-0.99.2.ebuild 2017-08-14 10:07:39 UTC (rev 3098)
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit cmake-utils
-
-MY_P="${P}-Source"
-
-DESCRIPTION="Free Music Instrument Tuner"
-HOMEPAGE="http://home.gna.org/fmit/";
-SRC_URI="http://download.gna.org/fmit/${MY_P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack oss portaudio"
-
-DEPEND=">=media-libs/freeglut-2.6.0
- >=sci-libs/fftw-3.2.2:3.0
- >=dev-qt/qtcore-4.6.3:4
- >=dev-qt/qtgui-4.6.3:4
- >=dev-qt/qtopengl-4.6.3:4
- alsa? ( >=media-libs/alsa-lib-1.0.23 )
- jack? ( >=media-sound/jack-audio-connection-kit-0.118.0 )
- portaudio? ( media-libs/portaudio )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(ChangeLog README.txt TODO)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use alsa SOUNDSYSTEM_USE_ALSA)
- $(cmake-utils_use jack SOUNDSYSTEM_USE_JACK)
- $(cmake-utils_use oss SOUNDSYSTEM_USE_OSS)
- $(cmake-utils_use portaudio SOUNDSYSTEM_USE_PORTAUDIO)
- )
-
- cmake-utils_src_configure
-}
Modified: trunk/overlays/proaudio/media-sound/fmit/fmit-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/fmit/fmit-9999.ebuild 2017-08-13 18:35:37 UTC (rev 3097)
+++ trunk/overlays/proaudio/media-sound/fmit/fmit-9999.ebuild 2017-08-14 10:07:39 UTC (rev 3098)
@@ -1,41 +1,52 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=4
-inherit cmake-utils cvs
+EAPI=6
+inherit qmake-utils git-r3
DESCRIPTION="Free Music Instrument Tuner"
-HOMEPAGE="http://home.gna.org/fmit/";
-ECVS_SERVER="cvs.gna.org:/cvs/fmit"
-ECVS_MODULE="${PN}"
+HOMEPAGE="https://gillesdegottex.github.io/fmit/";
+EGIT_REPO_URI="https://github.com/gillesdegottex/fmit.git";
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1"
SLOT="0"
KEYWORDS=""
IUSE="alsa debug jack oss portaudio"
-DEPEND=">=media-libs/freeglut-2.6.0
- >=sci-libs/fftw-3.2.2:3.0
- >=dev-qt/qtcore-4.6.3:4
- >=dev-qt/qtgui-4.6.3:4
- >=dev-qt/qtopengl-4.6.3:4
- alsa? ( >=media-libs/alsa-lib-1.0.23 )
- jack? ( >=media-sound/jack-audio-connection-kit-0.118.0 )
+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 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5"
-S=${WORKDIR}/${PN}
+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
+}
-DOCS=(ChangeLog README.txt TODO)
-
src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use alsa SOUNDSYSTEM_USE_ALSA)
- $(cmake-utils_use jack SOUNDSYSTEM_USE_JACK)
- $(cmake-utils_use oss SOUNDSYSTEM_USE_OSS)
- $(cmake-utils_use portaudio SOUNDSYSTEM_USE_PORTAUDIO)
- )
+ local config flag
+ for flag in alsa jack portaudio oss; do
+ use ${flag} && config+=" acs_${flag}"
+ done
- cmake-utils_src_configure
+ "$(qt5_get_bindir)"/lrelease fmit.pro || die "Running lrelease failed"
+
+ eqmake5 CONFIG+="${config}" fmit.pro PREFIX="${D}"/usr \
+ PREFIXSHORTCUT="${D}"/usr DISTDIR=/usr
}
Modified: trunk/overlays/proaudio/media-sound/fmit/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/fmit/metadata.xml 2017-08-13 18:35:37 UTC (rev 3097)
+++ trunk/overlays/proaudio/media-sound/fmit/metadata.xml 2017-08-14 10:07:39 UTC (rev 3098)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>proaudio@xxxxxxxxxxxxx</email>
<name>pro-audio overlay team</name>
</maintainer>