--- /usr/portage/media-tv/xbmc/xbmc-11.0.ebuild	2012-04-05 02:31:19.000000000 +0200
+++ xbmc-11.0-r1.ebuild	2012-04-27 17:51:02.552638300 +0200
@@ -122,8 +122,11 @@
 }
 
 src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+	fi
+
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
 	epatch "${FILESDIR}"/${PN}-11.0-no-exec-stack.patch
 	epatch "${FILESDIR}"/${PN}-11.0-ffmpeg-0.10.2.patch #406215
 	epatch "${FILESDIR}"/${PN}-11.0-libav.patch #406215