eclass/kde4-base-multilib: EAPI enforcement and add multilib usedeps

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

1 files changed, 25 insertions, 18 deletions

diff --git a/eclass/kde4-base-multilib.eclass b/eclass/kde4-base-multilib.eclass
index 8e355e1..34655f5 100644
--- a/eclass/kde4-base-multilib.eclass
+++ b/eclass/kde4-base-multilib.eclass
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# @ECLASS: kde4-base.eclass
+# @ECLASS: kde4-base-multilib.eclass
 # @MAINTAINER:
 # kde@gentoo.org
 # @BLURB: This eclass provides functions for kde 4.X ebuilds
@@ -70,13 +70,20 @@ case ${KDEBASE} in
 			5)
 				SLOT=4/$(get_version_component_range 1-2)
 				;;
-			*)
+			4)
 				SLOT=4
 				;;
+			*)
+				die "EAPI >=4 is required by kde4-base-multilib.eclass"
+				;;
 		esac
 		KDE_MINIMAL="${PV}"
 		;;
 	kdevelop)
+		case ${EAPI} in
+			4|5) ;;
+			*) die "EAPI >=4 is required by kde4-base-multilib.eclass" ;;
+		esac
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			# @ECLASS-VARIABLE: KDEVELOP_VERSION
 			# @DESCRIPTION:
@@ -204,7 +211,7 @@ QT_MINIMAL="${QT_MINIMAL:-4.8.5}"
 
 # Declarative dependencies
 qtdeclarativedepend="
-	>=dev-qt/qtdeclarative-${QT_MINIMAL}:4
+	>=dev-qt/qtdeclarative-${QT_MINIMAL}:4[${MULTILIB_USEDEP}]
 "
 case ${DECLARATIVE_REQUIRED} in
 	always)
@@ -220,7 +227,7 @@ unset qtdeclarativedepend
 
 # QtHelp dependencies
 qthelpdepend="
-	>=dev-qt/qthelp-${QT_MINIMAL}:4
+	>=dev-qt/qthelp-${QT_MINIMAL}:4[${MULTILIB_USEDEP}]
 "
 case ${QTHELP_REQUIRED} in
 	always)
@@ -235,7 +242,7 @@ unset qthelpdepend
 
 # OpenGL dependencies
 qtopengldepend="
-	>=dev-qt/qtopengl-${QT_MINIMAL}:4
+	>=dev-qt/qtopengl-${QT_MINIMAL}:4[${MULTILIB_USEDEP}]
 "
 case ${OPENGL_REQUIRED} in
 	always)
@@ -251,7 +258,7 @@ unset qtopengldepend
 
 # MultiMedia dependencies
 qtmultimediadepend="
-	>=dev-qt/qtmultimedia-${QT_MINIMAL}:4
+	>=dev-qt/qtmultimedia-${QT_MINIMAL}:4[${MULTILIB_USEDEP}]
 "
 case ${MULTIMEDIA_REQUIRED} in
 	always)
@@ -285,16 +292,16 @@ unset cppuintdepend
 # Qt accessibility classes are needed in various places, bug 325461
 kdecommondepend="
 	dev-lang/perl
-	>=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility]
-	>=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support,ssl]
-	>=dev-qt/qtdbus-${QT_MINIMAL}:4
-	>=dev-qt/designer-${QT_MINIMAL}:4[-phonon]
-	>=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]
-	>=dev-qt/qtscript-${QT_MINIMAL}:4
-	>=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support]
-	>=dev-qt/qtsvg-${QT_MINIMAL}:4
-	>=dev-qt/qttest-${QT_MINIMAL}:4
-	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
+	>=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility,${MULTILIB_USEDEP}]
+	>=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support,ssl,${MULTILIB_USEDEP}]
+	>=dev-qt/qtdbus-${QT_MINIMAL}:4[${MULTILIB_USEDEP}]
+	>=dev-qt/designer-${QT_MINIMAL}:4[-phonon,${MULTILIB_USEDEP}]
+	>=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+),${MULTILIB_USEDEP}]
+	>=dev-qt/qtscript-${QT_MINIMAL}:4[${MULTILIB_USEDEP}]
+	>=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support,${MULTILIB_USEDEP}]
+	>=dev-qt/qtsvg-${QT_MINIMAL}:4[${MULTILIB_USEDEP}]
+	>=dev-qt/qttest-${QT_MINIMAL}:4[${MULTILIB_USEDEP}]
+	>=dev-qt/qtwebkit-${QT_MINIMAL}:4[${MULTILIB_USEDEP}]
 "
 
 if [[ ${PN} != kdelibs ]]; then
@@ -322,8 +329,8 @@ kdedepend="
 	dev-util/automoc
 	virtual/pkgconfig
 	!aqua? (
-		>=x11-libs/libXtst-1.1.0
-		x11-proto/xf86vidmodeproto
+		>=x11-libs/libXtst-1.1.0[${MULTILIB_USEDEP}]
+		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
 	)
 "