Merge updates from master

dev-db/soci/metadata.xml

@@ -6,7 +6,6 @@
     <description>Jan-Espen Oversand</description>
   </maintainer>
   <use>
-    <flag name="ubsan">Enable running with UB sanitizer</flag>
     <flag name="cxx11">Enable c++11 support</flag>
   </use>
   <upstream>

dev-db/soci/soci-4.0.3-r3.ebuild

@@ -10,7 +10,7 @@ SRC_URI="https://sourceforge.net/projects/soci/files/soci/${P}/${P}.tar.gz/downl
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="odbc sqlite oracle postgres mysql +static test ubsan lto +cxx11"
+IUSE="odbc sqlite oracle postgres mysql static-libs test lto +cxx11"
 RESTRICT="!test? ( test )"
 
 CMAKE_SKIP_TESTS=(
@@ -38,9 +38,8 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DSOCI_STATIC="$(usex static)"
+		-DSOCI_STATIC="$(usex static-libs)"
 		-DSOCI_TESTS="$(usex test)"
-		-DSOCI_UBSAN="$(usex ubsan)"
 		-DSOCI_LTO="$(usex lto)"
 		-DSOCI_CXX11="$(usex cxx11)"
 	)

media-sound/spotify-player/spotify-player-9999.ebuild

@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/aome510/spotify-player.git"
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC LGPL-3 LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 
-IUSE="daemon image +libnotify lyrics +media-control pulseaudio sixel +streaming"
+IUSE="daemon image +libnotify +media-control pulseaudio sixel +streaming"
 REQUIRED_USE="
 	sixel? ( image )
 	daemon? ( streaming )
@@ -37,7 +37,6 @@ src_configure() {
 		"$(usex daemon daemon '')"
 		"$(usex image image '')"
 		"$(usex libnotify notify '')"
-		"$(usex lyrics lyric-finder '')"
 		"$(usex media-control media-control '')"
 		"$(usex pulseaudio pulseaudio-backend alsa-backend)"
 		"$(usex sixel sixel '')"