gentoo resync : 09.03.2018

6 files changed, 38 insertions, 194 deletions

diff --git a/media-sound/bpmdetect/Manifest b/media-sound/bpmdetect/Manifest
index b8ecd86312e1..db58e3d91e79 100644
--- a/media-sound/bpmdetect/Manifest
+++ b/media-sound/bpmdetect/Manifest
@@ -1,6 +1,3 @@
-AUX bpmdetect-0.6.1-fix-buildsystem.patch 1903 BLAKE2B e4b21370c9b668ce30927f744294e93b552a2cbe9e04277782294bfac54651ea4c1d2c68cc76c7cde1635d3929719871bd7aa4124c97cdbfaf7b85419a194fc2 SHA512 52500e1be213b19d2081e5a0d444afb3f55c955ba29fddd9c799cfe0d2359962c19fc64bc8d6649e8a5261fbf9ec8f16efe83b7decdbcf5b71abfd3ecbf15a4d
-AUX bpmdetect-0.6.1-fix-printf-format.patch 1328 BLAKE2B 0182a1e8027730326a20256a5dbbbd873fa8474743414a865d9c73aa44dbc18c0ec2f34cb7edada9677d8c098243e4c89fad780afd5c2ea450b88b09fef05991 SHA512 fa12b7daaf76e04d20b2a681e4e0849e99c93f2aa7a750aadec32c57d478d97005db294e1b613c29f7ad707a361b120863bf3dd69c18dac1be2bf8cbd61d9254
-AUX bpmdetect-0.6.1-gcc44_and_fmodex_path.patch 1439 BLAKE2B 112d8186f61e368d495699fde536c576db923a9141efa9de06cf0f713b5e2b34777ae2c9da49550cc1e46e06f71dfae0e6ada372da7eaf771b8cf80e7eea8f49 SHA512 abd719d7bb3f6bd773643b6cf082fcd7cb39f48d5f6a4143d5f6ec650e2496f97a311ef9c8f762622e04aeea7fbbe79cd7941615499ce655ab434ae69b46d297
-DIST bpmdetect-0.6.1-src.tar.bz2 1433211 BLAKE2B e77d4d18dbcd935c259e9a5ed44a7719656dd5147004c121ec4dcc05e7b067ae423f2e1b3f3ff27405837278468b7a3063cd4362324d4608870d762594ceed55 SHA512 9018b81d4ccca94d000a304ae640b071a0ac748c9c7922f4d3c6894a647594dd712964870898e01ee1d93fb8890491ed62b1d4e5f60f07dae74bda7525f0672a
-EBUILD bpmdetect-0.6.1-r1.ebuild 945 BLAKE2B 27e52a670709f51988b2eac0500ab16b75b54357dca44345745e6e842a9a88b50ab8943c8799947de8cc0fb0097e92546b6565626fc8cf21c6bca2a114990f73 SHA512 883cd4d0ae80882d5039804398bb8740bc1cf04dab86d4afab56ddb3768b4e22519fd49253909fe8f93de8fd65cabad18aad0a25e5a3932b54faf896a7344238
+DIST bpmdetect-0.7.0_pre20170810.tar.gz 257777 BLAKE2B 8a6cfa43b70883d3bf03328c9e52a642140c5a25cd72ea5a9515394551e2ae108135b284b788e12a53e79cb0e2fd916d35a27d743558abb996ad5eb5db7beb45 SHA512 a2bbb67c2e5c46b08396e85fd4b91a5fa8622222929a4a67abdcb4587f04f1d8f40414800cb476f7aaa66d95571dd2d65332e48ed639b621a4351f70ab545779
+EBUILD bpmdetect-0.7.0_pre20170810.ebuild 721 BLAKE2B 260d5a4953ae75e44a219911bb9105ef3f835e465e75e10a2449f39da656c520d884134cac96d6383ccd83472f47ecad56340e5c77cd687f9c0cb687e98e6d04 SHA512 d0ca38ba6f3e489576be488c7c946be6116a539771311f55b3635c98316532fc2bef7a73d51d4688e62ef9081ee02c07a4edc8c993d091a07247b2fc41b09bf0
 MISC metadata.xml 332 BLAKE2B 85eb37ef9ed0b6efcb8611d66b7d8087424e848bd60b819dc3b095480066de0d64d98fc95de3324542e160bdfd9007c80c6391327681df383c03bac26c83754c SHA512 7a6f93e001d436f33d8ee55b467eb2e398b65193ee0c77c0d087916372cba7a5b9693d15aec27e738ea05d54901c1f4f855722384bb9f86d59e10b7d6b6b17d7
