x11-libs/libva: drop as all slots multilibutized upstream

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

5 files changed, 0 insertions, 684 deletions

diff --git a/x11-libs/libva/ChangeLog b/x11-libs/libva/ChangeLog
deleted file mode 100644
index 3267311..0000000
--- a/x11-libs/libva/ChangeLog
+++ /dev/null
@@ -1,232 +0,0 @@
-# ChangeLog for x11-libs/libva
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.54 2013/06/29 03:43:38 aballier Exp $
-
-*libva-1.2.1 (29 Jun 2013)
-
-  29 Jun 2013; Alexis Ballier <aballier@gentoo.org> +libva-1.2.1.ebuild,
-  libva-9999.ebuild:
-  version bump and mpeg2enc has been renamed upstream so we dont need to rename
-  it anymore
-
-  27 Jun 2013; Alexis Ballier <aballier@gentoo.org> libva-1.0.15.ebuild,
-  libva-1.0.16.ebuild, libva-1.1.0.ebuild, libva-1.1.1.ebuild,
-  libva-1.2.0.ebuild, libva-9999.ebuild:
-  add vdpau useflag to pull in libva-vdpau-driver, bug #474976
-
-*libva-1.2.0 (26 Jun 2013)
-
-  26 Jun 2013; Alexis Ballier <aballier@gentoo.org> +libva-1.2.0.ebuild,
-  libva-9999.ebuild:
-  version bump and avoid collision with media-video/mjpegtools
-
-  19 Jun 2013; Alexis Ballier <aballier@gentoo.org> libva-1.1.1.ebuild,
-  libva-9999.ebuild, metadata.xml:
-  Add drm useflag, based on patch by grey dot in bug #466402. Enable it by
-  default since it does not allow to drop the libdrm dependency and one backend
-  is required to build libva.
-
-*libva-1.1.1 (26 Mar 2013)
-
-  26 Mar 2013; Alexis Ballier <aballier@gentoo.org> +libva-1.1.1.ebuild:
-  version bump
-
-  26 Mar 2013; Alexis Ballier <aballier@gentoo.org> libva-9999.ebuild:
-  update SRC_URI
-
-  14 Feb 2013; Alexis Ballier <aballier@gentoo.org> libva-9999.ebuild:
-  upstream master needs wayland-1
-
-  14 Feb 2013; Alexis Ballier <aballier@gentoo.org> libva-1.1.0.ebuild,
-  +files/libva-1.1.0-wayland1.patch:
-  Add upsteam patch porting to wayland-1 API, bug #455310 by Dennis Schridde
-
-  02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> libva-1.0.15.ebuild,
-  libva-1.0.16.ebuild:
-  Use virtual/udev instead of sys-fs/udev wrt #444398
-
-  26 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
-  Update to global useflag.
-
-  21 Nov 2012; Alexis Ballier <aballier@gentoo.org> libva-1.1.0.ebuild,
-  libva-9999.ebuild:
-  disable silent rules, bug #443324
-
-  21 Nov 2012; Alexis Ballier <aballier@gentoo.org> libva-1.0.15.ebuild,
-  libva-1.0.16.ebuild, libva-1.1.0.ebuild, libva-9999.ebuild:
-  Change x11-libs/vdpau-video to x11-libs/libva-vdpau-driver as it is the new
-  upstream name.
-
-  11 Oct 2012; Alexis Ballier <aballier@gentoo.org> +libva-1.1.0.ebuild:
-  version bump
-
-  11 Oct 2012; Alexis Ballier <aballier@gentoo.org> libva-9999.ebuild,
-  metadata.xml:
-  add wayland useflag
-
-  11 Oct 2012; Alexis Ballier <aballier@gentoo.org> libva-9999.ebuild:
-  add X useflag
-
-  11 Oct 2012; Alexis Ballier <aballier@gentoo.org> libva-9999.ebuild:
-  dummy backend is no more
-
-*libva-1.0.16 (16 Aug 2012)
-
-  16 Aug 2012; Alexis Ballier <aballier@gentoo.org> +libva-1.0.16.ebuild,
-  -libva-1.1.0.ebuild:
-  bump to 1.0.16 and remove older 1.1.0... upstream tagged it and then removed
-  the tag...
-
-  08 Jun 2012; Alexis Ballier <aballier@gentoo.org> libva-1.1.0.ebuild,
-  libva-9999.ebuild:
-  bump intel-driver version requirements as lastest version is required
-
-*libva-1.1.0 (08 Jun 2012)
-
-  08 Jun 2012; Alexis Ballier <aballier@gentoo.org> +libva-1.1.0.ebuild,
-  libva-9999.ebuild:
-  version bump and add egl useflag
-
-  05 May 2012; Jeff Horelick <jdhore@gentoo.org> libva-1.0.15.ebuild,
-  libva-9999.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  26 Dec 2011; Alexis Ballier <aballier@gentoo.org> -libva-1.0.14.ebuild:
-  remove old
-
-  26 Dec 2011; Markus Meier <maekke@gentoo.org> libva-1.0.15.ebuild:
-  x86 stable, bug #394397
-
-  15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> libva-1.0.15.ebuild:
-  Stable for AMD64, wrt bug #394397
-
-*libva-1.0.15 (04 Nov 2011)
-
-  04 Nov 2011; Alexis Ballier <aballier@gentoo.org> +libva-1.0.15.ebuild:
-  version bump
-
-  04 Nov 2011; Alexis Ballier <aballier@gentoo.org> libva-9999.ebuild:
-  dodoc NEWS and cosmetics
-
-  04 Nov 2011; Alexis Ballier <aballier@gentoo.org> metadata.xml:
-  Emil has been moved to co-maintainer of libva-intel-driver
-
-  04 Nov 2011; Alexis Ballier <aballier@gentoo.org> libva-9999.ebuild:
-  update to new repo with split out intel driver
-
-  14 Sep 2011; Alexis Ballier <aballier@gentoo.org> -libva-0.32.0_p2.ebuild:
-  remove old
-
-  15 Sep 2011; Andreas Schuerch <nativemad@gentoo.org> libva-1.0.14.ebuild:
-  x86 stable, thanks JD, bug 382401
-
-  09 Sep 2011; Tony Vroon <chainsaw@gentoo.org> libva-1.0.14.ebuild:
-  Marked stable based on arch testing by Agostino "ago" Sarubbo in bug #382401
-  filed by Alexis Ballier.
-
-  29 Jul 2011; Zac Medico <zmedico@gentoo.org> libva-1.0.14.ebuild,
-  libva-9999.ebuild:
-  Bump to EAPI 3, fix for prefix, and add ~x86-linux keyword.
-
-*libva-1.0.14 (28 Jul 2011)
-
-  28 Jul 2011; Alexis Ballier <aballier@gentoo.org> +libva-1.0.14.ebuild:
-  version bump, the fdo version should be better now
-
-  06 Jul 2011; Alexis Ballier <aballier@gentoo.org> -libva-0.31.1_p4.ebuild,
-  -libva-0.31.1_p5.ebuild, -libva-0.32.0_p1.ebuild:
-  remove old
-
-  29 Jun 2011; Christoph Mende <angelos@gentoo.org> libva-0.32.0_p2.ebuild:
-  Stable on amd64 wrt bug #365273
-
-  23 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> libva-0.32.0_p2.ebuild:
-  x86 stable wrt security bug #365273
-
-*libva-9999 (07 Jun 2011)
-
-  07 Jun 2011; Alexis Ballier <aballier@gentoo.org> +libva-9999.ebuild:
-  add a live ebuild for the fdo version; so that people that want to play with
-  it can, we need a few patches to be merged still
-
-  26 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libva-0.32.0_p2.ebuild:
-  Pdepend on xvba-video. Per bug #325033.
-
-  09 Mar 2011; Alexis Ballier <aballier@gentoo.org> -libva-1.0.10.ebuild,
-  -files/libva-dont-install-tests.patch, metadata.xml:
-  remove the older 1.0.10 version, remove x11 from herd since they're more
-  burdenning than helping
-
-*libva-1.0.10 (08 Mar 2011)
-
-  08 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> +libva-1.0.10.ebuild,
-  +files/libva-dont-install-tests.patch:
-  Update to libva shipped by freedesktop. So we do the same as debian or
-  archlinux. Fixes bug #336854.
-
-*libva-0.32.0_p2 (27 Feb 2011)
-
-  27 Feb 2011; Alexis Ballier <aballier@gentoo.org> +libva-0.32.0_p2.ebuild:
-  version bump
-
-  21 Feb 2011; Jeremy Olexa <darkside@gentoo.org> libva-0.32.0_p1.ebuild:
-  Add ~amd64-linux as tested on bug 351553
-
-*libva-0.32.0_p1 (11 Feb 2011)
-
-  11 Feb 2011; Alexis Ballier <aballier@gentoo.org> +libva-0.32.0_p1.ebuild:
-  version bump
-
-*libva-0.31.1_p5 (03 Feb 2011)
-
-  03 Feb 2011; Alexis Ballier <aballier@gentoo.org> +libva-0.31.1_p5.ebuild:
-  version bump
-
-  26 Dec 2010; Alexis Ballier <aballier@gentoo.org> -libva-0.31.0_p13.ebuild,
-  -files/libva-dont-install-tests.patch:
-  remove old
-
-  25 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
-  libva-0.31.1_p4.ebuild:
-  x86 stable, bug 344827
-
-  23 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> libva-0.31.1_p4.ebuild:
-  amd64 stable wrt #344827
-
-  24 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
-  libva-0.31.0_p13.ebuild:
-  Stable on amd64 wrt bug #332361
-
-  17 Sep 2010; Christian Faulhammer <fauli@gentoo.org>
-  libva-0.31.0_p13.ebuild:
-  remove video_cards_intel to keep the stabilisation tree sane
-
-  17 Sep 2010; Christian Faulhammer <fauli@gentoo.org>
-  libva-0.31.0_p13.ebuild:
-  stable x86, security bug 332361
-
-*libva-0.31.1_p4 (20 Jul 2010)
-
-  20 Jul 2010; Alexis Ballier <aballier@gentoo.org> +libva-0.31.1_p4.ebuild:
-  version bump, bug #329025, by Hypnos <hypnos75@gmail.com>
-
-  22 Jun 2010; Alexis Ballier <aballier@gentoo.org> libva-0.31.0_p13.ebuild,
-  metadata.xml:
-  Add support for intel cards, by emil karlson <jkarlson@cc.hut.fi>, bug
-  #325035, add him as proxy for the intel driver; add commented out parts
-  for ati support
-
-  22 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
-  libva-0.31.0_p13.ebuild:
-  keyworded ~arch for x86, bug 319261
-
-  11 May 2010; Alexis Ballier <aballier@gentoo.org> libva-0.31.0_p13.ebuild:
-  add pdepend on vdpau-video for nvidia support
-
-*libva-0.31.0_p13 (11 May 2010)
-
-  11 May 2010; Alexis Ballier <aballier@gentoo.org>
-  +libva-0.31.0_p13.ebuild, +files/libva-dont-install-tests.patch,
-  +metadata.xml:
-  initial import, bug #308871, ebuild by Olivier Huber <oli.huber@gmail.com>
-  with small modifications by me
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
deleted file mode 100644
index cb2dc94..0000000
--- a/x11-libs/libva/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libva-1.1.0-wayland1.patch 11570 SHA256 07847d82f6b7f1be27c82f2ecb8c593f4179c90f31bcda9b3716c4c3d7cc5974 SHA512 0bf244fb22b4946c065376209f2ed24fb68c6c43bb133af1e10c8e5b7991374ec5de639a927d33053ae13720545b7e1505a7504267982308ad32e1707d7ff216 WHIRLPOOL 9efe511bfc46243f52351696a8e31138a80102d30133818d762456f60ae166baff02c53e93ad94cb8ad70bb45fdd3b2daa8f20acf3debc1232e8e35da22e6a7b
-DIST libva-1.1.1.tar.bz2 812302 SHA256 c0af7bf3e96e19fbd0513fbf461a010638907136b5ee0d68094fa0cc7e66cd4d SHA512 5ded27982e0bdb4f83bf3b183da73e5cdcb72752875a05658991f024e86973d6e11c941346fa015236d3d80ce7c515c323094782a9b48a34b881cae145bb6253 WHIRLPOOL 93712aec8321df6e2e1a2678d13281321eb7a91df582a9651a57e2421d00c9df368e3286e73389b7c43ef114565ab7066df7d5ccdbaa2f2be74a249c1ea4c79f
-EBUILD libva-1.1.1-r1.ebuild 1894 SHA256 d4fe38c4e878aa6be105f1ed017fbc950225eb41935e2c26dddfef13b19f2de7 SHA512 3976b33aa77a7ab75b2b56a566015ff1040941a5890347a8ddaf543ad90fc17200111ea638e5692d88b542e0f27fa7a54e8c6d8442a660250249b555c3ca225f WHIRLPOOL e3b673530905d691ecad789d414005a12bf66bb90d90bdfe83b2672f43bb123aa2451387a03f53dec521c37a62370a91b3451cb0ced58e48e7bb3edd798d7ceb
-MISC ChangeLog 8141 SHA256 8fb081e8662473c5afc1077cec477325eb62dc7f8bec417dc15180e58b88b8ee SHA512 383256e8dadc021629f05e16682a3b5cd4ca10912993a882ac0928378e6df001b8d7a7065457abde1d2689d967f11c473aac1e8711e64b0755855c4ba41a36a8 WHIRLPOOL 151c9723b5c785a0efbed0d9f0efe4958c047eebbaa66d3d2879e70b664f7f95cc3a0e42b3d336cf3b81668a505787743dc886cd49e18695dd32a79cf9ff85b1
-MISC metadata.xml 360 SHA256 89b04f6b5df8b32ce52e950dd6861ab8b27c56ee9187b511b07d557d583d47b9 SHA512 ffbf3e513601bcd30a21371790c4379136de2193246881e8b01d19ffe837fa387ab0277ff8d3e0218157ca1c070a9eb74c0f22cb4be4b9620b41c54746b738d1 WHIRLPOOL 0592d5c21a3c6e73a1b8debab4bc8e2f1f9ca48fdc0e2a0459656de4befd71e763ac3d961936e936443f1a80beedf9b99c8061728b534085587a6136ec1b55fd
diff --git a/x11-libs/libva/files/libva-1.1.0-wayland1.patch b/x11-libs/libva/files/libva-1.1.0-wayland1.patch
deleted file mode 100644
index 653bcb9..0000000
--- a/x11-libs/libva/files/libva-1.1.0-wayland1.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-commit b1cf861a087234eb797c402040403a538adbe0cc
-Author: Rob Bradford <rob@linux.intel.com>
-Date:   Fri Nov 2 10:57:47 2012 +0000
-
-    wayland: port to 1.0 protocol.
-    
-    With the change in protocol the hash of globals maintained by the client was
-    dropped. Instead we must setup a listener on the registry and get the globals
-    in a stream from that.
-    
-    Signed-off-by: Rob Bradford <rob@linux.intel.com>
-    Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-
-diff --git a/configure.ac b/configure.ac
-index de83e35..257964d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,7 @@ m4_define([libva_lt_age],
- m4_define([libdrm_version], [2.4])
- 
- # Wayland minimum version number
--m4_define([wayland_api_version], [0.95.0])
-+m4_define([wayland_api_version], [1.0.0])
- 
- AC_PREREQ(2.57)
- AC_INIT([libva], [libva_version], [waldo.bastian@intel.com], libva)
-diff --git a/test/common/va_display_wayland.c b/test/common/va_display_wayland.c
-index 332d16d..abcb2b6 100644
---- a/test/common/va_display_wayland.c
-+++ b/test/common/va_display_wayland.c
-@@ -33,42 +33,39 @@
- 
- struct display {
-     struct wl_display          *display;
-+    struct wl_registry         *registry;
-     struct wl_compositor       *compositor;
-     struct wl_shell            *shell;
-     struct wl_shell_surface    *shell_surface;
-     struct wl_surface          *surface;
-     unsigned int                ref_count;
-     int                         event_fd;
--    unsigned int                event_mask;
- };
- 
- static struct display *g_display;
- 
- static void
--display_handle_global(
--    struct wl_display *display,
--    uint32_t           id,
--    const char        *interface,
--    uint32_t           version,
--    void              *data
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
- )
- {
-     struct display * const d = data;
- 
-     if (strcmp(interface, "wl_compositor") == 0)
--        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
-+        d->compositor =
-+            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
-     else if (strcmp(interface, "wl_shell") == 0)
--        d->shell = wl_display_bind(display, id, &wl_shell_interface);
-+        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
- }
- 
--static int
--event_mask_update(uint32_t mask, void *data)
--{
--    struct display * const d = data;
--
--    d->event_mask = mask;
--    return 0;
--}
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
- 
- static VADisplay
- va_open_display_wayland(void)
-@@ -91,9 +88,10 @@ va_open_display_wayland(void)
-             return NULL;
-         }
-         wl_display_set_user_data(d->display, d);
--        wl_display_add_global_listener(d->display, display_handle_global, d);
--        d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
--        wl_display_iterate(d->display, d->event_mask);
-+        d->registry = wl_display_get_registry(d->display);
-+        wl_registry_add_listener(d->registry, &registry_listener, d);
-+        d->event_fd = wl_display_get_fd(d->display);
-+        wl_display_dispatch(d->display);
- 
-         d->ref_count = 1;
-         g_display = d;
-@@ -182,6 +180,7 @@ va_put_surface_wayland(
-          dst_rect->x, dst_rect->y, dst_rect->width, dst_rect->height
-      );
- 
-+    wl_surface_commit(d->surface);
-     wl_display_flush(d->display);
-     return VA_STATUS_SUCCESS;
- }
-diff --git a/test/putsurface/putsurface_wayland.c b/test/putsurface/putsurface_wayland.c
-index 3e1d495..b93334d 100644
---- a/test/putsurface/putsurface_wayland.c
-+++ b/test/putsurface/putsurface_wayland.c
-@@ -102,7 +102,7 @@ struct display {
-     struct wl_display  *display;
-     struct wl_compositor *compositor;
-     struct wl_shell    *shell;
--    uint32_t            mask;
-+    struct wl_registry *registry;
-     int                 event_fd;
- };
- 
-@@ -153,7 +153,7 @@ va_put_surface(
-     if (wl_drawable->redraw_pending) {
-         wl_display_flush(d->display);
-         while (wl_drawable->redraw_pending)
--            wl_display_iterate(wl_drawable->display, WL_DISPLAY_READABLE);
-+            wl_display_dispatch(wl_drawable->display);
-     }
- 
-     va_status = vaGetSurfaceBufferWl(va_dpy, va_surface, VA_FRAME_PICTURE, &buffer);
-@@ -169,35 +169,33 @@ va_put_surface(
-     wl_display_flush(d->display);
-     wl_drawable->redraw_pending = 1;
-     callback = wl_surface_frame(wl_drawable->surface);
-+    wl_surface_commit(wl_drawable->surface);
-     wl_callback_add_listener(callback, &frame_callback_listener, wl_drawable);
-     return VA_STATUS_SUCCESS;
- }
- 
- static void
--display_handle_global(
--    struct wl_display *display,
--    uint32_t           id,
--    const char        *interface,
--    uint32_t           version,
--    void              *data
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
- )
- {
-     struct display * const d = data;
- 
-     if (strcmp(interface, "wl_compositor") == 0)
--        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
-+        d->compositor =
-+            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
-     else if (strcmp(interface, "wl_shell") == 0)
--        d->shell = wl_display_bind(display, id, &wl_shell_interface);
-+        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
- }
- 
--static int
--event_mask_update(uint32_t mask, void *data)
--{
--    struct display * const d = data;
--
--    d->mask = mask;
--    return 0;
--}
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
- 
- static void *
- open_display(void)
-@@ -213,9 +211,10 @@ open_display(void)
-         return NULL;
- 
-     wl_display_set_user_data(d->display, d);
--    wl_display_add_global_listener(d->display, display_handle_global, d);
--    d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
--    wl_display_iterate(d->display, d->mask);
-+    d->registry = wl_display_get_registry(d->display);
-+    wl_registry_add_listener(d->registry, &registry_listener, d);
-+    d->event_fd = wl_display_get_fd(d->display);
-+    wl_display_dispatch(d->display);
-     return d->display;
- }
- 
-@@ -298,9 +297,6 @@ check_window_event(
-     if (check_event == 0)
-         return 0;
- 
--    if (!(d->mask & WL_DISPLAY_READABLE))
--        return 0;
--
-     tv.tv_sec  = 0;
-     tv.tv_usec = 0;
-     do {
-@@ -313,7 +309,7 @@ check_window_event(
-             break;
-         }
-         if (retval == 1)
--            wl_display_iterate(d->display, WL_DISPLAY_READABLE);
-+            wl_display_dispatch(d->display);
-     } while (retval > 0);
- 
- #if 0
-diff --git a/va/wayland/va_wayland_drm.c b/va/wayland/va_wayland_drm.c
-index 30c3953..d292316 100644
---- a/va/wayland/va_wayland_drm.c
-+++ b/va/wayland/va_wayland_drm.c
-@@ -44,6 +44,7 @@ typedef struct va_wayland_drm_context {
-     struct va_wayland_context   base;
-     void                       *handle;
-     struct wl_drm              *drm;
-+    struct wl_registry         *registry;
-     void                       *drm_interface;
-     unsigned int                is_authenticated        : 1;
- } VADisplayContextWaylandDRM;
-@@ -142,6 +143,28 @@ va_wayland_drm_destroy(VADisplayContextP pDisplayContext)
-     }
- }
- 
-+static void
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
-+)
-+{
-+    struct va_wayland_drm_context *wl_drm_ctx = data;
-+
-+    if (strcmp(interface, "wl_drm") == 0) {
-+        wl_drm_ctx->drm =
-+            wl_registry_bind(wl_drm_ctx->registry, id, wl_drm_ctx->drm_interface, 1);
-+    }
-+}
-+
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
-+
- bool
- va_wayland_drm_create(VADisplayContextP pDisplayContext)
- {
-@@ -168,14 +191,6 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
-     drm_state->auth_type = 0;
-     ctx->drm_state       = drm_state;
- 
--    id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
--    if (!id) {
--        wl_display_roundtrip(ctx->native_dpy);
--        id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
--        if (!id)
--            return false;
--    }
--
-     wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL);
-     if (!wl_drm_ctx->handle)
-         return false;
-@@ -185,8 +200,14 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
-     if (!wl_drm_ctx->drm_interface)
-         return false;
- 
--    wl_drm_ctx->drm =
--        wl_display_bind(ctx->native_dpy, id, wl_drm_ctx->drm_interface);
-+    wl_drm_ctx->registry = wl_display_get_registry(ctx->native_dpy);
-+    wl_registry_add_listener(wl_drm_ctx->registry, &registry_listener, wl_drm_ctx);
-+    wl_display_roundtrip(ctx->native_dpy);
-+
-+    /* registry_handle_global should have been called by the
-+     * wl_display_roundtrip above
-+     */
-+
-     if (!wl_drm_ctx->drm)
-         return false;
- 
-diff --git a/va/wayland/va_wayland_emgd.c b/va/wayland/va_wayland_emgd.c
-index 73e6802..cb885d1 100644
---- a/va/wayland/va_wayland_emgd.c
-+++ b/va/wayland/va_wayland_emgd.c
-@@ -40,6 +40,7 @@ typedef struct va_wayland_emgd_context {
-     struct wl_emgd             *emgd;
-     void                       *emgd_interface;
-     unsigned int                is_created      : 1;
-+    struct wl_registry         *registry;
- } VADisplayContextWaylandEMGD;
- 
- static inline void
-@@ -86,6 +87,28 @@ va_wayland_emgd_destroy(VADisplayContextP pDisplayContext)
-     }
- }
- 
-+static void
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
-+)
-+{
-+    VADisplayContextWaylandEMGD *wl_emgd_ctx = data;
-+
-+    if (strcmp(interface, "wl_emgd") == 0) {
-+        wl_emgd_ctx->emgd =
-+            wl_registry_bind(registry, id, wl_emgd_ctx->emgd_interface, 1);
-+    }
-+}
-+
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
-+
- bool
- va_wayland_emgd_create(VADisplayContextP pDisplayContext)
- {
-@@ -112,14 +135,6 @@ va_wayland_emgd_create(VADisplayContextP pDisplayContext)
-     drm_state->auth_type = 0;
-     ctx->drm_state       = drm_state;
- 
--    id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
--    if (!id) {
--        wl_display_roundtrip(ctx->native_dpy);
--        id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
--        if (!id)
--            return false;
--    }
--
-     wl_emgd_ctx->handle = dlopen(LIBWAYLAND_EMGD_NAME, RTLD_LAZY|RTLD_LOCAL);
-     if (!wl_emgd_ctx->handle)
-         return false;
-@@ -129,8 +144,13 @@ va_wayland_emgd_create(VADisplayContextP pDisplayContext)
-     if (!wl_emgd_ctx->emgd_interface)
-         return false;
- 
--    wl_emgd_ctx->emgd =
--        wl_display_bind(ctx->native_dpy, id, wl_emgd_ctx->emgd_interface);
-+    wl_emgd_ctx->registry = wl_display_get_registry(ctx->native_dpy);
-+    wl_registry_add_listener(wl_emgd_ctx->registry, &registry_listener, wl_emgd_ctx);
-+    wl_display_roundtrip(ctx->native_dpy);
-+
-+    /* registry_handle_global should have been called by the
-+     * wl_display_roundtrip above
-+     */
-     if (!wl_emgd_ctx->emgd)
-         return false;
-     return true;
diff --git a/x11-libs/libva/libva-1.1.1-r1.ebuild b/x11-libs/libva/libva-1.1.1-r1.ebuild
deleted file mode 100644
index 4c5bd6e..0000000
--- a/x11-libs/libva/libva-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4[${MULTILIB_USEDEP}]
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	)
-	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
-	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-DOCS=( NEWS )
-
-
-src_configure() {
-	autotools-multilib_src_configure \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/@GET_LIBDIR@/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl) \
-		$(use_enable drm)
-}
-
diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
deleted file mode 100644
index 8aef4bb..0000000
--- a/x11-libs/libva/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-  </maintainer>
-	<use>
-		<flag name='egl'>Enables EGL support.</flag>
-		<flag name='drm'>Enables VA/DRM API support.</flag>
-    </use>
-</pkgmetadata>