--- libvncserver-0.9.10-r1.ebuild       2015-04-26 13:26:17.000000000 -0400
+++ libvncserver-0.9.10-r2.ebuild       2015-05-07 12:18:12.614341632 -0400
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads vaapi +zlib"
+IUSE="+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads +zlib"
 
 DEPEND="
        gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
@@ -26,7 +26,6 @@
        )
        jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
        png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
@@ -39,7 +38,7 @@
        epatch "${FILESDIR}/${P}-libva-1.0.patch"
 
        sed -i -r \
-               -e "/^SUBDIRS/s:\<$(usex test 'test|' '')client_examples|examples\>::g" \
+               -e "/^SUBDIRS/s:\<$(usex test '' 'test|')client_examples|examples\>::g" \
                Makefile.am || die
 
        eautoreconf
@@ -58,7 +57,6 @@
                $(use_with jpeg) \
                $(use_with png) \
                $(use_with threads pthread) \
-               $(use_with vaapi libva) \
                $(use_with zlib)
 }