diff --git a/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild b/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild
deleted file mode 100644
index 03402a37eec2..000000000000
--- a/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils scons-utils toolchain-funcs
-
-DESCRIPTION="Automatic BPM detection utility"
-HOMEPAGE="https://sourceforge.net/projects/bpmdetect"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/taglib
-	media-libs/id3lib
-	>=media-libs/fmod-4.25.07-r1:1
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	dev-util/scons
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-PATCHES=(
-	"${FILESDIR}/${P}-gcc44_and_fmodex_path.patch"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-	"${FILESDIR}/${P}-fix-printf-format.patch"
-)
-
-src_configure() {
-	myscons=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		QTDIR="/usr/$(get_libdir)"
-		prefix="${D}/usr"
-	)
-}
-
-src_compile() {
-	escons "${myscons[@]}"
-}
-
-src_install() {
-	escons "${myscons[@]}" install
-	dodoc authors readme todo
-}
diff --git a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
new file mode 100644
index 000000000000..3f77ce8b3634
--- /dev/null
+++ b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=b13aac15904c1f821b1739d00445f49432705387
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Automatic BPM detection utility"
+HOMEPAGE="https://github.com/Tatsh/bpmdetect"
+SRC_URI="https://github.com/Tatsh/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	media-libs/flac
+	media-libs/libmad
+	media-libs/libvorbis
+	media-libs/portaudio
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_install() {
+	einstalldocs
+	dobin "${BUILD_DIR}"/src/${PN}
+}
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch
deleted file mode 100644
index fa6c0e59db68..000000000000
--- a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-* Fix QA issues in desktop file
-* Make buildsystem respect CXX, CXXFLAGS and LDFLAGS
-https://bugs.gentoo.org/show_bug.cgi?id=334465
-
---- bpmdetect/src/bpmdetect.desktop
-+++ bpmdetect/src/bpmdetect.desktop
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=BPMDetect
- Exec=bpmdetect
--Icon=bpmdetect-icon.png
-+Icon=bpmdetect-icon
- Type=Application
- Comment=Automatic BPM detection utility
--Categories=Application;AudioVideo;Audio:
-+Categories=AudioVideo;Audio;
---- bpmdetect/src/SConscript
-+++ bpmdetect/src/SConscript
-@@ -1,5 +1,6 @@
- #! /usr/bin/env python
- import os, sys, glob
-+import SCons.Util
- 
- if not sys.platform.startswith('win'):
-   BOLD   ="\033[1m"
-@@ -156,17 +157,18 @@
-     env.__delitem__('CPPPATH')
-   if env.has_key('CPPDEFINES'):
-     env.__delitem__('CPPDEFINES')
--  if env.has_key('CXXFLAGS'):
--    env.__delitem__('CXXFLAGS')
-   if env.has_key('LIBPATH'):
-     env.__delitem__('LIBPATH')
-   if env.has_key('LIBS'):
-     env.__delitem__('LIBS')
--  if env.has_key('LINKFLAGS'):
--    env.__delitem__('LINKFLAGS')
-   if env.has_key('QT3'):
-     env.__delitem__('QT3')
- 
-+  if os.environ.has_key('CXXFLAGS'):
-+    env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+  if os.environ.has_key('LDFLAGS'):
-+    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+
-   print BOLD + """
- --------------------------------------------------""" + NORMAL
-   print "Use MinGW compiler                : ",
-@@ -189,7 +191,6 @@
-       env.Append(CXXFLAGS   = '-g')
-   else:
-     print 'no '
--    env.Append(CXXFLAGS = '-O2' )
-     env.Append(CPPDEFINES = ['NDEBUG', 'NO_DEBUG'])
-     env['DEBUG'] = 0
- 
-@@ -309,6 +310,10 @@
-   ( 'LINKFLAGS', 'linker flags'),
-   ( 'QT3', 'use qt3')
- )
-+if os.environ.has_key('CC'):
-+  env['CC'] = os.environ['CC']
-+if os.environ.has_key('CXX'):
-+  env['CXX'] = os.environ['CXX']
- opts.Update(env)
- 
- # to avoid an error message 'how to make target configure... ?'
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch
deleted file mode 100644
index 89bf64445e76..000000000000
--- a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix broken printf statements:
-* src/main.cpp:49:62: warning: too many arguments for format [-Wformat-extra-args]
-*    printf("Usage:\n bpmdetect [switches] [files]\n\n", version);
-*
-* src/track.cpp:111:57: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘double’ [-Wformat=]
-*      snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. );
-
---- bpmdetect/src/main.cpp
-+++ bpmdetect/src/main.cpp
-@@ -34,6 +34,7 @@
- #endif
- 
- #include <getopt.h>
-+#include <stdio.h>
- 
- #include "track.h"
- #include "trackfmod.h"  // for FMOD system
-@@ -46,7 +47,7 @@
- 
- void display_help() {
-   printf("BPMDetect version %s\n\n", version);
--  printf("Usage:\n bpmdetect [switches] [files]\n\n", version);
-+  fputs("Usage:\n bpmdetect [switches] [files]\n\n", stdout);
-   printf("Switches:\n");
- #ifndef NO_GUI
-   printf("-c --console         - run in console mode\n");
---- bpmdetect/src/track.cpp
-+++ bpmdetect/src/track.cpp
-@@ -108,7 +108,7 @@
-   } else if( format == "000" ) {
-     snprintf(buffer, BPM_LEN, "%03d", (int) dBPM );
-   } else if( format == "00000" ) {
--    snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. );
-+    snprintf(buffer, BPM_LEN, "%05d", static_cast<int>(dBPM * 100.) );
-   } else { // all other formats are converted to "0.00"
-     snprintf(buffer, BPM_LEN, "%.2f", dBPM );
-   }
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
deleted file mode 100644
index c29961645615..000000000000
--- a/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur bpmdetect.orig/src/main.cpp bpmdetect/src/main.cpp
---- bpmdetect.orig/src/main.cpp	2008-05-01 12:50:18.000000000 +0300
-+++ bpmdetect/src/main.cpp	2009-06-03 22:24:56.000000000 +0300
-@@ -20,6 +20,8 @@
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
- 
-+#include <cstdio>
-+
- #ifndef NO_GUI
-  #ifdef USE_QT3
-   #include "dlgbpmdetect3.h"
-diff -ur bpmdetect.orig/src/SConscript bpmdetect/src/SConscript
---- bpmdetect.orig/src/SConscript	2008-04-24 19:49:52.000000000 +0300
-+++ bpmdetect/src/SConscript	2009-06-03 22:33:57.000000000 +0300
-@@ -234,7 +234,7 @@
- 
-   env.Append(LIBS = ['id3', 'fmodex', 'z'])
-   env.Append(CPPPATH = ['.', '..', '../includes'])
--  env.Append(LIBPATH = ['.', '../libs'])
-+  env.Append(LIBPATH = ['.', '../libs', '/opt/fmodex/api/lib'])
-   env['ISCONFIGURED']=1
-   # And finally save the options in the cache
-   opts.Save(cachefile, env)
-diff -ur bpmdetect.orig/src/track.cpp bpmdetect/src/track.cpp
---- bpmdetect.orig/src/track.cpp	2008-04-25 22:33:18.000000000 +0300
-+++ bpmdetect/src/track.cpp	2009-06-03 22:26:24.000000000 +0300
-@@ -20,6 +20,8 @@
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
- 
-+#include <cstdio>
-+
- #include "track.h"
- #include "trackfmod.h"
- #include "BPMDetect.h"