fixed ebuilds broken by carelessly "converting" them to EAPI6

dev-games/StormLib/StormLib-9.20.ebuild

@@ -4,7 +4,7 @@
 
 EAPI="6"
 
-inherit cmake-multilib
+inherit cmake-utils multilib-minimal
 
 DESCRIPTION="library to read and write MPQ archives"
 HOMEPAGE="http://www.zezula.net/en/mpq/main.html"
@@ -23,12 +23,13 @@ DEPEND="dev-libs/libtomcrypt[static-libs?,${MULTILIB_USEDEP}]
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-multilib.patch"
+	eapply "${FILESDIR}/${PN}-multilib.patch"
+	default
 }
 
-src_configure() {
-	local mycmakeargs="
-		-DWITH_LIBTOMCRYPT=ON"
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_LIBTOMCRYPT=ON)
 
-	cmake-multilib_src_configure
+	cmake-utils_src_configure
 }

dev-games/StormLib/files/StormLib-multilib.patch

@@ -1,5 +1,5 @@
---- CMakeLists.txt.old	2013-11-12 18:53:57.930000000 +0100
-+++ CMakeLists.txt	2013-11-12 18:57:20.700000000 +0100
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -281,7 +281,7 @@
      add_library(storm_static STATIC ${SRC_FILES} ${SRC_ADDITIONAL_FILES})
      target_link_libraries(storm_static ${LINK_LIBS})