audio/soundkonverter: update to 2.2.2

 - Add missing dependencies (phonon, qt4)
 - Fix spelling of option (VORBIS)
 - Make LIBAV an option (and fix description)
 - Remove Musepack from replaygain (musepack does not install mpcgain)

ChangeLog:
2.2.2:
-Change: Move Polish (Poland) translation to Polish
-Change: Move Swedish (Sweden) translation back to Swedish
-Change: Remove so-version for libsoundkonvertercore to satisfy obs lint

2.2.1:
-Add: Dutch, Spanish (Argentina) and Polish (Poland) translations
-Change: Swedish translation moved to Swedish (Sweden)
-Change: Update translations

2.2.0:
-Add: Decode webm audio stream
-Add: --file-list argument
-Change: Remove both APE and ID3 Replay Gain tags with mp3gain and aacgain
-Change: Disable "modify audio stream" option by default in mp3gain and aacgain
-Change: Don't write icedax info file
-Change: Set so-version for libsoundkonvertercore
-Fix: Don't require an output path when using a user defined profile as command
      line argument
-Fix: Don't crash when tags can't be read
-Fix: Error message when trying to write to a directory without permissions
-Fix: Store album artist information to file list files
-Fix: Some crashes
-Fix: Handle newer ffmpeg versions
-Fix: Don't wait with Replay Gain calculation for items with same album name but
      no Replay Gain conversion option set
-Fix: Don't convert all files at once if the conversion starts with copying
      files with the same input an output codec
-Fix: Infinite loop when waiting for album gain for a failed item

4 files changed, 15 insertions, 34 deletions

diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 22acb6baa704..3a6135c23f70 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	soundkonverter
-PORTVERSION=	2.1.90
+PORTVERSION=	2.2.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio kde
 
@@ -12,26 +12,27 @@ COMMENT=	Frontend to various audio converters (transcoder)
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libtag.so:audio/taglib \
-		libcdda_paranoia.so:audio/cdparanoia
+		libcdda_paranoia.so:audio/cdparanoia \
+		libphonon.so:multimedia/phonon
 
 GH_ACCOUNT=	HessiJames
 USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
-USE_QT4=	moc_build qmake_build rcc_build uic_build
+USE_QT4=	corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml
 USE_KDE4=	automoc4 kdelibs libkcddb
 INSTALLS_ICONS=	yes
 WRKSRC_SUBDIR=	src
 
-OPTIONS_DEFAULT=	VORBISTOOLS FLAC NORMALIZE VORBISGAIN CDPARANOIA
+OPTIONS_DEFAULT=	VORBIS FLAC NORMALIZE VORBISGAIN CDPARANOIA
 OPTIONS_DEFINE=	NLS
 OPTIONS_GROUP=	RIPPER
 OPTIONS_MULTI=	CODEC FILTER REPLAYGAIN
 OPTIONS_GROUP_RIPPER=	CDRKIT CDPARANOIA
 OPTIONS_MULTI_CODEC=	AFTEN FAAC FFMPEG FLAC FLAKE FLUIDSYNTH LAME MAC \
 			MPLAYER MUSEPACK NEROAAC OPUSTOOLS SHORTEN SPEEX  \
-			TIMIDITY TTA TWOLAME VORBIS WAVPACK #LIBAV
+			TIMIDITY TTA TWOLAME VORBIS WAVPACK LIBAV
 OPTIONS_MULTI_FILTER=	NORMALIZE SOX
-OPTIONS_MULTI_REPLAYGAIN=	AACGAIN FLAC MP3GAIN MUSEPACK NORMALIZE \
+OPTIONS_MULTI_REPLAYGAIN=	AACGAIN FLAC MP3GAIN NORMALIZE \
 			VORBISGAIN WAVPACK
 OPTIONS_SUB=	yes
 
@@ -66,7 +67,7 @@ FLUIDSYNTH_RUN_DEPENDS=	fluidsynth:audio/fluidsynth
 
 LAME_RUN_DEPENDS=	lame:audio/lame
 
-LIBAV_DESCR=		LibAV support (WMA, AIFF, AC3, APE...)
+LIBAV_DESC=		LibAV support (WMA, AIFF, AC3, APE...)
 LIBAV_RUN_DEPENDS=	avconv:multimedia/libav
 
 MAC_DESC=		Monkey's Audio lossless codec
diff --git a/audio/soundkonverter/distinfo b/audio/soundkonverter/distinfo
index a8baf8e1b225..898cefdcefc6 100644
--- a/audio/soundkonverter/distinfo
+++ b/audio/soundkonverter/distinfo
@@ -1,2 +1,3 @@
-SHA256 (HessiJames-soundkonverter-v2.1.90_GH0.tar.gz) = 9ffc5e2172bd7dde7da74a0ea1ec1d6b36d65e4e22a79757e2e03fb0d4066387
-SIZE (HessiJames-soundkonverter-v2.1.90_GH0.tar.gz) = 720520
+TIMESTAMP = 1467180244
+SHA256 (HessiJames-soundkonverter-v2.2.2_GH0.tar.gz) = 647788300fe09171cc8b1bb51902b3ddad3b8beccb378cdfcade8da2462abed7
+SIZE (HessiJames-soundkonverter-v2.2.2_GH0.tar.gz) = 821082
diff --git a/audio/soundkonverter/files/patch-cmake_modules_FindTaglib.cmake b/audio/soundkonverter/files/patch-cmake_modules_FindTaglib.cmake
deleted file mode 100644
index ad7ec3b8140c..000000000000
--- a/audio/soundkonverter/files/patch-cmake_modules_FindTaglib.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
---- cmake/modules/FindTaglib.cmake.orig	2016-01-03 14:26:03 UTC
-+++ cmake/modules/FindTaglib.cmake
-@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
- 
-   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
- 
--  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
-      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
-      set(TAGLIB_FOUND FALSE)
--  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
- 
-      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
- 
-@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
-         set(TAGLIB_FOUND TRUE)
-      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
-+  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") 
-   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
- 
- else(TAGLIBCONFIG_EXECUTABLE)
diff --git a/audio/soundkonverter/pkg-plist b/audio/soundkonverter/pkg-plist
index 70d9b63a2a45..602b56b33d84 100644
--- a/audio/soundkonverter/pkg-plist
+++ b/audio/soundkonverter/pkg-plist
@@ -1,4 +1,4 @@
-bin/soundkonverter
+%%QT_BINDIR%%/soundkonverter
 lib/kde4/soundkonverter_codec_aften.so
 lib/kde4/soundkonverter_codec_faac.so
 lib/kde4/soundkonverter_codec_ffmpeg.so
@@ -83,10 +83,13 @@ share/kde4/servicetypes/soundkonverter_ripperplugin.desktop
 %%NLS%%share/locale/cs/LC_MESSAGES/soundkonverter.mo
 %%NLS%%share/locale/de/LC_MESSAGES/soundkonverter.mo
 %%NLS%%share/locale/es/LC_MESSAGES/soundkonverter.mo
+%%NLS%%share/locale/es_AR/LC_MESSAGES/soundkonverter.mo
 %%NLS%%share/locale/et/LC_MESSAGES/soundkonverter.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/soundkonverter.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/soundkonverter.mo
 %%NLS%%share/locale/it/LC_MESSAGES/soundkonverter.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/soundkonverter.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/soundkonverter.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/soundkonverter.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/soundkonverter.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/soundkonverter.mo