gentoo resync : 30.04.2018

24 files changed, 541 insertions, 566 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6780ea7d121c..3435d6fbdcd2 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/camorama/Manifest b/media-video/camorama/Manifest
deleted file mode 100644
index d55801aa146f..000000000000
--- a/media-video/camorama/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX camorama-0.19-fixes.patch 3930 BLAKE2B 18985eb0eb9588e11ecda4eb61915080708d13a2cdb6a8bf1b40982cedecc9abd5ef4113586766e8d8e60d6d90678ce108c8899a2a378b44814df03acda7dea5 SHA512 923343da73b32ca98cd4de29bf636c4f923c1927ec2c99b472d7bebdf71336a2afb8db8e7737427b9209fde193470a3b16a74ddc6b22214d0e9b380652246859
-AUX camorama-0.19-gconf.patch 1541 BLAKE2B 642d9d761a4f0b00b552c1eabde5815e3368d16ca0dec023c2fd9e8aeb29313d3f33983c521ba6457a69033a0f86c3b51bfe4555b412139a656728270d9b8d5e SHA512 b4e946ed7b93d4f7d90a654eefa40826b61af474bb930f27024223733fc65fedcaaa87b946007012361db960716e4cd2d3e225652310999d68aa3c8458f1705b
-AUX camorama-0.19-glib-232.patch 658 BLAKE2B 335b9a282532c34bea1b29031dd5f98ce44e58377d79b134099b7146319334c25f8f7e964ca08fc9411e76fcba2d1de90184aef51644c94717524a9ad4b3fb48 SHA512 a20641e24b4113c3ff763c402e9f5e04706d43bd7c2e5bd507c0cc274abf7e0410a23a19fc943252619d55bc129f0788f06c6aac0bf7caf55536262d9c84344f
-AUX camorama-0.19-libv4l.patch 7007 BLAKE2B 2029eed5ba3feb4df0aa156a63a328ff475d545bfd284e46196f86fa41aef0666499daa8c4cf2103c618f988b5b40a786982057b46fe36e8ef416518b880d537 SHA512 2dd3969b49f1e545ae03aab2f7e3e1a3c28c1f95cb3551e1da31ee2cd39b81316ce7f7a4c47bd187d5e16cfeb8073e0f28312073951cb28194265787f6945929
-AUX camorama-0.19-no-more-videodev_h.patch 369 BLAKE2B 2a0d02f51593e68be8184ddf0f85f3d87daf1c801035b10e403161e6b7548623b31c76f6b5ae881cfee15de2dd5d69e318facea608255a231205e48d0730a50e SHA512 9b89dfbb1d9d06f6778bf7c013aa81f839fd9fbfcd532c40eaf8e446af9dfe332c032e0f7ddbef84cb2050b38ddd43d379c65bf098aa43cc5c10be669dc33096
-DIST camorama-0.19.tar.bz2 277169 BLAKE2B 735cfbd4c6cceeb59f1626ef58c5f40f53ef2fa5b37ab5123004fe26547adf9b502dc90fd6f91ca1023f0371b344ee73dbd558379a7ddc09cf552e7ca51910e3 SHA512 efdbe3cdf90a4f4a39b02f141395431c24ac2a7a56ef7faa75b38ae145cdc33f3748daca6bf33a4fa21549b7fef0e7e26d135fd265906e0531e2638739492689
-EBUILD camorama-0.19-r2.ebuild 838 BLAKE2B 799ed07a7b420dd8afc73a8a6938832819e3e68b62018b610fcdd2faaea6290ac174e925979078d4fd17b46ba48e8bc24f275f3067f50954e9b5dc24bacc8cff SHA512 cbf80816d4af4a67c1d48ec585b1b9ad4c6afbdd95e1a473efcab3c320c771b48442505402f2fafa7bc8d67a8c5faaadc015524dbe868fdb4afc26fc9ba52b11
-MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/media-video/camorama/camorama-0.19-r2.ebuild b/media-video/camorama/camorama-0.19-r2.ebuild
deleted file mode 100644
index a89953f93224..000000000000
--- a/media-video/camorama/camorama-0.19-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="A webcam application featuring various image filters"
-HOMEPAGE="https://git.gnome.org/browse/camorama/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	gnome-base/libgnome-keyring
-	>=gnome-base/libgnomeui-2
-	media-libs/libv4l
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gconf.patch \
-		"${FILESDIR}"/${P}-fixes.patch \
-		"${FILESDIR}"/${P}-libv4l.patch \
-		"${FILESDIR}"/${P}-no-more-videodev_h.patch \
-		"${FILESDIR}"/${P}-glib-232.patch
-
-	gnome2_src_prepare
-}
diff --git a/media-video/camorama/files/camorama-0.19-fixes.patch b/media-video/camorama/files/camorama-0.19-fixes.patch
deleted file mode 100644
index 949c19d66741..000000000000
--- a/media-video/camorama/files/camorama-0.19-fixes.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/camorama/devel/
-
---- camorama-0.19/src/callbacks.c	2007-09-16 15:36:55.000000000 +0200
-+++ camorama-0.19.new/src/callbacks.c	2008-06-29 22:22:44.000000000 +0200
-@@ -387,9 +387,6 @@
-         }
-     }
- 
--    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
--    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
--                                 cam->x, cam->y);
- 
-     /*
-      * if(cam->read == FALSE) {
-@@ -441,6 +438,11 @@
-      * * } 
-      */
-     get_win_info (cam);
-+
-+    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
-+    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
-+                                 cam->x, cam->y);
-+
-     frame = 0;
-     gtk_window_resize (GTK_WINDOW
-                        (glade_xml_get_widget (cam->xml, "main_window")), 320,
-@@ -520,8 +522,14 @@
-     gtk_widget_show (about);
- }
- 
-+void
-+camorama_filter_color_filter(void* filter, guchar *image, int x, int y, int depth);
-+
- static void
- apply_filters(cam* cam) {
-+	/* v4l has reverse rgb order from what camora expect so call the color
-+	   filter to fix things up before running the user selected filters */
-+	camorama_filter_color_filter(NULL, cam->pic_buf, cam->x, cam->y, cam->depth);
- 	camorama_filter_chain_apply(cam->filter_chain, cam->pic_buf, cam->x, cam->y, cam->depth);
- #warning "FIXME: enable the threshold channel filter"
- //	if((effect_mask & CAMORAMA_FILTER_THRESHOLD_CHANNEL)  != 0) 
---- camorama-0.19/src/filter.c	2007-09-16 14:48:50.000000000 +0200
-+++ camorama-0.19.new/src/filter.c	2008-06-29 22:11:42.000000000 +0200
-@@ -151,12 +151,12 @@
- static void
- camorama_filter_color_init(CamoramaFilterColor* self) {}
- 
--static void
-+void
- camorama_filter_color_filter(CamoramaFilterColor* filter, guchar *image, int x, int y, int depth) {
- 	int i;
- 	char tmp;
- 	i = x * y;
--	while (--i) {
-+	while (i--) {
- 		tmp = image[0];
- 		image[0] = image[2];
- 		image[2] = tmp;
---- camorama-0.19/src/main.c	2007-09-16 15:36:55.000000000 +0200
-+++ camorama-0.19.new/src/main.c	2008-06-29 22:20:04.000000000 +0200
-@@ -224,8 +224,7 @@
- 
-     /* get picture attributes */
-     get_pic_info (cam);
--//	set_pic_info(cam);
--    /* set_pic_info(cam); */
-+    set_pic_info (cam);
-     cam->contrast = cam->vid_pic.contrast;
-     cam->brightness = cam->vid_pic.brightness;
-     cam->colour = cam->vid_pic.colour;
---- camorama-0.19/src/v4l.c	2007-09-16 14:48:05.000000000 +0200
-+++ camorama-0.19.new/src/v4l.c	2008-06-29 22:20:23.000000000 +0200
-@@ -158,8 +158,8 @@
- 	if(cam->debug) {
- 		g_message("SET PIC");
- 	}
--	//cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
--	//cam->vid_pic.depth = 24;
-+	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
-+	cam->vid_pic.depth = 24;
- 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
- 	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
- 		if(cam->debug) {
-@@ -232,6 +232,8 @@
-       exit(0);
-    }
- 
-+   cam->x = cam->vid_win.width;
-+   cam->y = cam->vid_win.height;
- }
- 
- void set_buffer(cam * cam)
---- camorama-0.19/src/camorama-window.c~	2007-09-16 15:36:55.000000000 +0200
-+++ camorama-0.19/src/camorama-window.c	2009-06-23 20:19:16.000000000 +0200
-@@ -209,11 +209,7 @@ load_interface(cam* cam) {
- 
-     logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), CAMORAMA_STOCK_WEBCAM, 24, 0, NULL);
-     gtk_window_set_default_icon(logo);
--    logo = (GdkPixbuf *) create_pixbuf (PACKAGE_DATA_DIR "/pixmaps/camorama.png");
--    if (logo == NULL) {
--        printf ("\n\nLOGO NO GO\n\n");
--    }
--
-+    logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), "camorama", 48, 0, NULL);
-     if (cam->show_adjustments == FALSE) {
-         gtk_widget_hide (glade_xml_get_widget
-                          (cam->xml, "adjustments_table"));
diff --git a/media-video/camorama/files/camorama-0.19-gconf.patch b/media-video/camorama/files/camorama-0.19-gconf.patch
deleted file mode 100644
index 5a1a19e9b576..000000000000
--- a/media-video/camorama/files/camorama-0.19-gconf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# Make camorama respect --disable-schemas-install configure switch
-# https://bugs.gentoo.org/show_bug.cgi?id=243274
-#
-# Makefile.am |    4 ++++
-# Makefile.in |    7 ++++---
-#  2 files changed, 8 insertions(+), 3 deletions(-)
-#
-#
---- a/data/Makefile.am	2008-11-30 12:39:56.000000000 +0100
-+++ b/data/Makefile.am	2008-11-30 12:41:33.000000000 +0100
-@@ -24,9 +24,13 @@
- 	cp $(app_DATA) ~/.gnome/application-registry
- 	cp $(keys_DATA) ~/.gnome/mime-info/
- 
-+if GCONF_SCHEMAS_INSTALL
- install-data-local:
- 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
- 	$(GCONFTOOL) --shutdown
-+else
-+install-data-local:
-+endif
- 
- EXTRA_DIST = $(glade_DATA) $(schema_in_files) $(stuff_DATA)
- 
---- a/data/Makefile.in	2008-11-30 12:41:10.000000000 +0100
-+++ b/data/Makefile.in	2008-11-30 12:42:24.000000000 +0100
-@@ -448,9 +437,10 @@
- 	cp $(app_DATA) ~/.gnome/application-registry
- 	cp $(keys_DATA) ~/.gnome/mime-info/
- 
--install-data-local:
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
--	$(GCONFTOOL) --shutdown
-+@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
-+@GCONF_SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
-+@GCONF_SCHEMAS_INSTALL_TRUE@	$(GCONFTOOL) --shutdown
-+@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/media-video/camorama/files/camorama-0.19-glib-232.patch b/media-video/camorama/files/camorama-0.19-glib-232.patch
deleted file mode 100644
index d6a76b8e45c2..000000000000
--- a/media-video/camorama/files/camorama-0.19-glib-232.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nu a/src/camorama-stock-items.h b/src/camorama-stock-items.h
---- a/src/camorama-stock-items.h	2007-06-14 16:05:33.000000000 +0200
-+++ b/src/camorama-stock-items.h	2012-05-02 22:40:21.000000000 +0200
-@@ -1,7 +1,7 @@
- #ifndef CAMORAMA_STOCK_ITEMS_H
- #define CAMORAMA_STOCK_ITEMS_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
-diff -Nu a/src/glib-helpers.h b/src/glib-helpers.h
---- a/src/glib-helpers.h	2007-06-14 16:05:33.000000000 +0200
-+++ b/src/glib-helpers.h	2012-05-02 22:46:06.000000000 +0200
-@@ -24,7 +24,7 @@
- #ifndef GLIB_HELPERS_H
- #define GLIB_HELPERS_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/media-video/camorama/files/camorama-0.19-libv4l.patch b/media-video/camorama/files/camorama-0.19-libv4l.patch
deleted file mode 100644
index ada58fe7dd2f..000000000000
--- a/media-video/camorama/files/camorama-0.19-libv4l.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/camorama/devel/
-
---- camorama-0.19/src/Makefile.am	2007-09-16 14:48:05.000000000 +0200
-+++ camorama-0.19.new/src/Makefile.am	2009-06-24 15:01:37.000000000 +0200
-@@ -36,7 +36,7 @@
- 	filter.h	\
- 	$(BUILT_SOURCES)\
- 	$(NULL)
--camorama_LDADD = $(PACKAGE_LIBS)
-+camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
- 
- DISTCLEANFILES=$(BUILT_SOURCES)
- 
---- camorama-0.19/src/Makefile.in	2007-10-06 21:06:28.000000000 +0200
-+++ camorama-0.19.new/src/Makefile.in	2009-06-24 15:01:50.000000000 +0200
-@@ -248,7 +248,7 @@
- 	$(BUILT_SOURCES)\
- 	$(NULL)
- 
--camorama_LDADD = $(PACKAGE_LIBS)
-+camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
- DISTCLEANFILES = $(BUILT_SOURCES)
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
---- camorama-0.19/src/callbacks.c	2009-06-24 15:01:55.000000000 +0200
-+++ camorama-0.19.new/src/callbacks.c	2009-06-24 14:55:42.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <libgnomeui/gnome-propertybox.h>
- #include <libgnomeui/gnome-window-icon.h>
- #include <pthread.h>
-+#include <libv4l1.h>
- 
- extern GtkWidget *main_window, *prefswindow;
- //extern state func_state;
-@@ -390,7 +391,7 @@
- 
-     /*
-      * if(cam->read == FALSE) {
--     *  cam->pic = mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
-+     *  cam->pic = v4l1_mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
-      *  
-      *  if((unsigned char *) -1 == (unsigned char *) cam->pic) {
-      *   if(cam->debug == TRUE) {
-@@ -401,7 +402,7 @@
-      *  }
-      *  }else{
-      *   cam->pic_buf = malloc(cam->x * cam->y * cam->depth);
--     *   read(cam->dev,cam->pic,(cam->x * cam->y * 3));
-+     *   v4l1_read(cam->dev,cam->pic,(cam->x * cam->y * 3));
-      *  } 
-      */
- 
-@@ -427,7 +428,7 @@
-      * if(cam->read == FALSE) {
-      * * for(frame = 0; frame < cam->vid_buf.frames; frame++) {
-      * * cam->vid_map.frame = frame;
--     * * if(ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-+     * * if(v4l1_ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-      * * if(cam->debug == TRUE) {
-      * * fprintf(stderr, "Unable to capture image (VIDIOCMCAPTURE) during resize.\n");
-      * * }
-@@ -547,7 +548,7 @@
-     int i, count = 0;
-     GdkGC *gc;
- 
--    read (cam->dev, cam->pic, (cam->x * cam->y * 3));
-+    v4l1_read (cam->dev, cam->pic, (cam->x * cam->y * 3));
-     frames2++;
-     /*
-      * update_rec.x = 0;
-@@ -588,7 +589,7 @@
- 
-     i = -1;
-     while (i < 0) {
--        i = ioctl (cam->dev, VIDIOCSYNC, &frame);
-+        i = v4l1_ioctl (cam->dev, VIDIOCSYNC, &frame);
- 
-         if (i < 0 && errno == EINTR) {
-             if (cam->debug == TRUE) {
-@@ -630,7 +631,7 @@
-                                 0, cam->x, cam->y);
- 
-     cam->vid_map.frame = frame;
--    if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-+    if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-         if (cam->debug == TRUE) {
-             fprintf (stderr, "Unable to capture image (VIDIOCMCAPTURE)\n");
-         }
-@@ -677,7 +678,7 @@
- void init_cam (GtkWidget * capture, cam * cam)
- {
-     cam->pic =
--        mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
-+        v4l1_mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
-               MAP_SHARED, cam->dev, 0);
- 
-     if ((unsigned char *) -1 == (unsigned char *) cam->pic) {
-@@ -692,7 +693,7 @@
-     cam->vid_map.format = cam->vid_pic.palette;
-     for (frame = 0; frame < cam->vid_buf.frames; frame++) {
-         cam->vid_map.frame = frame;
--        if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-+        if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-             if (cam->debug == TRUE) {
-                 fprintf (stderr,
-                          "Unable to capture image (VIDIOCMCAPTURE).\n");
---- camorama-0.19/src/main.c	2009-06-24 15:01:55.000000000 +0200
-+++ camorama-0.19.new/src/main.c	2009-06-24 14:59:35.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
- #include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
- #include <locale.h>
-+#include <libv4l1.h>
- 
- #include "camorama-display.h"
- #include "camorama-stock-items.h"
-@@ -206,7 +207,7 @@
-     gdk_pixbuf_xlib_init (display, 0);
-     cam->desk_depth = xlib_rgb_get_depth ();
- 
--    cam->dev = open (cam->video_dev, O_RDWR);
-+    cam->dev = v4l1_open (cam->video_dev, O_RDWR);
- 
-     camera_cap (cam);
-     get_win_info (cam);
-@@ -284,5 +285,8 @@
- 
-     gtk_timeout_add (2000, (GSourceFunc) fps, cam->status);
-     gtk_main ();
-+    v4l1_munmap(cam->pic, cam->vid_buf.size);
-+    v4l1_close(cam->dev);
-+    
-     return 0;
- }
---- camorama-0.19/src/v4l.c	2009-06-24 15:01:55.000000000 +0200
-+++ camorama-0.19.new/src/v4l.c	2009-06-24 14:54:09.000000000 +0200
-@@ -2,6 +2,7 @@
- #include<time.h>
- #include<errno.h>
- #include<gnome.h>
-+#include <libv4l1.h>
- #include "support.h"
- 
- extern int frame_number;
-@@ -87,7 +88,7 @@
- void camera_cap(cam * cam)
- {
-    char *msg;
--   if(ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
-       if(cam->debug == TRUE) {
-          fprintf(stderr, "VIDIOCGCAP  --  could not get camera capabilities, exiting.....\n");
-       }
-@@ -161,7 +162,7 @@
- 	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
- 	cam->vid_pic.depth = 24;
- 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
--	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
-+	if(v4l1_ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
- 		if(cam->debug) {
- 			g_message("VIDIOCSPICT  --  could not set picture info, exiting....");
- 		}
-@@ -176,7 +177,7 @@
- //set_pic_info(cam);
-    char *msg;
- 	
--   if(ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
-       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
-       error_dialog(msg);
-       if(cam->debug == TRUE) {
-@@ -201,7 +202,7 @@
- void get_win_info(cam * cam)
- {
-    gchar *msg;
--   if(ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
-       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
-       error_dialog(msg);
-       if(cam->debug == TRUE) {
-@@ -222,7 +223,7 @@
- void set_win_info(cam * cam)
- {
-    gchar *msg;
--   if(ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
-       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
-       error_dialog(msg);
-       if(cam->debug == TRUE) {
-@@ -239,7 +240,7 @@
- void set_buffer(cam * cam)
- {
-    char *msg;
--   if(ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
-       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
-       error_dialog(msg);
-       if(cam->debug == TRUE) {
diff --git a/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch b/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch
deleted file mode 100644
index 84c8f68ba72b..000000000000
--- a/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=camorama.git;a=blob_plain;f=camorama-0.19-no-more-videodev_h.patch;hb=HEAD
-
---- src/v4l.h
-+++ src/v4l.h
-@@ -12,8 +12,7 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <gtk/gtk.h>
--#include <linux/types.h>
--#include <linux/videodev.h>
-+#include <libv4l1.h>
- #include <signal.h>
- #include <png.h>
- #include <glade/glade.h>
diff --git a/media-video/camorama/metadata.xml b/media-video/camorama/metadata.xml
deleted file mode 100644
index 80088c21d0ab..000000000000
--- a/media-video/camorama/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>media-video@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/media-video/cpdvd/Manifest b/media-video/cpdvd/Manifest
deleted file mode 100644
index 2622aeff62f3..000000000000
--- a/media-video/cpdvd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cpdvd-1.10.gz 3512 BLAKE2B daf7cab3b89cc1e5d054cc033d09b965381195ab93a3c3805632bbf48390b28aadb45037886dffe257bedce5a6b1cd72ad95cc3ad811332e81f8fa4a4c54d1b0 SHA512 795f3f5a43a4ae9ada4a60b2bb6fcdb501d5218c8886d34548b4c8da0af51db7701fc81ae336f34d1b997f377040a5af52773e40939394942de3c2edca1e2d5b
-EBUILD cpdvd-1.10-r1.ebuild 514 BLAKE2B c06177c267cc56f810c37561dfb664bca5b12d50ceb2ab6c5c124b6c88bf2bbe4636217bacfa09bb28855d4a3210650efbd96c4845f564dc76383752f3dff50e SHA512 f484447649e5731dafef3230bd79ae6e8656617c2090380f0bc5078fb17a3e2d1a32f8cb45f7d8e6c65d8d40613f4e6b20dbf0d090579e47a1bc7a97ced793c4
-MISC metadata.xml 227 BLAKE2B 129a977f3a470f0774cb25c7d9d67968f807b5bbba6b1d1b1d0155e288555355796826ce187abf95a06ee0a448e08e9c5ec34ee79d9895bf2718b47ff0d9bfe8 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5
diff --git a/media-video/cpdvd/cpdvd-1.10-r1.ebuild b/media-video/cpdvd/cpdvd-1.10-r1.ebuild
deleted file mode 100644
index 70b501e5325c..000000000000
--- a/media-video/cpdvd/cpdvd-1.10-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-IUSE=""
-
-S="${WORKDIR}"
-
-DESCRIPTION="transfer a DVD title to your harddisk with ease on Linux"
-HOMEPAGE="http://www.lallafa.de/bp/cpdvd.html"
-SRC_URI="http://www.lallafa.de/bp/files/${P}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND=""
-
-RDEPEND=">=media-video/transcode-0.6.2[dvd]
-	>=dev-lang/perl-5.8.0-r12
-	>=media-video/cpvts-1.2"
-
-src_install () {
-	newbin ${P} ${PN} || die
-}
diff --git a/media-video/cpdvd/metadata.xml b/media-video/cpdvd/metadata.xml
deleted file mode 100644
index 106575f01e53..000000000000
--- a/media-video/cpdvd/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 7021a336b184..93b9c46018fa 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,5 +1,7 @@
+DIST devedeng-4.10.0.tar.gz 1884153 BLAKE2B 71b86ae206dfd8798d54304eb68b488fd7d5e6ca76d76691682bd106e28de7a75833fdf57499841d1aa970e35e336cf50d568fb5e3fc34a40eb685c8b503a561 SHA512 4230e0395b4add0b53921137c9d32ebcf7efb1d2e8e8298c57bc11e82e06783b9a4f4fdcec41b1bcfdb358a35d1ce03c14fa3448551ad7289684ad35ce76cbd2
 DIST devedeng-4.8.12.tar.gz 1884025 BLAKE2B 7c6ed3c94bfd18a19147a8627fa846d78fe1f4c686a4875a917062419c2e4f136052aa79f2697e0a3642ebb92246b42ced3a4a398a4773599242726ff01c157c SHA512 67eaf426d3f69a6efb8fde5f5df425d2b8ddf1052f22cd2d36056c687bc0978a456f6158a0af302292ef5e1abb837c9ac7ca6b4e0332e81c31ca7333ea86e184
 DIST devedeng-4.9.0.tar.gz 1884128 BLAKE2B 8072fc31d02526dc4420b62e3721e46ffb246872c55cd3c2a72e28cc8aa2f3c08cbaebbaaf5b91021ce330ae4c819cc2f1eab7c7f6d12d705e8970aecf6627e0 SHA512 4200f3ce51fcdc38d17918f3fbca9acea2a63aa47e45714e8f834c9da7e643c29e22b2f1dac44b2db43ad034c7c84aba68d335f69245246a73c56e598e2aa445
+EBUILD devedeng-4.10.0.ebuild 918 BLAKE2B 3b94f4f0bb8c1d5a1bfcf293b39ed2878098b5bac39e40c282071b58caba2078dfe623eeff5ca19a9b4a1a14bd8cfad3ca75e8df81cf24ef286a98c7f4f7c58f SHA512 b6c6857fbbc3288f1aec19387150ad933c7591dd507357df80c0d8b34a79375d75e1d473956b77e2f40bda613516f9f1cfac7b85042e0b9588deaeabe9c7929d
 EBUILD devedeng-4.8.12.ebuild 918 BLAKE2B 3b94f4f0bb8c1d5a1bfcf293b39ed2878098b5bac39e40c282071b58caba2078dfe623eeff5ca19a9b4a1a14bd8cfad3ca75e8df81cf24ef286a98c7f4f7c58f SHA512 b6c6857fbbc3288f1aec19387150ad933c7591dd507357df80c0d8b34a79375d75e1d473956b77e2f40bda613516f9f1cfac7b85042e0b9588deaeabe9c7929d
 EBUILD devedeng-4.9.0.ebuild 918 BLAKE2B 3b94f4f0bb8c1d5a1bfcf293b39ed2878098b5bac39e40c282071b58caba2078dfe623eeff5ca19a9b4a1a14bd8cfad3ca75e8df81cf24ef286a98c7f4f7c58f SHA512 b6c6857fbbc3288f1aec19387150ad933c7591dd507357df80c0d8b34a79375d75e1d473956b77e2f40bda613516f9f1cfac7b85042e0b9588deaeabe9c7929d
 EBUILD devedeng-9999.ebuild 897 BLAKE2B b14e5fa2489f2c2c210ebb17367150ea877eb204a544cc9294fd6cfb30dbee38044581aa1149aa8a0d5dc7bdbd17b1c611773ec9488d8586f848c793995d82d8 SHA512 71ec9ae8b6aafe81c4289af480af88ff6fd2bb4e6fa24c1215365f392097584f458cc3d8509643e1af774f04177223d3512db86296cab44ff3dd7531fc9ec0c8
diff --git a/media-video/devedeng/devedeng-4.10.0.ebuild b/media-video/devedeng/devedeng-4.10.0.ebuild
new file mode 100644
index 000000000000..d1ed266804d6
--- /dev/null
+++ b/media-video/devedeng/devedeng-4.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
+HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
+SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	|| ( media-video/vlc media-video/mpv media-video/mplayer )
+	!libav? ( media-video/ffmpeg )
+	libav? ( media-video/libav )
+	media-video/dvdauthor
+	media-video/vcdimager
+	virtual/cdrtools
+	|| ( app-cdr/brasero kde-apps/k3b )"
+
+DEPEND="${PYTHON_DEPS}"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index e04f868624d8..abc356876252 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -17,6 +17,6 @@ EBUILD ffmpeg-3.3.5.ebuild 15958 BLAKE2B c5d4de18818f991e975e5d4e4af6ba49335c1f5
 EBUILD ffmpeg-3.3.6.ebuild 15957 BLAKE2B eb439e2f522e49991df4143b4ec69b428e4ea69c97f6aab1d1aa19628d0b311adfb484cd7d807c44b90a8e74c87255992fa8181ad8ddee51ed515424bc7e60b1 SHA512 9329ae807ed9c5e3f63f2ca9c1c658728f924dca5885375438ccc01a22ee9f21da208cfaa62329eb5df77200ba27fc0ffeb3250b6507e6731210b46e973dbd96
 EBUILD ffmpeg-3.4.2-r1.ebuild 15633 BLAKE2B 2e5391e267c92cb7a16b6ee26652f536636a49346d7145c0f2974c6daf546a5b01b745c8038156a76161476b51309f8f622f2ceacb92f0ae1c992284d8161a82 SHA512 5a037bc3c6078776338027492ad55237d3328df390528ad2c3fc3edb52817038e2ca38d297b3302fcd522ec34f69cd8f1b3ee6876997f4a95dd5c938af37c07f
 EBUILD ffmpeg-3.4.2.ebuild 15578 BLAKE2B dd02f1200d7c713f06c606a40386f6432dc4c1b796614e1a4f1faf13e504fd9634e1557d7a70cfb94629228090ca66916510b6328dfde5d0bc0e4cd44a103049 SHA512 b95e7fd722745507d91f23bd365fec8a2193d589bc41821adfb1123fa844bf869eb5e02eb2c3bb936cf4f69b0437fdf875f7bddf821d04105d29b667678abdd8
-EBUILD ffmpeg-4.0.ebuild 16461 BLAKE2B e4989ecbe8f21affe84c87617dec6e5ba785bf9bbed740488097c229de8a6a01dbb1e9898bae5276c9fd74dcf084704c559ba03c83f67a5dbb1dd47f21ced3c4 SHA512 1b383d0e60cae4b484dd17e01b34f37359951991f1be5823aa6cb797094b7e281a3f0b41b4b95fadf7cb5a4806a28a26bfa651cf145028b0727d697d91d614dd
+EBUILD ffmpeg-4.0.ebuild 16467 BLAKE2B b2709adbabe290c75b7c6d1b56e010925e12462cd941332118e977c4b02c041af00e41bbe9176e87e646ab9036463e7ead436a9bfea5ffb4256cc3c15b7b4b8e SHA512 c84cef4f49bd26992a0186cf8c2f023b852e2393639c2dbce8dacd2c5214af26f574387709ed576b65aa553c17212ee8ac363f56ca2f2e6918f38ee899442605
 EBUILD ffmpeg-9999.ebuild 16521 BLAKE2B 388f7d528159be1ebbba172ec58f0e2b02a509f000ab33a757579311b24b8a169bb1183960694f13bd6796f4f41f117ad0ba514a44e9d29de7a3bb386929566f SHA512 4d0d216c765c6645e9b5d8fc30dd61ab7cafe9663cbc42066793607ebb7c486ecbbee5c08ef9aa81da14ca4aff946e7db306f2f1b197681d6237e447f21777da
 MISC metadata.xml 6059 BLAKE2B c3bd41f2496c42f3f426f9a06e1ed860f8bf7853b17a1854e5e6211a68ec96bc00aeb239f230c1ff10ae65bf2a2fcb7824dccb8836ab7a3b642ac9208b5bb822 SHA512 43469f265ca75b7ad487bc8b54e47fe632e21af8ec331ff87b0423c534c27b3adcdc92ffd98ea08a24ed3f22584c37b2965977ff600166c1700866841293de85
diff --git a/media-video/ffmpeg/ffmpeg-4.0.ebuild b/media-video/ffmpeg/ffmpeg-4.0.ebuild
index 480732eac83b..1efef5732871 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~mips ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~ia64 ~mips ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/mplayer-resume/Manifest b/media-video/mplayer-resume/Manifest
deleted file mode 100644
index 9985c2bf2b66..000000000000
--- a/media-video/mplayer-resume/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mplayer-resume-2.0.tar.gz 5251 BLAKE2B ff82339c0fc85ea0111896d247ca70c30aa7f98f3f711128be3aff5f040e4b8f9cdaeebcf03108e26ff974f36f81eb925b9766a6715f6275eae475f3d07d9740 SHA512 38ba85b347fd0904e9bad7586e4dfcfd57c85fc2ff8cb9dc58c3961e15fd6500d1a6e0d7f51cb3b8c826aea290b9511be30406ef6bf5b26489788eaaa02deb69
-EBUILD mplayer-resume-2.0.ebuild 1040 BLAKE2B 36f01711804226174b228311a2ccf93d045708fa3efc19fad8049e7f67c9d9e305b53a5cafc6316efc371c5ab37b10463ccdf23fd98c3f38ff48ebf77630193c SHA512 7bdf6621fc483a1cc1b7037f05b9b4c5dc37a56c23b074f45e1fe2509592dbf2563e521b7e8520ca0e2005f2e6a109f53888999bb2731f804c1f4b86ba430348
-MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mplayer-resume/metadata.xml b/media-video/mplayer-resume/metadata.xml
deleted file mode 100644
index 2a705e39ce78..000000000000
--- a/media-video/mplayer-resume/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>media-video@gentoo.org</email>
-	<name>Gentoo Video project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-video/mplayer-resume/mplayer-resume-2.0.ebuild b/media-video/mplayer-resume/mplayer-resume-2.0.ebuild
deleted file mode 100644
index 10d0f99dbff4..000000000000
--- a/media-video/mplayer-resume/mplayer-resume-2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="MPlayer wrapper script to save/resume playback position"
-HOMEPAGE="http://www.spaceparanoids.org/trac/bend/wiki/mplayer-resume"
-SRC_URI="http://spaceparanoids.org/downloads/mplayer-resume/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lirc"
-DEPEND=""
-RDEPEND="lirc? ( app-misc/lirc
-		media-video/mplayer[lirc] )
-		 dev-lang/php[cli]
-		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-	media-video/mplayer"
-
-src_compile() {
-	return;
-}
-
-src_install() {
-	dobin mplayer-resume
-	dodoc ChangeLog README
-}
-
-pkg_postinst() {
-	elog "To get mplayer-resume to save playback position with LIRC,"
-	elog "you will need to setup an entry in ~/.lircrc to run "
-	elog "'get_time_pos' and then 'quit'.  More instructions are"
-	elog "detailed in the README, but the position will not be saved"
-	elog "until you set it up."
-	elog ""
-	elog "Playback position files are saved in ~/.mplayer/playback"
-}
diff --git a/media-video/vcdgear/Manifest b/media-video/vcdgear/Manifest
deleted file mode 100644
index 42dadb44f0a2..000000000000
--- a/media-video/vcdgear/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vcdgear176-040415_linux.tar.gz 442937 BLAKE2B 5dac584db2b0293e1923842451bda6cfa0876a54bb07c1e1b36c85278f0a1324a4c9ebce0edbfa9f697b76a0cc36a1e00f712effdda09f6eb5cad9962e793247 SHA512 c6fbefc2a5f96a629f70611da61245f7b23b03a524e67f75db5a873952abcb1db226f4b9bdee18298a8a21d0ae14ffee816ffcd7a732605c0a445015b7507b19
-EBUILD vcdgear-1.76-r2.ebuild 748 BLAKE2B 353435eb74c948d9e17e63de6480e90dcd2fefc5bba3446035b7f93b42596b4ccf414cb59eca6c2721b7e172219f85437ba375ba3587274563339aa79f687807 SHA512 58a841064cb949e2a959725f87c2b564ba201b993b907835dba86e87c5bac8756213203e36c4b7489061b01c7eaa9cf51269f994b035d2c04c3d9c7908684662
-MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/vcdgear/metadata.xml b/media-video/vcdgear/metadata.xml
deleted file mode 100644
index 68b9a06fccf1..000000000000
--- a/media-video/vcdgear/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>media-video@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/media-video/vcdgear/vcdgear-1.76-r2.ebuild b/media-video/vcdgear/vcdgear-1.76-r2.ebuild
deleted file mode 100644
index 7fdc8cdde9d3..000000000000
--- a/media-video/vcdgear/vcdgear-1.76-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-QA_PRESTRIPPED=/opt/vcdgear/vcdgear
-QA_FLAGS_IGNORED=/opt/vcdgear/vcdgear
-
-STAMP=040415
-DESCRIPTION="extract MPEG streams from CD images, convert VCD files to MPEG, correct MPEG errors, and more"
-HOMEPAGE="http://www.vcdgear.com/"
-SRC_URI="http://www.vcdgear.com/files/vcdgear${PV//.}-${STAMP}_linux.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="virtual/libstdc++:3.3"
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	insinto /opt/vcdgear
-	doins -r * || die "doins"
-	fperms a+rx /opt/vcdgear/vcdgear
-	dodir /opt/bin
-	dosym /opt/vcdgear/vcdgear /opt/bin/vcdgear
-}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 2d5d1b254009..edfdd9ac2d54 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -15,8 +15,10 @@ AUX vlc-3.0.1-qt-5.11.patch 350 BLAKE2B e0980ebbefa94d9388785c12fa5cba666eb3681f
 AUX vlc-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa94649f2cffd4792520549c2627d0bc77a0ce6f7ec31538a740e0db75cb62e2c65b881aae50a955e7db95254c41e833aae898 SHA512 ad0831ddef22849f05d7c325e11723613f99f5b37cbf6a6361396375431f7ea7f7c113a412ee3f77e8822355e22abfa8c2c51c5eab0d4bd4db36b239ab01175b
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
 DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 10121ef74f90ee7103d5958b49b7b187a3b8a1cd0bb36a9d97f409a7500285594d89721cb17add80d2a3d8d0f607ed4ec46986b9a9faa4a9d7c67c1eb7d60dca SHA512 f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c
+DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f
 EBUILD vlc-2.2.8-r1.ebuild 14827 BLAKE2B 76fcf7e10666be5d138e22c47bbb64fa952218672f29611814adbb084aa3c10b4b0f6a96b3562b711a2ef87b376c88d37d84bb4fc4c04aaa678549c92d9b200e SHA512 9f87b17f44521ef886eed1fdc564a316eb92ea74ce47ce34cb8ca3d2de333e0c11107789170873b61a73ddb8599890c676b62fa6c91c771e6ec5f4a31700ff1b
 EBUILD vlc-3.0.1-r1.ebuild 13496 BLAKE2B 494e5030c9864a6b0dfda7c216d2815f15b946451650852f08d576b95945bba605e8f073964cd760a68e41d17f2700b4dbbfe57cddf6a17ccb5d90348f0fdf18 SHA512 37f29aa1dca36cd0ff3137f8d0c44e99c7e728447686691d968a89565081fa239daac72d54e2faeacfb836314e8f28c08a05b58e4a22ece466b1a365422d177e
+EBUILD vlc-3.0.2.ebuild 13451 BLAKE2B 6446e60e6a4b7c8bd83b3ac4db64cca4127ae2a77a022b59d0c56c8a41f52b379a25774aecaf112a3e019289d57542e4a7a1b4a36d6645547ccaf12c3972eb29 SHA512 c94b8b9203a00121482511cdce2d381b995877b09e0d2dc61fba5d1cafbe215524f5b5dccceb7a2db81ed349631b1f150d726d173f1cab96f944d0116dd9a693
 EBUILD vlc-3.0.9999.ebuild 13451 BLAKE2B 6446e60e6a4b7c8bd83b3ac4db64cca4127ae2a77a022b59d0c56c8a41f52b379a25774aecaf112a3e019289d57542e4a7a1b4a36d6645547ccaf12c3972eb29 SHA512 c94b8b9203a00121482511cdce2d381b995877b09e0d2dc61fba5d1cafbe215524f5b5dccceb7a2db81ed349631b1f150d726d173f1cab96f944d0116dd9a693
 EBUILD vlc-9999.ebuild 13361 BLAKE2B 1432cc5c0bbdffcaf5268967e40c5337ee059bfb7f504ac5f39037b445bff4f334a813a5455353f17f129f3a82e49e77f3d34a1643c161e2dd09fcf3aef1572f SHA512 d1b7392759a1cabe00cabc1b4601ff0a34bd3b4bbfce7f0893e5a27f32b8dfc9e004135d892bd69a82e4277138a025cc793dee875060cbe504a82c48d3b748f8
 MISC metadata.xml 6541 BLAKE2B 4119e3ff76fea78140bcac05a2a2d244bfdd86d808ec1f9cf9171c6ec487aaa0b4ab32a43e259b69ed5d4677fc7a91c0d0fe5e074df0ddcf7fb380c9ba6fe5a4 SHA512 64e7aa292342c9c585c05cefce9d7582e8f01f2f8231625e8e393cebd53dbafe50e8a1c6ef6f4f0a2ee35d80912c11705538ec8316e30b771e8d4780ae1ee780
diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.2.ebuild
new file mode 100644
index 000000000000..2c2154219fe5
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.2.ebuild
@@ -0,0 +1,497 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	SCM="git-r3"
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	else
+		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
+	debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
+	+gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
+	libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
+	macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
+	omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
+	run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex ssl svg
+	taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx
+	wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	postproc? ( ffmpeg )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+RDEPEND="
+	net-dns/libidn:0
+	sys-libs/zlib:0[minizip]
+	virtual/libintl:0
+	virtual/opengl
+	a52? ( media-libs/a52dec:0 )
+	alsa? ( media-libs/alsa-lib:0 )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	bidi? (
+		dev-libs/fribidi:0
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts:0
+	)
+	bluray? ( media-libs/libbluray:0= )
+	cddb? ( media-libs/libcddb:0 )
+	chromaprint? ( media-libs/chromaprint:0= )
+	chromecast? ( >=dev-libs/protobuf-2.5.0:= )
+	dbus? ( sys-apps/dbus:0 )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394:0
+	)
+	dts? ( media-libs/libdca:0 )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dvd? (
+		>=media-libs/libdvdnav-4.9:0
+		>=media-libs/libdvdread-4.9:0
+	)
+	faad? ( media-libs/faad2:0 )
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? (
+		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
+	)
+	flac? (
+		media-libs/flac:0
+		media-libs/libogg:0
+	)
+	fluidsynth? ( media-sound/fluidsynth:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error:0
+	)
+	gme? ( media-libs/game-music-emu:0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394:0
+		sys-libs/libraw1394:0
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate:0 )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:0=
+	)
+	libcaca? ( media-libs/libcaca:0 )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify:0
+	)
+	libsamplerate? ( media-libs/libsamplerate:0 )
+	libtar? ( dev-libs/libtar:0 )
+	libtiger? ( media-libs/libtiger:0 )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc:0 )
+	live? ( media-plugins/live:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	matroska? (
+		dev-libs/libebml:0=
+		media-libs/libmatroska:0=
+	)
+	microdns? ( >=net-libs/libmicrodns-0.0.9:= )
+	modplug? ( media-libs/libmodplug:0 )
+	mp3? ( media-libs/libmad:0 )
+	mpeg? ( media-libs/libmpeg2:0 )
+	mtp? ( media-libs/libmtp:0= )
+	musepack? ( media-sound/musepack-tools:0 )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg:0 )
+	opencv? ( media-libs/opencv:0= )
+	opus? ( >=media-libs/opus-1.0.3:0 )
+	png? ( media-libs/libpng:0= )
+	postproc? ( libav? ( media-libs/libpostproc:0= ) )
+	projectm? (
+		media-fonts/dejavu:0
+		media-libs/libprojectm:0
+	)
+	pulseaudio? ( media-sound/pulseaudio:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+	sdl-image? ( media-libs/sdl-image:0 )
+	sftp? ( net-libs/libssh2:0 )
+	shout? ( media-libs/libshout:0 )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext:0
+		x11-libs/libXinerama:0
+		x11-libs/libXpm:0
+	)
+	soxr? ( media-libs/soxr )
+	speex? (
+		>=media-libs/speex-1.2.0:0
+		media-libs/speexdsp:0
+	)
+	ssl? ( net-libs/gnutls:0 )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo:0
+	)
+	taglib? ( >=media-libs/taglib-1.9:0 )
+	theora? ( media-libs/libtheora:0 )
+	tremor? ( media-libs/tremor:0 )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts:0
+		!fontconfig? ( media-fonts/dejavu:0 )
+	)
+	twolame? ( media-sound/twolame:0 )
+	udev? ( virtual/udev:0 )
+	upnp? ( net-libs/libupnp:= )
+	v4l? ( media-libs/libv4l:0 )
+	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
+	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
+	vdpau? ( x11-libs/libvdpau:0 )
+	vnc? ( net-libs/libvncserver:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi:0[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig:*
+	amd64? ( dev-lang/yasm:* )
+	x86? ( dev-lang/yasm:* )
+	X? ( x11-proto/xproto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/647668
+	if use chromecast && ! use microdns; then
+		einfo "USE=microdns is required for Chromecast autodetection support"
+	fi
+}
+
+src_prepare() {
+	default
+
+	has_version '>=net-libs/libupnp-1.8.0' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-aa
+		--disable-dependency-tracking
+		--disable-optimizations
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vlc
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable altivec)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable macosx-qtkit)
+		$(use_enable matroska)
+		$(use_enable microdns)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mad)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable neon)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable opencv)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable postproc)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable rtsp realrtsp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable schroedinger)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vcd)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_enable wma-fixed)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-srt
+		--disable-vsxu
+		--disable-wasapi
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	xdg_environment_reset # bug 608256
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf ${myeconfargs[@]}
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}