summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2019-03-26 14:52:02 -0500
committerJory Pratt <anarchy@gentoo.org>2019-03-26 14:52:02 -0500
commite2f0b04d58e45afc0a4d4e70658dca28b1946a8d (patch)
treee0c86681a2e34842e87a19eb3f36790e27745e3e
parentdev-lang/python: already updated in tree (diff)
downloadanarchy-e2f0b04d58e45afc0a4d4e70658dca28b1946a8d.tar.gz
anarchy-e2f0b04d58e45afc0a4d4e70658dca28b1946a8d.tar.bz2
anarchy-e2f0b04d58e45afc0a4d4e70658dca28b1946a8d.zip
misc cleanup of out dated ebuilds
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
-rw-r--r--app-editors/mousepad/Manifest6
-rw-r--r--app-editors/mousepad/files/mousepad-0.4.0-dbus-filename-passing-optimization.patch44
-rw-r--r--app-editors/mousepad/files/mousepad-0.4.0-dbus-filename-passing.patch81
-rw-r--r--app-editors/mousepad/files/mousepad-0.4.0-dont-show-hidden-gsv.patch43
-rw-r--r--app-editors/mousepad/files/mousepad-0.4.0-prevent-weird-cycle-gsettings.patch38
-rw-r--r--app-editors/mousepad/mousepad-0.4.0-r1.ebuild57
-rw-r--r--app-office/libreoffice/Manifest20
-rw-r--r--app-office/libreoffice/files/fix-execinfo.patch54
-rw-r--r--app-office/libreoffice/files/fix-includes.patch40
-rw-r--r--app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch10
-rw-r--r--app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch11
-rw-r--r--app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch42
-rw-r--r--app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch216
-rw-r--r--app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch13
-rw-r--r--app-office/libreoffice/files/libreoffice-6.0.4.2-paxkernel.patch27
-rw-r--r--app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch46
-rw-r--r--app-office/libreoffice/files/linux-musl.patch75
-rw-r--r--app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild579
-rw-r--r--dev-python/m2crypto/Manifest4
-rw-r--r--dev-python/m2crypto/files/m2crypto-0.27.0-libressl.patch181
-rw-r--r--dev-python/m2crypto/m2crypto-0.27.0.ebuild46
-rw-r--r--dev-python/m2crypto/metadata.xml12
-rw-r--r--gnome-extra/nm-applet/Manifest2
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.8.14.ebuild62
-rw-r--r--media-video/ffmpeg/Manifest9
-rw-r--r--media-video/ffmpeg/ffmpeg-3.3.6.ebuild514
-rw-r--r--media-video/ffmpeg/ffmpeg-3.4.3.ebuild497
-rw-r--r--media-video/ffmpeg/files/chromium.patch36
-rw-r--r--media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch57
-rw-r--r--media-video/ffmpeg/files/openjpeg22.patch106
-rw-r--r--media-video/ffmpeg/files/openjpeg23.patch109
-rw-r--r--media-video/ffmpeg/metadata.xml65
-rw-r--r--media-video/vlc/Manifest11
-rw-r--r--media-video/vlc/files/qt4-select.patch51
-rw-r--r--media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch23
-rw-r--r--media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch11
-rw-r--r--media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch12
-rw-r--r--media-video/vlc/files/vlc-2.2.2-qt5widgets.patch13
-rw-r--r--media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch160
-rw-r--r--media-video/vlc/files/vlc-2.2.4-gcc6-fixup.patch293
-rw-r--r--media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch45
-rw-r--r--media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch12
-rw-r--r--media-video/vlc/vlc-2.2.4.ebuild512
-rw-r--r--virtual/rust/Manifest2
-rw-r--r--virtual/rust/metadata.xml8
-rw-r--r--virtual/rust/rust-1.27.0.ebuild15
46 files changed, 0 insertions, 4270 deletions
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
deleted file mode 100644
index 677e53d..0000000
--- a/app-editors/mousepad/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX mousepad-0.4.0-dbus-filename-passing-optimization.patch 1633 BLAKE2B 20c7631232c714422c7e7e70b1a1eb7ff44bcf81c9044f112686b8191f30734a1beea761bce719fc1d2169f81dbd41ef816dccdaaf6c6efd4446f15dd6212d2b SHA512 333d7649151ad900a26326fda0bf1ac6751e4301103ed5b47dc9cfd186304ead7c1f0158df3e8d8a647eee5cd375c61b9427d36d950a9e1dbe938951eba83228
-AUX mousepad-0.4.0-dbus-filename-passing.patch 2829 BLAKE2B 5b5c6adf92e28ae6be60674a4d9b415b5c80c3f01c4ecaea015d687f029f92e14f4a4ebe442c37b13b357c56bde1ebbf368ab2ce2f2a71e895a0a882863dd8a3 SHA512 d6a5caf486c42700ca49450587f8cfc93892b08f26caf63a7792153c6d53f84648b71b11ee9f7676d82c0346f47cdc7f6bc671ec4a90eeea596f1920a492bdad
-AUX mousepad-0.4.0-dont-show-hidden-gsv.patch 1734 BLAKE2B 8a2337b91a19f479e6bf9f0520c7642baa542048bc67fb9cf65aaa6f5bf5aebe88387b662de28d9150f17d8a3f8230e69dd5295b2d2dbfcd010d5daf4dc1b721 SHA512 31dffe7061db78fad33123e28ceb00df724f620b2f6d8166b4c4dc68c3345653fcea9b94b1a4618d8125896f3e306905cf1af8c2ffe374ecd0c04a67638d7b7c
-AUX mousepad-0.4.0-prevent-weird-cycle-gsettings.patch 1683 BLAKE2B 64c0675b4765b7338fb6e48c6b25968b959c7a1ed2542dc8812ed5e6fcd02edbbdb6955c6681a48dca86e7afe5eb56970c3246ec7f7c425431cc8524599c1812 SHA512 db2474b5be77d660545070423e97c3bf16593210a89e9b8366236126c1b5cb07cb195d15a4d61163c1ee2f5dbd5589a07a325901c0f1fcb87b6ad244c36ac2d9
-DIST mousepad-0.4.0.tar.bz2 578483 BLAKE2B d723ee7dc721703cfc46ad359dbf37c676ba12db4c8f4e874e1578b203a1f35cc077229ccbc9950b82e1784042f191018734cfaa09785b6b602388011db4a7b0 SHA512 5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe
-EBUILD mousepad-0.4.0-r1.ebuild 1256 BLAKE2B bf30442af25d24cb0a8d4caca524229e6349b04e0d6fb8be12845acda663e2f71641309e70caef06080a6b7c48c5741365dfc8a159e4a4091cbafc0cdbeea597 SHA512 21d25aa6bdaa3a60b854bf7e6e90c0363095273a491ef7f064e5a4d90d1a880eff9cbd55f9737c8ef3b19e9deeef4be2b3f4cf2a95a54ca9cf2e31fdddc35d91
diff --git a/app-editors/mousepad/files/mousepad-0.4.0-dbus-filename-passing-optimization.patch b/app-editors/mousepad/files/mousepad-0.4.0-dbus-filename-passing-optimization.patch
deleted file mode 100644
index 2598fc1..0000000
--- a/app-editors/mousepad/files/mousepad-0.4.0-dbus-filename-passing-optimization.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ee7636b8c832f2a8e19c6b3c9d0405f07147b16b Mon Sep 17 00:00:00 2001
-From: Matthew Brush <matt@xfce.org>
-Date: Fri, 26 Jun 2015 20:22:59 -0700
-Subject: Optimize previous commit passing UTF-8 to DBus
-
-
-diff --git a/mousepad/mousepad-dbus.c b/mousepad/mousepad-dbus.c
-index de76ba5..46ca823 100644
---- a/mousepad/mousepad-dbus.c
-+++ b/mousepad/mousepad-dbus.c
-@@ -312,24 +312,23 @@ mousepad_dbus_client_launch_files (gchar **filenames,
- g_return_val_if_fail (g_path_is_absolute (working_directory), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-- utf8_filenames = g_ptr_array_sized_new(length + 1);
-- g_ptr_array_set_free_func(utf8_filenames, g_free);
--
-+ utf8_filenames = g_ptr_array_new_with_free_func(g_free);
- if (filenames != NULL)
- {
-- gchar **fn_iter;
-+ guint i;
- /* get the length of the filesname string */
- length = g_strv_length (filenames);
-+ g_ptr_array_set_size(utf8_filenames, length + 1);
- /* encode locale filenames to UTF-8 for DBus */
-- for (fn_iter = filenames; *fn_iter != NULL; fn_iter++)
-+ for (i = 0; i < length; i++)
- {
-- gchar *utf8_fn = g_filename_to_utf8(*fn_iter, -1, NULL, NULL, error);
-+ gchar *utf8_fn = g_filename_to_utf8(filenames[i], -1, NULL, NULL, error);
- if (utf8_fn == NULL)
- {
- g_ptr_array_free(utf8_filenames, TRUE);
- return FALSE;
- }
-- g_ptr_array_add(utf8_filenames, utf8_fn);
-+ utf8_filenames->pdata[i] = utf8_fn;
- }
- }
- g_ptr_array_add(utf8_filenames, NULL);
---
-cgit v0.10.1
-
diff --git a/app-editors/mousepad/files/mousepad-0.4.0-dbus-filename-passing.patch b/app-editors/mousepad/files/mousepad-0.4.0-dbus-filename-passing.patch
deleted file mode 100644
index 5ff5f00..0000000
--- a/app-editors/mousepad/files/mousepad-0.4.0-dbus-filename-passing.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 8d554f7ad97f2b1a2f64a71ebb187fe6eae17281 Mon Sep 17 00:00:00 2001
-From: Matthew Brush <matt@xfce.org>
-Date: Fri, 26 Jun 2015 18:04:42 -0700
-Subject: Encode filenames passed to DBus as UTF-8
-
-
-diff --git a/mousepad/mousepad-dbus.c b/mousepad/mousepad-dbus.c
-index cb222da..de76ba5 100644
---- a/mousepad/mousepad-dbus.c
-+++ b/mousepad/mousepad-dbus.c
-@@ -306,21 +306,52 @@ mousepad_dbus_client_launch_files (gchar **filenames,
- DBusMessage *message;
- guint length = 0;
- gboolean succeed;
-+ GPtrArray *utf8_filenames;
-+ gchar *utf8_dir = NULL;
-
- g_return_val_if_fail (g_path_is_absolute (working_directory), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-- /* get the length of the filesname string */
-- if (filenames)
-- length = g_strv_length (filenames);
-+ utf8_filenames = g_ptr_array_sized_new(length + 1);
-+ g_ptr_array_set_free_func(utf8_filenames, g_free);
-+
-+ if (filenames != NULL)
-+ {
-+ gchar **fn_iter;
-+ /* get the length of the filesname string */
-+ length = g_strv_length (filenames);
-+ /* encode locale filenames to UTF-8 for DBus */
-+ for (fn_iter = filenames; *fn_iter != NULL; fn_iter++)
-+ {
-+ gchar *utf8_fn = g_filename_to_utf8(*fn_iter, -1, NULL, NULL, error);
-+ if (utf8_fn == NULL)
-+ {
-+ g_ptr_array_free(utf8_filenames, TRUE);
-+ return FALSE;
-+ }
-+ g_ptr_array_add(utf8_filenames, utf8_fn);
-+ }
-+ }
-+ g_ptr_array_add(utf8_filenames, NULL);
-+
-+ if (working_directory != NULL)
-+ {
-+ /* encode working directory to UTF-8 for DBus */
-+ utf8_dir = g_filename_to_utf8(working_directory, -1, NULL, NULL, error);
-+ if (utf8_dir == NULL)
-+ {
-+ g_ptr_array_free(utf8_filenames, TRUE);
-+ return FALSE;
-+ }
-+ }
-
- /* generate the message */
- message = dbus_message_new_method_call (MOUSEPAD_DBUS_INTERFACE, MOUSEPAD_DBUS_PATH,
- MOUSEPAD_DBUS_INTERFACE, "LaunchFiles");
- dbus_message_set_auto_start (message, FALSE);
- dbus_message_append_args (message,
-- DBUS_TYPE_STRING, &working_directory,
-- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &filenames, length,
-+ DBUS_TYPE_STRING, &utf8_dir,
-+ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &utf8_filenames->pdata, length,
- DBUS_TYPE_INVALID);
-
- /* send the message */
-@@ -329,5 +360,9 @@ mousepad_dbus_client_launch_files (gchar **filenames,
- /* unref the message */
- dbus_message_unref (message);
-
-+ /* cleanup the UTF-8 strings */
-+ g_ptr_array_free(utf8_filenames, TRUE);
-+ g_free(utf8_dir);
-+
- return succeed;
- }
---
-cgit v0.10.1
-
diff --git a/app-editors/mousepad/files/mousepad-0.4.0-dont-show-hidden-gsv.patch b/app-editors/mousepad/files/mousepad-0.4.0-dont-show-hidden-gsv.patch
deleted file mode 100644
index b13dbf5..0000000
--- a/app-editors/mousepad/files/mousepad-0.4.0-dont-show-hidden-gsv.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 720cf91f7b21864b4d3bb0ce18d96cfa719877ca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Miranda?= <andreldm1989@gmail.com>
-Date: Mon, 6 Jul 2015 19:45:06 -0700
-Subject: Don't show hidden GSV languages
-
-Some like "Defaults" aren't meant to be exposed to users and can
-even cause crashes. Closes bug #12043.
-
-diff --git a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c
-index 156ebbb..71b37f2 100644
---- a/mousepad/mousepad-action-group.c
-+++ b/mousepad/mousepad-action-group.c
-@@ -617,6 +617,13 @@ mousepad_action_group_get_sorted_section_names (void)
- language = gtk_source_language_manager_get_language (manager, *languages);
- if (G_LIKELY (GTK_SOURCE_IS_LANGUAGE (language)))
- {
-+ /* ignore hidden languages */
-+ if(gtk_source_language_get_hidden(language))
-+ {
-+ languages++;
-+ continue;
-+ }
-+
- /* ensure no duplicates in list */
- if (!g_slist_find_custom (list,
- gtk_source_language_get_section (language),
-@@ -651,6 +658,13 @@ mousepad_action_group_get_sorted_languages_for_section (const gchar *section)
- language = gtk_source_language_manager_get_language (manager, *languages);
- if (G_LIKELY (GTK_SOURCE_IS_LANGUAGE (language)))
- {
-+ /* ignore hidden languages */
-+ if(gtk_source_language_get_hidden(language))
-+ {
-+ languages++;
-+ continue;
-+ }
-+
- /* only get languages in the specified section */
- if (g_strcmp0 (gtk_source_language_get_section (language), section) == 0)
- list = g_slist_prepend (list, language);
---
-cgit v0.10.1
-
diff --git a/app-editors/mousepad/files/mousepad-0.4.0-prevent-weird-cycle-gsettings.patch b/app-editors/mousepad/files/mousepad-0.4.0-prevent-weird-cycle-gsettings.patch
deleted file mode 100644
index d90a63d..0000000
--- a/app-editors/mousepad/files/mousepad-0.4.0-prevent-weird-cycle-gsettings.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f07cc75f2aa77d14f16b5506321ac6a2413706ba Mon Sep 17 00:00:00 2001
-From: Matthew Brush <mbrush@codebrainz.ca>
-Date: Sun, 27 Sep 2015 12:29:15 -0700
-Subject: Prevent a weird cycle in GSettings use
-
-Was causing it to continuously update the "color-scheme" setting,
-resulting in lots of DBus spam and CPU/disk activity. I'm not sure
-why only this setting was causing the issue, and why it still updates
-across all the instances while using the `G_SETTINGS_BIND_GET_NO_CHANGES`
-flag, since it shouldn't (and doesn't if it's used on other settings).
-
-Closes bug #12134
-
-diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
-index bd0e37c..03f4609 100644
---- a/mousepad/mousepad-view.c
-+++ b/mousepad/mousepad-view.c
-@@ -324,10 +324,16 @@ mousepad_view_init (MousepadView *view)
- BIND_ (SHOW_RIGHT_MARGIN, "show-right-margin");
- BIND_ (SMART_HOME_END, "smart-home-end");
- BIND_ (TAB_WIDTH, "tab-width");
-- BIND_ (COLOR_SCHEME, "color-scheme");
- BIND_ (WORD_WRAP, "word-wrap");
- BIND_ (MATCH_BRACES, "match-braces");
-
-+ /* for color-scheme, use G_SETTINGS_BIND_GET_NO_CHANGES to stop
-+ * a cycle that was causing DBus thrashing. See:
-+ * https://bugzilla.xfce.org/show_bug.cgi?id=12134 */
-+ MOUSEPAD_SETTING_BIND (COLOR_SCHEME, view, "color-scheme",
-+ G_SETTINGS_BIND_DEFAULT |
-+ G_SETTINGS_BIND_GET_NO_CHANGES);
-+
- /* override with default font when the setting is enabled */
- MOUSEPAD_SETTING_CONNECT_OBJECT (USE_DEFAULT_FONT,
- G_CALLBACK (mousepad_view_use_default_font_setting_changed),
---
-cgit v0.10.1
-
diff --git a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
deleted file mode 100644
index b1f878e..0000000
--- a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus gtk3"
-
-RDEPEND=">=dev-libs/glib-2.30:2=
- dbus? ( >=dev-libs/dbus-glib-0.100:0= )
- !gtk3? ( >=x11-libs/gtk+-2.24:2=
- x11-libs/gtksourceview:2.0= )
- gtk3? ( x11-libs/gtk+:3=
- x11-libs/gtksourceview:3.0= )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=(
- "${FILESDIR}"/${P}-dbus-filename-passing.patch
- "${FILESDIR}"/${P}-dbus-filename-passing-optimization.patch
- "${FILESDIR}"/${P}-dont-show-hidden-gsv.patch
- "${FILESDIR}"/${P}-prevent-weird-cycle-gsettings.patch
- )
-
-
-src_configure() {
- local myconf=(
- $(use_enable dbus)
- $(use_enable gtk3)
- )
-
- econf "${myconf[@]}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- gnome2_schemas_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- gnome2_schemas_update
- xdg_desktop_database_update
-}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
deleted file mode 100644
index 9cc73cd..0000000
--- a/app-office/libreoffice/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX fix-execinfo.patch 1454 BLAKE2B e5dcddad97a37fb6348159cb49b95d8b8bc552b15b86162a39a7b3b0f6211c7e569c5b4640454a3ad7f7c7f30d54e9f68130d05257105eb568912a9e083bc35f SHA512 7f1f64459b680e8c789d511ae957f6182774b6d1ac9412650f7609c272ecf9ee4a073b01d32e8fde30c3d96fbab05a60c8fb87da8d53356c671f5202995b1429
-AUX fix-includes.patch 1245 BLAKE2B 049fdc0510ce2148e10b44e48e50ce2d00966663f71938e2f2afa3575a6cc25cc70d3d7bb061cf5efab9dd4418a112f225a79912b3dceea8f957529eafac0939 SHA512 39cde8e50e61537db8b9f40889d806c0c7247cca43701a19ed26c4e5a40699749f89218deb2bee5fbdd6846320a9d2eb290ca1b3a2df9ecf6eb5755d2d04b84d
-AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f6273b73ec0893190622f55a3d6d3c3e3e53c59a2f3ce3f645b011c1afa02b727ee803898c65f8feff723955a2fe1a69de6d24480 SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8
-AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
-AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
-AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29
-AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479
-AUX libreoffice-6.0.4.2-paxkernel.patch 881 BLAKE2B e0cf510589723842568b6616a28da945204f8b61ed384da4b9a65b5cda7801780985a175c4b9e34d8d40a4762c0363b337ba3eb14d58a08ad314a6e108b78342 SHA512 1b1b69a0116ebb2805f7c0ecf9a5656dfd1a27a15e7d94a7df310f47a4fe817a52fab2151688ec8c0543ae0bfb235770a418ed736968f88ec63850a09b5e337d
-AUX libreoffice-6.0.5.2-enable-gio-w-gtk3.patch 2011 BLAKE2B ecbde1fcb3bbd6ee3d3be9a6b105684bf9b9e18b3c034cfcae216f0b41d8ad47a58838e75b9f20ec620ce2f6a60468d3d436871e71288e3df3dd8e7fd53ebd15 SHA512 ee543bb2825730e2fe5efa32f435e2895e7fc7b546e9844bb1f34b98a734abaa5b8751223fc14f9913a8ccb964666b20347832687157089345a5513159ee7f21
-AUX linux-musl.patch 2198 BLAKE2B 2eec2c03ad678170b121f23a12c5b33c502d0edc6ce4970ca5562b9108c1cf21b88908a1d8b628c2f2cc572bdea75ce12b78dd29c5ec1697713bddd646f3a18c SHA512 52da356200beb292a1abcdcd64caaec0d5da59eeeb2741869188ec36da2e03247b926be924078ae1bd7099022ac6d09339523838eba3b207465e8896d4e5068a
-DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
-DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
-DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
-DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
-DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802 SHA512 fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d
-DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
-DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.0.5.2.tar.xz 2972956 BLAKE2B cfe585fb690bc0a348b67aae1330daa61a0a08acc580fad147853d84c9496d0ad4c4b14598492d4aba9af4afe7fa65bff0161a77b1c0cae9089d50e2a542e0c1 SHA512 975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
-EBUILD libreoffice-6.0.5.2-r1.ebuild 17029 BLAKE2B 91f98651938e43275030bf45c1020dca0a765af2f4098c6651e793904ee76e978fb3de268f9f5d0aea6c5cc11f066568c0222ef6af6887ca522bb0d7a602d431 SHA512 b32e8332173f2023911fab1b8a3356fa43038a66e242e59401efae2522189a0f11e82f381307ab173d2c539cfd62ea4a666d6ce41f3c288f5dd5308e5aff3b0a
diff --git a/app-office/libreoffice/files/fix-execinfo.patch b/app-office/libreoffice/files/fix-execinfo.patch
deleted file mode 100644
index 577debb..0000000
--- a/app-office/libreoffice/files/fix-execinfo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 22e97095b30583eae81b55cd83e3ab8b944faaad Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Mon, 11 Jun 2018 04:10:23 -0500
-Subject: [PATCH 2/3] execinfo header not needed on musl setup
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- sal/osl/unx/backtrace.c | 2 +-
- sal/osl/unx/backtrace.h | 2 +-
- sal/osl/unx/signal.cxx | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
-index f70031d0b..141ea4e06 100644
---- a/sal/osl/unx/backtrace.c
-+++ b/sal/osl/unx/backtrace.c
-@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
- }
- }
-
--#elif !defined LINUX
-+#elif !defined(__GLIBC__)
-
- int backtrace( void **buffer, int max_frames )
- {
-diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
-index 5fafc1c90..408c12c69 100644
---- a/sal/osl/unx/backtrace.h
-+++ b/sal/osl/unx/backtrace.h
-@@ -20,7 +20,7 @@
- #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H
- #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H
-
--#if defined (LINUX)
-+#if defined (LINUX) && defined (__GLIBC__)
-
- #include <execinfo.h>
-
-diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
-index 9a528fec3..bf15f628f 100644
---- a/sal/osl/unx/signal.cxx
-+++ b/sal/osl/unx/signal.cxx
-@@ -35,7 +35,7 @@
-
- #endif /* MACOSX */
-
--#ifdef LINUX
-+#if defined(LINUX) && defined(__GLIBC__)
- #include <execinfo.h>
- #include <link.h>
- #define INCLUDE_BACKTRACE
---
-2.17.1
-
diff --git a/app-office/libreoffice/files/fix-includes.patch b/app-office/libreoffice/files/fix-includes.patch
deleted file mode 100644
index 917eba3..0000000
--- a/app-office/libreoffice/files/fix-includes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From af25d1cb9c009d66a536e6bbd5f997c71e6592a7 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Mon, 11 Jun 2018 04:11:20 -0500
-Subject: [PATCH 3/3] fix includes for musl system
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 +-
- vcl/inc/headless/svpinst.hxx | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
-index 780224719..c938afe48 100644
---- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
-+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
-@@ -21,7 +21,7 @@
- #include <dbus/dbus.h>
- #include <errno.h>
- #include <fcntl.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/socket.h>
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/rfcomm.h>
-diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
-index ba8096032..bcb644b84 100644
---- a/vcl/inc/headless/svpinst.hxx
-+++ b/vcl/inc/headless/svpinst.hxx
-@@ -31,7 +31,7 @@
-
- #include <list>
-
--#include <time.h>
-+#include <sys/time.h>
-
- #define VIRTUAL_DESKTOP_WIDTH 1024
- #define VIRTUAL_DESKTOP_HEIGHT 768
---
-2.17.1
-
diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
deleted file mode 100644
index d714ff2..0000000
--- a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c 2017-01-11 16:54:33.000000000 -0800
-+++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c 2017-02-03 10:22:51.697673613 -0800
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
-
- /* do_pagein */
- static void do_pagein (const char * filename)
diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
deleted file mode 100644
index a6e732f..0000000
--- a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shell/source/unix/misc/senddoc.sh 2017-06-15 15:44:22.000000000 +0200
-+++ b/shell/source/unix/misc/senddoc.sh 2017-06-25 01:00:08.525435930 +0200
-@@ -389,6 +389,8 @@
- elif [ -n "$DESKTOP_LAUNCH" ]; then
- # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html
- MAILER=${DESKTOP_LAUNCH}
-+ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then
-+ MAILER=/usr/bin/kde-open5
- elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
- MAILER=/usr/bin/kde-open
- elif [ -x /usr/bin/xdg-open ] ; then
diff --git a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
deleted file mode 100644
index 83b56d1..0000000
--- a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/desktop/scripts/soffice.sh
-+++ a/desktop/scripts/soffice.sh
-@@ -147,6 +147,9 @@ if echo "$checks" | grep -q "cc" ; then
- exit 1;
- fi
-
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "$(uname -s)" in
- NetBSD|OpenBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
---- a/pyuno/source/module/uno.py
-+++ a/pyuno/source/module/uno.py
-@@ -16,11 +16,16 @@
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
-+import os
- import pyuno
- import sys
- import traceback
- import warnings
-
-+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
-+
- # since on Windows sal3.dll no longer calls WSAStartup
- import socket
-
---- a/pyuno/source/officehelper.py
-+++ a/pyuno/source/officehelper.py
-@@ -45,7 +45,7 @@ def bootstrap():
- if "UNO_PATH" in os.environ:
- sOffice = os.environ["UNO_PATH"]
- else:
-- sOffice = "" # lets hope for the best
-+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
- sOffice = os.path.join(sOffice, "soffice")
- if platform.startswith("win"):
- sOffice += ".exe"
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
deleted file mode 100644
index 03421c5..0000000
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-Kindly borrowed from Debian.
-
-14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
- system dependent way) e.g. on the Win@6 tinderbox it always
- crashes
-14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of
- the time
-
-diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
-index 25db0b6..14e507c 100644
---- a/toolkit/Module_toolkit.mk
-+++ b/toolkit/Module_toolkit.mk
-@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
- ifneq ($(OOO_JUNIT_JAR),)
- $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
- JunitTest_toolkit_complex \
-- JunitTest_toolkit_unoapi_1 \
-- JunitTest_toolkit_unoapi_2 \
-- JunitTest_toolkit_unoapi_3 \
-- JunitTest_toolkit_unoapi_4 \
- ))
- endif
-+# JunitTest_toolkit_unoapi_1 \
-+# JunitTest_toolkit_unoapi_2 \
-+# JunitTest_toolkit_unoapi_3 \
-+# JunitTest_toolkit_unoapi_4 \
-
- # vim: set noet sw=4 ts=4:
-diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
-index fa1684c..cc8e1a5 100644
---- a/sc/qa/unoapi/sc_1.sce
-+++ b/sc/qa/unoapi/sc_1.sce
-@@ -24,10 +24,3 @@
- # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
- # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
- -o sc.AccessibleEditableTextPara_PreviewCell
---o sc.ScAccessibleCell
--# i91044 -o sc.ScAccessibleCsvCell
--# i91044 -o sc.ScAccessibleCsvGrid
--# i84641 -o sc.ScAccessibleCsvRuler
--# i88330 -o sc.ScAccessibleDocument
--# i91045 -o sc.ScAccessibleDocumentPagePreview
---o sc.ScAccessiblePageHeader
-diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
-index dbfc3e1..d235c5d 100644
---- a/sc/qa/unoapi/sc_2.sce
-+++ b/sc/qa/unoapi/sc_2.sce
-@@ -15,11 +15,6 @@
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
--# fdo#FOO -o sc.ScAccessiblePageHeaderArea
---o sc.ScAccessiblePreviewCell
---o sc.ScAccessiblePreviewHeaderCell
---o sc.ScAccessiblePreviewTable
--# fdo#45337 -o sc.ScAccessibleSpreadsheet
- # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
- # -o sc.ScAnnotationObj
- # -o sc.ScAnnotationShapeObj
-
-12:18 < _rene_> chris_wot: ping?
-12:18 < chris_wot> heya
-12:18 < chris_wot> you pinged?
-12:19 < _rene_> chris_wot: any news on
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292?
-12:20 < _rene_> (of course the this-night-uploaded rc3 also failed)
-12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not
- gotten any further on that one
-12:22 < chris_wot> I honestly think that for this one just disable the test for
- now
-12:22 < chris_wot> I'll ping the ML
-
-This seems fixed when opening the original doc.
-
-diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-index 54eed4d..78019bd 100644
---- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
-
-
-
--DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
--{
-- xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-- if (!pXmlDoc)
-- return;
-- // there should be no flipH and flipV attributes in this case
-- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
-- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
-- // check rotation angle
-- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
-- // check the first few coordinates of the polygon
--#ifndef MACOSX /* Retina-related rounding roundtrip error
-- * hard to smooth out due to the use of string compare
-- * instead of number */
--#if !defined(_WIN32)
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
--#endif
--#endif
--}
-+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
-+//{
-+// xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-+// if (!pXmlDoc)
-+// return;
-+// // there should be no flipH and flipV attributes in this case
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
-+// // check rotation angle
-+// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
-+// // check the first few coordinates of the polygon
-+//#ifndef MACOSX /* Retina-related rounding roundtrip error
-+// * hard to smooth out due to the use of string compare
-+// * instead of number */
-+//#if !defined(_WIN32)
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
-+//#endif
-+//#endif
-+//}
-
-
- CPPUNIT_PLUGIN_IMPLEMENT();
-diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
-index 1c3925f..a16f001 100644
---- a/svx/qa/unoapi/svx.sce
-+++ b/svx/qa/unoapi/svx.sce
-@@ -25,7 +25,7 @@
- #i111216 -o svx.AccessiblePresentationGraphicShape
- #i111216 -o svx.AccessiblePresentationOLEShape
- #i85539 -o svx.AccessiblePresentationShape
---o svx.AccessibleShape
-+#-o svx.AccessibleShape
- #i90294 -o svx.GraphicExporter
- -o svx.SvxDrawPage
- #i85501 -o svx.SvxGraphCtrlAccessibleContext
-
-19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it
- fails on your side probably because the paragraph style is
- different. 1. I will change the test to avoid the exact
- dimensions. 2. meantime you can skip that test:
-https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd
-19:26 < IZBot> core - disable UI test that does exact comparison
-19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :)
-19:27 -!- jacobo [~jaragunde@fanzine.igalia.com] has quit [Quit: Leaving.]
-19:27 < _rene_> thanks, will do
-
-diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py
-index 8585e48d8c64..704f42c009a1 100644
---- a/uitest/writer_tests/tdf79236.py
-+++ b/uitest/writer_tests/tdf79236.py
-@@ -8,8 +8,11 @@ from uitest.framework import UITestCase
- import time
- from uitest.uihelper.common import get_state_as_dict, type_text
-
-+import unittest
-+
- class tdf79236(UITestCase):
-
-+ @unittest.skip("Currently broken")
- def test_paragraph(self):
-
- self.ui_test.create_doc_in_start_center("writer")
-
-14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it
- fails for you.
-14:40 <@sberg_> noelgrandin, no
-14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output
-14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished
- yet, I guess
-diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
-index 3273055d5373..cb452139170c 100644
---- a/chart2/Module_chart2.mk
-+++ b/chart2/Module_chart2.mk
-@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
- CppunitTest_chart2_export \
- CppunitTest_chart2_import \
- CppunitTest_chart2_trendcalculators \
-- CppunitTest_chart2_dump \
- CppunitTest_chart2_pivot_chart_test \
- ))
-+# CppunitTest_chart2_dump \
-
- ifeq ($(ENABLE_CHART_TESTS),TRUE)
- ifeq ($(WITH_FONTS), TRUE)
-diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-index 4d65beeb90c4..f3d71501c41a 100644
---- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
- }
-
-
--DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
-+/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
- {
- // the position of the flying text frame should be off page
- // 30624 below its anchor
- OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
- CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop );
-
--}
-+}*/
-
- DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
- {
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
deleted file mode 100644
index bd84b31..0000000
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
-index 457aedce0acb..4f02cf2b4040 100644
---- a/sw/qa/extras/rtfimport/rtfimport.cxx
-+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
-@@ -1352,7 +1352,7 @@ DECLARE_RTFIMPORT_TEST(testImportHeaderFooter, "tdf108055.rtf")
- DECLARE_RTFIMPORT_TEST(testTdf108947, "tdf108947.rtf")
- {
- //Check page count
-- CPPUNIT_ASSERT_EQUAL(2, getPages());
-+ CPPUNIT_ASSERT_EQUAL(1, getPages());
-
- //Check if Headers/Footers contain what they should in this document
- uno::Reference<text::XText> xHeaderTextRight = getProperty<uno::Reference<text::XText>>(
diff --git a/app-office/libreoffice/files/libreoffice-6.0.4.2-paxkernel.patch b/app-office/libreoffice/files/libreoffice-6.0.4.2-paxkernel.patch
deleted file mode 100644
index 2124c0e..0000000
--- a/app-office/libreoffice/files/libreoffice-6.0.4.2-paxkernel.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 006997df0a39feee276dfcf11dad4140d8910167 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Tue, 19 Jun 2018 18:41:07 -0500
-Subject: [PATCH] disable mprotect on gengal for pax kernel
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- solenv/gbuild/Gallery.mk | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
-index d08fe69ae..5082ca740 100644
---- a/solenv/gbuild/Gallery.mk
-+++ b/solenv/gbuild/Gallery.mk
-@@ -55,7 +55,8 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
-
- $(call gb_Gallery_get_target,%) : \
- $(call gb_Executable_get_runtime_dependencies,gengal)
-- $(call gb_Gallery__command,$@,$*)
-+ paxctl-ng -m $(call gb_Executable_get_target_for_build,gengal) \
-+ $(call gb_Gallery__command,$@,$*)
-
- $(call gb_Gallery__get_final_target,%) :
- touch $@
---
-2.17.1
-
diff --git a/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
deleted file mode 100644
index 4a01871..0000000
--- a/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a560bcbea943cb317e96c15c608c5e2f66e5698f Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Thu, 31 May 2018 14:14:48 +0200
-Subject: --enable-gio also for --disable-gtk --enable-gtk3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-...as is used by the Flatpak build. Other settings only checked in that block
-controlled by ENABLE_GTK, and thus potentially erronously left empty for
---disable-gtk --enable-gtk3 builds, are GTHREAD- and GTK_PRINT-related settings.
-GTHREAD_LIBS is explicitly used in vcl/Library_vclplug_gtk3.mk even, but it
-being empty apparently has no negative effects, so leave it at that for now.
-On the GTK_PRINT-related settings, Caolan commented on IRC: "ENABLE_GTK_PRINT
-is probably best removed entirely I guess, it didn't work out and they're
-redoing the dialog in upstream gtk again I'm told."
-
-Change-Id: I7e026c0ac9b23e7ace2c2e92390bdcc3be7d39a3
-Reviewed-on: https://gerrit.libreoffice.org/55127
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-(cherry picked from commit b5dd045bf533a2ba4d1c98debe5a2acba4c8b486)
-Reviewed-on: https://gerrit.libreoffice.org/55164
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index e35db48..9da61d9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9875,7 +9875,9 @@ if test "$test_gtk" = "yes"; then
- GTK_PRINT_CFLAGS=$(printf '%s' "$GTK_PRINT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
- FilterLibs "${GTK_PRINT_LIBS}"
- GTK_PRINT_LIBS="${filteredlibs}"
-+ fi
-
-+ if test "$ENABLE_GTK" = "TRUE" || test "$ENABLE_GTK3" = "TRUE"; then
- AC_MSG_CHECKING([whether to enable GIO support])
- if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
- dnl Need at least 2.26 for the dbus support.
---
-cgit v1.1
-
diff --git a/app-office/libreoffice/files/linux-musl.patch b/app-office/libreoffice/files/linux-musl.patch
deleted file mode 100644
index baadb49..0000000
--- a/app-office/libreoffice/files/linux-musl.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 6b74147fc8de0ada711175aa46876fc7d41b562f Mon Sep 17 00:00:00 2001
-From:
-Date: Mon, 11 Jun 2018 04:08:38 -0500
-Subject: [PATCH] add support for linux-musl to configure and remove glibc
- check
-
----
- configure.ac | 23 ++++-------------------
- 1 file changed, 4 insertions(+), 19 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 848dc4ff3..666a9ee04 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -573,7 +573,7 @@ solaris*)
- fi
- ;;
-
--linux-gnu*|k*bsd*-gnu*)
-+linux-gnu*|linux-musl*|k*bsd*-gnu*)
- test_gtk=yes
- build_gstreamer_1_0=yes
- build_gstreamer_0_10=yes
-@@ -4012,7 +4012,7 @@ kfreebsd*)
- esac
- ;;
-
--linux-gnu*)
-+linux-gnu*|linux-musl*)
- COM=GCC
- USING_X11=TRUE
- OS=LINUX
-@@ -6957,7 +6957,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
- ;;
-
-- linux-gnu*)
-+ linux-gnu*|linux-musl*)
- JAVAINC="-I$JAVA_HOME/include"
- JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -9460,21 +9460,6 @@ if test "$with_system_libexttextcat" = "yes"; then
- fi
- AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
-
--dnl ***************************************
--dnl testing libc version for Linux...
--dnl ***************************************
--if test "$_os" = "Linux"; then
-- AC_MSG_CHECKING([whether libc is >= 2.1.1])
-- exec 6>/dev/null # no output
-- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
-- exec 6>&1 # output on again
-- if test "$HAVE_LIBC"; then
-- AC_MSG_RESULT([yes])
-- else
-- AC_MSG_ERROR([no, upgrade libc])
-- fi
--fi
--
- dnl =========================================
- dnl Check for uuidgen
- dnl =========================================
-@@ -12470,7 +12455,7 @@ else
-
- case "$host_os" in
-
-- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
-+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
- if test "$ENABLE_JAVA" != ""; then
- pathmunge "$JAVA_HOME/bin" "after"
- fi
---
-2.17.1
-
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
deleted file mode 100644
index 2c8224f..0000000
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
+++ /dev/null
@@ -1,579 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-02.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.13.3
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- sys-libs/zlib:=
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- jemalloc? ( dev-libs/jemalloc )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.3:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
-
- # 6.0 branch
- "${FILESDIR}/${P}-enable-gio-w-gtk3.patch" #bug 661062
-
-- # Musl Patches
-- "${FILESDIR}/linux-musl.patch"
-- "${FILESDIR}/fix-execinfo.patch"
-- "${FILESDIR}/fix-includes.patch"
--
-- # Only to be applied on pax enabled kernels
-- "${FILESDIR}/${PN}-6.0.4.2-paxkernel.patch"
-
- # gtk3-kde5 vcl plugin backported from master
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
- --with-build-version="Gentoo official package"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable kde qt5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
deleted file mode 100644
index 7a39b60..0000000
--- a/dev-python/m2crypto/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX m2crypto-0.27.0-libressl.patch 6213 SHA256 7ca223d97756cc94879fe7744aec665dfa44a106a90c2c6e163ae14058127124 SHA512 ac09a09a430a9c6a31fa9abec9c95e643714951bdd8b0fe6c30f8f5ce737d6080dd6066ecb79ae960df16a21646c406698fc768eeb1a8235b8b72200b7061b68 WHIRLPOOL 00619900c0ac82c5aea6efc025520c15587a5a6567079f9c4fc2a756197b42e3eb750c719817ccd3756e708b1bba605dc5a1215c37a3fbeaf759c0256a1e8848
-DIST M2Crypto-0.27.0.tar.gz 1119288 SHA256 82317459d653322d6b37f122ce916dc91ddcd9d1b814847497ac796c4549dd68 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2 WHIRLPOOL 678f19d7bcd0663b704761a78b8e2d39a1c62450f99d5b0aa513e8b8af717ef1935b274eef99d4e027e8e5992887806bd270fcba02fd3e650f086f8b87f5adc7
-EBUILD m2crypto-0.27.0.ebuild 1044 SHA256 80dcfdb003bb7864fa2dd9da7de9041bee23ec0be6c34b8e75082280fddcb8c9 SHA512 ac927184c9eaac941fc54b7f65274048ffbbca3eee1127c4d5fd2393d7d08f2c7fad49f826f1fad1ee4eba52e404578c9a6f1f2d294ecc2a290c980e1bae6cfd WHIRLPOOL 12dfab32af2ba68c4ba75a411d46a8f78874d74c4105373cd00b84ab676213cf96bcedbecedd49236a7ac8ab036dfa2dd75082fa54d54649122522b3c8645cd9
-MISC metadata.xml 380 SHA256 5ab7583a3fb8617ce68eb175d57b6a1ba951baca62d0179d80f63aca9eba3635 SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6 WHIRLPOOL f7bbc7ad82ae17374b32f1606bbf8960c799800debf709111abffb1df8da39d4492038dbeb3e3eb135f81f43038615d6d0fc0810151a58d5c27a3936237df9da
diff --git a/dev-python/m2crypto/files/m2crypto-0.27.0-libressl.patch b/dev-python/m2crypto/files/m2crypto-0.27.0-libressl.patch
deleted file mode 100644
index 798b193..0000000
--- a/dev-python/m2crypto/files/m2crypto-0.27.0-libressl.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From f9a7fe51cb523363baa57073cc8dbeaa7db756a6 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Sat, 14 Oct 2017 23:11:54 -0500
-Subject: [PATCH] Fix support for libressl
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- SWIG/_bio.i | 6 +++---
- SWIG/_evp.i | 2 +-
- SWIG/_lib.i | 4 ++--
- SWIG/_lib11_compat.i | 2 +-
- SWIG/_ssl.i | 4 ++--
- SWIG/_threads.i | 10 +++++-----
- SWIG/libcrypto-compat.h | 2 +-
- 7 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/SWIG/_bio.i b/SWIG/_bio.i
-index 770b2ba..cd7fe53 100644
---- a/SWIG/_bio.i
-+++ b/SWIG/_bio.i
-@@ -63,14 +63,14 @@ extern BIO *BIO_pop(BIO *);
- static PyObject *_bio_err;
-
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- void pyfd_init(void);
- #endif
-
- void bio_init(PyObject *bio_err) {
- Py_INCREF(bio_err);
- _bio_err = bio_err;
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- pyfd_init();
- #endif
- }
-@@ -299,7 +299,7 @@ int bio_should_write(BIO* a) {
- return BIO_should_write(a);
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- /* implment custom BIO_s_pyfd */
-
- #ifdef WIN32
-diff --git a/SWIG/_evp.i b/SWIG/_evp.i
-index bab8ac7..786d474 100644
---- a/SWIG/_evp.i
-+++ b/SWIG/_evp.i
-@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
- #include <openssl/rsa.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- HMAC_CTX *HMAC_CTX_new(void) {
- HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));
-diff --git a/SWIG/_lib.i b/SWIG/_lib.i
-index 1d847ae..b361208 100644
---- a/SWIG/_lib.i
-+++ b/SWIG/_lib.i
-@@ -18,7 +18,7 @@
-
- %{
- /* OpenSSL 1.0.2 copmatbility shim */
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
- typedef void (*OPENSSL_sk_freefunc)(void *);
- typedef void *(*OPENSSL_sk_copyfunc)(const void *);
- typedef struct stack_st OPENSSL_STACK;
-@@ -501,7 +501,7 @@ int passphrase_callback(char *buf, int num, int v, void *arg) {
- %inline %{
-
- void lib_init() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- SSLeay_add_all_algorithms();
- ERR_load_ERR_strings();
- #endif
-diff --git a/SWIG/_lib11_compat.i b/SWIG/_lib11_compat.i
-index 1ec42dd..9053dfb 100644
---- a/SWIG/_lib11_compat.i
-+++ b/SWIG/_lib11_compat.i
-@@ -8,7 +8,7 @@
- */
-
- %{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #include <string.h>
- #include <openssl/engine.h>
-diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i
-index c0b58e9..210462f 100644
---- a/SWIG/_ssl.i
-+++ b/SWIG/_ssl.i
-@@ -268,7 +268,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) {
-
- #ifndef OPENSSL_NO_SSL3
- const SSL_METHOD *sslv3_method(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- PyErr_WarnEx(PyExc_DeprecationWarning,
- "Function SSLv3_method has been deprecated.", 1);
- #endif
-@@ -277,7 +277,7 @@ const SSL_METHOD *sslv3_method(void) {
- #endif
-
- const SSL_METHOD *tlsv1_method(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- PyErr_WarnEx(PyExc_DeprecationWarning,
- "Function TLSv1_method has been deprecated.", 1);
- #endif
-diff --git a/SWIG/_threads.i b/SWIG/_threads.i
-index 69adb9f..091230f 100644
---- a/SWIG/_threads.i
-+++ b/SWIG/_threads.i
-@@ -5,7 +5,7 @@
- #include <pythread.h>
- #include <openssl/crypto.h>
-
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS)
- static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
- static long lock_count[CRYPTO_num_locks()];
-@@ -13,7 +13,7 @@ static int thread_mode = 0;
- #endif
-
- void threading_locking_callback(int mode, int type, const char *file, int line) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- if (mode & CRYPTO_LOCK) {
- PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
- lock_count[type]++;
-@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, const char *file, int line)
- }
-
- unsigned long threading_id_callback(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- return (unsigned long)PyThread_get_thread_ident();
- #else
- return (unsigned long)0;
-@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) {
-
- %inline %{
- void threading_init(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- int i;
- if (!thread_mode) {
- for (i=0; i<CRYPTO_num_locks(); i++) {
-@@ -50,7 +50,7 @@ void threading_init(void) {
- }
-
- void threading_cleanup(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- int i;
- if (thread_mode) {
- CRYPTO_set_locking_callback(NULL);
-diff --git a/SWIG/libcrypto-compat.h b/SWIG/libcrypto-compat.h
-index edf09a8..f7df0bc 100644
---- a/SWIG/libcrypto-compat.h
-+++ b/SWIG/libcrypto-compat.h
-@@ -1,7 +1,7 @@
- #ifndef LIBCRYPTO_COMPAT_H
- #define LIBCRYPTO_COMPAT_H
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #include <openssl/rsa.h>
- #include <openssl/dsa.h>
---
-2.14.2
-
diff --git a/dev-python/m2crypto/m2crypto-0.27.0.ebuild b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
deleted file mode 100644
index 39f47b9..0000000
--- a/dev-python/m2crypto/m2crypto-0.27.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-IUSE="libressl"
-
-RDEPEND="
- !libressl? ( >=dev-libs/openssl-0.9.8:0= )
- libressl? ( dev-libs/libressl:0= )
- dev-python/typing[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=dev-lang/swig-1.3.28:0
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
-
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
-python_compile() {
- distutils-r1_python_compile --openssl="${EPREFIX}"/usr
-}
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/m2crypto/metadata.xml b/dev-python/m2crypto/metadata.xml
deleted file mode 100644
index ed10818..0000000
--- a/dev-python/m2crypto/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 type="project">
- <email>python@gentoo.org</email>
- <name>Python</name>
- </maintainer>
- <upstream>
- <remote-id type="pypi">M2Crypto</remote-id>
- <remote-id type="gitlab">m2crypto/m2crypto</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
deleted file mode 100644
index 24a225b..0000000
--- a/gnome-extra/nm-applet/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST network-manager-applet-1.8.14.tar.xz 1513668 BLAKE2B a07baa11717632333b4957e6cc60b9ee8d9c656874e99337d5e5c9d115c99f10daee94b2a75f72991fa4a20d268122e73cf2ed74f41d29bbee7614965f0b9900 SHA512 e446a2e90faf17e672fa79a53280957dfd9a7a022293dfd578b4ebb71e821c2f387f8ec821c2dcd9a24d1e00e0bd32a4ac3c5d802b9a4fdd7f876c870f406eea
-EBUILD nm-applet-1.8.14.ebuild 1531 BLAKE2B f50087479eaa7418a788ca360d782243ec4211dc258825f2f41195f33aebbfc179af2c1d3cfe8479f902d8a339ec79fde58573e8c9257211bb088aa4041c1fc8 SHA512 5cc0ab3a20862a42e0507bd9fed6ec2b4f6e06d48191863424ebe0d69291fbfbd892f47653e78c268d1b54dfc0eda8ff4b93b8cc83b0c326c5e6d5b8821d7f7d
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.14.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.14.ebuild
deleted file mode 100644
index dc271cb..0000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.14.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- >=app-crypt/libsecret-0.18
- >=dev-libs/glib-2.38:2[dbus]
- >=dev-libs/dbus-glib-0.88
- >=sys-apps/dbus-1.4.1
- >=sys-auth/polkit-0.96-r1
- >=x11-libs/gtk+-3.10:3[introspection?]
- >=x11-libs/libnotify-0.7.0
-
- app-text/iso-codes
- >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
- net-misc/mobile-broadband-provider-info
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
- virtual/freedesktop-icon-theme
- virtual/libgudev:=
- gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
- modemmanager? ( net-misc/modemmanager )
- selinux? ( sys-libs/libselinux )
- teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.0
- >=dev-util/intltool-0.50.1
- virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-src_configure() {
- local myconf=(
- --without-appindicator
- --disable-lto
- --disable-ld-gc
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- $(use_enable introspection)
- $(use_with gcr)
- $(use_with modemmanager wwan)
- $(use_with selinux)
- $(use_with teamd team)
- )
- gnome2_src_configure "${myconf[@]}"
-}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
deleted file mode 100644
index 27049c5..0000000
--- a/media-video/ffmpeg/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX chromium.patch 1420 BLAKE2B 1acf931cd2e635b0b6c2c42d649d1bc92ac59321acc451501c70076d84449fd17b3a95c24a33208994df9aac8f8959a084f0ebaedaf0c997f535008594872bd8 SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59
-AUX ffmpeg-3.3-libressl.patch 2028 BLAKE2B 2ff5d762901d1dc260b7907a5f279a92cc6c5085dc71a1621fe966738b7e69b1fcece456e98d0c9abde9b4c36d60144f79b1083212a3aa254441b6a6f6f0825e SHA512 9a259be0b1957b715d07ca27ef72d36a9f297be06e4d875ed711d7b3ebcad345e6e11e1e447daf07e5b5f5f2bcf2f08e14689f36d427ddbf1b6ace1583838e92
-AUX openjpeg22.patch 4770 BLAKE2B b5fd034e2af9d180b2e0ee76e5227fcc948e20bacc5e463c8d7d640db3c3e52dd0f12149e5a095388c3b8db0d7c37bb4080be3141b90fd554c46aa4650585b27 SHA512 8a198910cdf43df83fdf50e372c2ec5d911637dd61768d5ac3a1984f99d1f374f594af9ff6c501b248c390a22898e4964f7d07c81eb3586fa1bebad2c9e00730
-AUX openjpeg23.patch 5105 BLAKE2B 64aab97ec21e44f7ab94c9513ebf63e60a76698889ed3cafebec3a25adb07dddffe9358c4c3b29f89b0d0b4c8bb54d9197a5b8ca2e4105c539fd6b513ad5c247 SHA512 a1e3b91add49a80633e19eb49870ecb7ef1493cf3503d121bdeb74f2fcd0320b8e5f04a3505241f7375f4a598f5da651afb92350e3b92412977f55b9193409a7
-DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03 SHA512 1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23
-DIST ffmpeg-3.4.3.tar.bz2 10183483 BLAKE2B 144811663ab32db05577e262e2fcf9087528544b2f27fb6c551317d4916d399ee2d6e70f6f5ce6351ba78f6f51609b2455eef6170b3e339699c9f2486a459194 SHA512 924838d334d905de23c950634ad905bc55ae4435e135afdea93639a598ad522c020165f4528c66560448c136c28770c3fd3311328c2307bb232bc1d0914af964
-EBUILD ffmpeg-3.3.6.ebuild 16235 BLAKE2B 4733c766a5ab6f2f318e2acc05e91415d0a33807b8c87124b13cc572283e6248d0c4603bf8a98cf10e9df623d923dc46fb06a0c344315430c487c4d040bd8093 SHA512 8038b6fe0748db1ee30c92221ecca30d6c5a1fc7daaf5dfac7845cfc72aeab7d1b8b2e6649a38f24c20f289bea91e62f5bafb8c96eb3a9ce317fff08d6b8ead6
-EBUILD ffmpeg-3.4.3.ebuild 15928 BLAKE2B bd5be1695bb64f2ccec07545dc060d25d8f22f66fd7b703f9a39fcc0fcafbdf67aadfbe23446fbc8bbfead061c8efb8b254226d33b622970af004f8bc1871e6d SHA512 9ebf17376b90ca7e432198bb0f1d5ae24dc2b0ee01ac0e1c288a346ddcd587f769a8df6410d4ee54e5e3b2df388773b73b9288a6384773e689a1f8e477d61e6f
-MISC metadata.xml 5585 BLAKE2B bc42c495be25df478ad37d6f7f9ac85dadb2a21571d0de2105b9f7371528246b4c71604cd476bc12ef6ef22dc227d705bef9dd0246a6ff02da9ce2a4bb9af74a SHA512 7ed5ff26cc2cabff62045f00354cd5b7f5638d5d766ccf3d2b6eedff2b059b56bffc033e57c0d61deee5566d0c274403faa671ccefa58dc79fbeb515fa4dd5e0
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
deleted file mode 100644
index de50fc5..0000000
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
- SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
- !gpl? ( LGPL-2.1 )
- gpl? ( GPL-2 )
- amr? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- gmp? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- encode? (
- amrenc? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- )
- samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~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.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
- +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
- +gpl +hardcoded-tables +iconv lzma +network openssl +postproc
- samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
- xcb:libxcb-shm xcb:libxcb-xfixes +zlib
- # libavdevice options
- cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
- opengl
- # indevs
- libv4l:libv4l2 pulseaudio:libpulse
- # decoders
- amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
- jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
- mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
- zvbi:libzvbi
- # libavfilter options
- bs2b:libbs2b chromaprint flite:libflite frei0r
- fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
- rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg
- # libswresample options
- libsoxr
- # Threads; we only support pthread for now but ffmpeg supports more
- +threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
- amrenc:libvo-amrwbenc mp3:libmp3lame
- kvazaar:libkvazaar nvenc:nvenc
- openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
- wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
- alsa chromium doc +encode jack libressl oss pic static-libs test v4l
- ${FFMPEG_FLAG_MAP[@]%:*}
- ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
- cpu_flags_arm_thumb:armv5te
- cpu_flags_arm_v6:armv6
- cpu_flags_arm_thumb2:armv6t2
- cpu_flags_arm_neon:neon
- cpu_flags_arm_vfp:vfp
- cpu_flags_arm_vfpv3:vfpv3
- cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
- arm64? ( cpu_flags_arm_v8 )
- cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
- cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
- cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
- cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
- cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
- cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
- cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
- cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
- cpu_flags_x86_xop? ( cpu_flags_x86_avx )
- cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
- cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
- cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 )
- cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
- cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
- cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
- cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
- cpu_flags_x86_sse? ( cpu_flags_x86_mmxext )
- cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx )
- cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow )
- cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-"
-
-IUSE="${IUSE}
- ${ARM_CPU_FEATURES[@]%:*}
- ${MIPS_CPU_FEATURES[@]%:*}
- ${PPC_CPU_FEATURES[@]%:*}
- ${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
- ${ARM_CPU_REQUIRED_USE}
- ${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
-# $(tc-arch).
-CPU_FEATURES_MAP="
- arm:ARM
- arm64:ARM
- mips:MIPS
- ppc:PPC
- ppc64:PPC
- x86:X86
- amd64:X86
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
- bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
- bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
- bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
- celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
- chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
- encode? (
- amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
- kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
- nvenc? ( media-video/nvidia_video_sdk )
- openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
- snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
- theora? (
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- )
- twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
- wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
- webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
- x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
- x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
- xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
- )
- fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
- flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
- fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- frei0r? ( media-plugins/frei0r-plugins )
- fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
- gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
- gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
- gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
- gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
- gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
- iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
- iec61883? (
- >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
- >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
- )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
- libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
- libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
- libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
- libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
- libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
- mmal? ( media-libs/raspberrypi-userland )
- modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
- opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
- openssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )
- opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
- rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
- samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
- sofalizer? (
- >=sci-libs/netcdf-4.3.2-r1[hdf5]
- >=sci-libs/hdf5-1.8.18[hl]
- )
- speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
- vorbis? (
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- )
- vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- )
- xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
- zeromq? ( >=net-libs/zeromq-4.1.6 )
- zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
- !media-video/qt-faststart
- postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/make-3.81
- doc? ( sys-apps/texinfo )
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
- cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
- test? ( net-misc/wget sys-devel/bc )
- v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
- postproc? ( gpl )
- frei0r? ( gpl )
- cdio? ( gpl )
- samba? ( gpl )
- encode? (
- x264? ( gpl )
- x265? ( gpl )
- xvid? ( gpl )
- X? ( !xcb? ( gpl ) )
- )
-"
-REQUIRED_USE="
- libv4l? ( v4l )
- fftools_cws2fws? ( zlib )
- test? ( encode )
- ${GPL_REQUIRED_USE}
- ${CPU_REQUIRED_USE}"
-RESTRICT="
- gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/libavutil/avconfig.h
-)
-
-PATCHES=(
- "${FILESDIR}"/openjpeg22.patch
- "${FILESDIR}"/openjpeg23.patch
- "${FILESDIR}"/chromium.patch
- "${FILESDIR}"/${PN}-3.3-libressl.patch
-)
-
-src_prepare() {
- if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
- export revision=git-N-${FFMPEG_REVISION}
- fi
- default
- echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
- local myconf=( ${EXTRA_FFMPEG_CONF} )
-
- local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
- use openssl && use gpl && myconf+=( --enable-nonfree )
- use samba && myconf+=( --enable-version3 )
-
- # Encoders
- if use encode ; then
- ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
- # Licensing.
- if use amrenc ; then
- myconf+=( --enable-version3 )
- fi
- else
- myconf+=( --disable-encoders )
- fi
-
- # Indevs
- use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
- for i in alsa oss jack ; do
- use ${i} || myconf+=( --disable-indev=${i} )
- done
-
- # Outdevs
- for i in alsa oss sdl ; do
- use ${i} || myconf+=( --disable-outdev=${i} )
- done
-
- # Decoders
- use amr && myconf+=( --enable-version3 )
- use gmp && myconf+=( --enable-version3 )
- use fdk && use gpl && myconf+=( --enable-nonfree )
-
- for i in "${ffuse[@]#+}" ; do
- myconf+=( $(use_enable ${i%:*} ${i#*:}) )
- done
-
- # (temporarily) disable non-multilib deps
- if ! multilib_is_native_abi; then
- for i in frei0r netcdf libzmq ; do
- myconf+=( --disable-${i} )
- done
- fi
-
- # CPU features
- for i in ${CPU_FEATURES_MAP} ; do
- if [ "$(tc-arch)" = "${i%:*}" ] ; then
- local var="${i#*:}_CPU_FEATURES[@]"
- for j in ${!var} ; do
- use ${j%:*} || myconf+=( --disable-${j#*:} )
- done
- fi
- done
-
- if use pic ; then
- myconf+=( --enable-pic )
- # disable asm code if PIC is required
- # as the provided asm decidedly is not PIC for x86.
- [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
- fi
- [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
- # Try to get cpu type based on CFLAGS.
- # Bug #172723
- # We need to do this so that features of that CPU will be better used
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure
- # will just ignore it.
- for i in $(get-flag mcpu) $(get-flag march) ; do
- [[ ${i} = native ]] && i="host" # bug #273421
- myconf+=( --cpu=${i} )
- break
- done
-
- # LTO support, bug #566282
- is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
- # Mandatory configuration
- myconf=(
- --enable-avfilter
- --enable-avresample
- --disable-stripping
- "${myconf[@]}"
- )
-
- # cross compile support
- if tc-is-cross-compiler ; then
- myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
- case ${CHOST} in
- *freebsd*)
- myconf+=( --target-os=freebsd )
- ;;
- *mingw32*)
- myconf+=( --target-os=mingw32 )
- ;;
- *linux*)
- myconf+=( --target-os=linux )
- ;;
- esac
- fi
-
- # doc
- myconf+=(
- $(multilib_native_use_enable doc)
- $(multilib_native_use_enable doc htmlpages)
- $(multilib_native_enable manpages)
- )
-
- set -- "${S}/configure" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --mandir="${EPREFIX}/usr/share/man" \
- --enable-shared \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --optflags="${CFLAGS}" \
- $(use_enable static-libs static) \
- "${myconf[@]}"
- echo "${@}"
- "${@}" || die
-
- if multilib_is_native_abi && use chromium; then
- einfo "Configuring for Chromium"
- mkdir -p ../chromium || die
- pushd ../chromium >/dev/null || die
- set -- "${@}" \
- --disable-shared \
- --enable-static \
- --enable-pic \
- --extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
- echo "${@}"
- "${@}" || die
- popd >/dev/null || die
- fi
-}
-
-multilib_src_compile() {
- emake V=1
-
- if multilib_is_native_abi; then
- for i in "${FFTOOLS[@]}" ; do
- if use fftools_${i} ; then
- emake V=1 tools/${i}$(get_exeext)
- fi
- done
-
- if use chromium; then
- einfo "Compiling for Chromium"
- pushd ../chromium >/dev/null || die
- emake V=1 libffmpeg
- popd >/dev/null || die
- fi
- fi
-}
-
-multilib_src_install() {
- emake V=1 DESTDIR="${D}" install install-doc
-
- if multilib_is_native_abi; then
- for i in "${FFTOOLS[@]}" ; do
- if use fftools_${i} ; then
- dobin tools/${i}$(get_exeext)
- fi
- done
-
- if use chromium; then
- einfo "Installing for Chromium"
- pushd ../chromium >/dev/null || die
- emake V=1 DESTDIR="${D}" install-libffmpeg
- popd >/dev/null || die
- fi
- fi
-}
-
-multilib_src_install_all() {
- dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
- [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
- emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-3.4.3.ebuild b/media-video/ffmpeg/ffmpeg-3.4.3.ebuild
deleted file mode 100644
index c1f63be..0000000
--- a/media-video/ffmpeg/ffmpeg-3.4.3.ebuild
+++ /dev/null
@@ -1,497 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
- SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
- !gpl? ( LGPL-2.1 )
- gpl? ( GPL-2 )
- amr? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- gmp? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- encode? (
- amrenc? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- )
- samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~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.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
- +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
- +gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc
- samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
- xcb:libxcb-shm xcb:libxcb-xfixes +zlib
- # libavdevice options
- cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
- opengl
- # indevs
- libv4l:libv4l2 pulseaudio:libpulse libdrm
- # decoders
- amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
- jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
- mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- speex:libspeex svg:librsvg vorbis:libvorbis
- vpx:libvpx zvbi:libzvbi
- # libavfilter options
- appkit
- bs2b:libbs2b chromaprint flite:libflite frei0r
- fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
- rubberband:librubberband zeromq:libzmq zimg:libzimg
- # libswresample options
- libsoxr
- # Threads; we only support pthread for now but ffmpeg supports more
- +threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
- amrenc:libvo-amrwbenc mp3:libmp3lame
- kvazaar:libkvazaar nvenc:nvenc
- openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
- wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
- alsa chromium doc +encode jack libressl oss pic static-libs test v4l
- ${FFMPEG_FLAG_MAP[@]%:*}
- ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
- cpu_flags_arm_thumb:armv5te
- cpu_flags_arm_v6:armv6
- cpu_flags_arm_thumb2:armv6t2
- cpu_flags_arm_neon:neon
- cpu_flags_arm_vfp:vfp
- cpu_flags_arm_vfpv3:vfpv3
- cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
- arm64? ( cpu_flags_arm_v8 )
- cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
- cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
- cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
- cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
- cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
- cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
- cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
- cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
- cpu_flags_x86_xop? ( cpu_flags_x86_avx )
- cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
- cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
- cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 )
- cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
- cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
- cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
- cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
- cpu_flags_x86_sse? ( cpu_flags_x86_mmxext )
- cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx )
- cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow )
- cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
- ${ARM_CPU_FEATURES[@]}
- ${MIPS_CPU_FEATURES[@]}
- ${PPC_CPU_FEATURES[@]}
- ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
- ${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
- ${ARM_CPU_REQUIRED_USE}
- ${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
- bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
- bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
- bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
- celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
- chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
- encode? (
- amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
- kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
- nvenc? ( media-video/nvidia_video_sdk )
- openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
- snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
- theora? (
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- )
- twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
- wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
- webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
- x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
- x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
- xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
- )
- fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
- flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
- fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- frei0r? ( media-plugins/frei0r-plugins )
- fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
- gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
- gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
- gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
- gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
- gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
- iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
- iec61883? (
- >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
- >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
- )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
- libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
- libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
- libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
- libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
- libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
- libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
- mmal? ( media-libs/raspberrypi-userland )
- modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
- openssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )
- opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
- rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
- samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
- speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
- svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
- vorbis? (
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- )
- vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- )
- xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
- zeromq? ( >=net-libs/zeromq-4.1.6 )
- zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
- !media-video/qt-faststart
- postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/make-3.81
- doc? ( sys-apps/texinfo )
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
- cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
- test? ( net-misc/wget sys-devel/bc )
- v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
- postproc? ( gpl )
- frei0r? ( gpl )
- cdio? ( gpl )
- samba? ( gpl )
- encode? (
- x264? ( gpl )
- x265? ( gpl )
- xvid? ( gpl )
- X? ( !xcb? ( gpl ) )
- )
-"
-REQUIRED_USE="
- libressl? ( openssl )
- libv4l? ( v4l )
- fftools_cws2fws? ( zlib )
- test? ( encode )
- ${GPL_REQUIRED_USE}
- ${CPU_REQUIRED_USE}"
-RESTRICT="
- gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
- "${FILESDIR}"/chromium.patch
- "${FILESDIR}"/${PN}-3.3-libressl.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
- if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
- export revision=git-N-${FFMPEG_REVISION}
- fi
- default
- echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
- local myconf=( ${EXTRA_FFMPEG_CONF} )
-
- local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
- use openssl && use gpl && myconf+=( --enable-nonfree )
- use samba && myconf+=( --enable-version3 )
-
- # Encoders
- if use encode ; then
- ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
- # Licensing.
- if use amrenc ; then
- myconf+=( --enable-version3 )
- fi
- else
- myconf+=( --disable-encoders )
- fi
-
- # Indevs
- use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
- for i in alsa oss jack ; do
- use ${i} || myconf+=( --disable-indev=${i} )
- done
-
- # Outdevs
- for i in alsa oss sdl ; do
- use ${i} || myconf+=( --disable-outdev=${i} )
- done
-
- # Decoders
- use amr && myconf+=( --enable-version3 )
- use gmp && myconf+=( --enable-version3 )
- use fdk && use gpl && myconf+=( --enable-nonfree )
-
- for i in "${ffuse[@]#+}" ; do
- myconf+=( $(use_enable ${i%:*} ${i#*:}) )
- done
-
- # (temporarily) disable non-multilib deps
- if ! multilib_is_native_abi; then
- for i in frei0r libzmq ; do
- myconf+=( --disable-${i} )
- done
- fi
-
- # CPU features
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- use ${i%:*} || myconf+=( --disable-${i#*:} )
- done
-
- if use pic ; then
- myconf+=( --enable-pic )
- # disable asm code if PIC is required
- # as the provided asm decidedly is not PIC for x86.
- [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
- fi
- [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
- # Try to get cpu type based on CFLAGS.
- # Bug #172723
- # We need to do this so that features of that CPU will be better used
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure
- # will just ignore it.
- for i in $(get-flag mcpu) $(get-flag march) ; do
- [[ ${i} = native ]] && i="host" # bug #273421
- myconf+=( --cpu=${i} )
- break
- done
-
- # LTO support, bug #566282
- is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
- # Mandatory configuration
- myconf=(
- --enable-avfilter
- --enable-avresample
- --disable-stripping
- "${myconf[@]}"
- )
-
- # cross compile support
- if tc-is-cross-compiler ; then
- myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
- case ${CHOST} in
- *freebsd*)
- myconf+=( --target-os=freebsd )
- ;;
- *mingw32*)
- myconf+=( --target-os=mingw32 )
- ;;
- *linux*)
- myconf+=( --target-os=linux )
- ;;
- esac
- fi
-
- # doc
- myconf+=(
- $(multilib_native_use_enable doc)
- $(multilib_native_use_enable doc htmlpages)
- $(multilib_native_enable manpages)
- )
-
- set -- "${S}/configure" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --mandir="${EPREFIX}/usr/share/man" \
- --enable-shared \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --optflags="${CFLAGS}" \
- $(use_enable static-libs static) \
- "${myconf[@]}"
- echo "${@}"
- "${@}" || die
-
- if multilib_is_native_abi && use chromium; then
- einfo "Configuring for Chromium"
- mkdir -p ../chromium || die
- pushd ../chromium >/dev/null || die
- set -- "${@}" \
- --disable-shared \
- --enable-static \
- --enable-pic \
- --extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
- echo "${@}"
- "${@}" || die
- popd >/dev/null || die
- fi
-}
-
-multilib_src_compile() {
- emake V=1
-
- if multilib_is_native_abi; then
- for i in "${FFTOOLS[@]}" ; do
- if use fftools_${i} ; then
- emake V=1 tools/${i}$(get_exeext)
- fi
- done
-
- if use chromium; then
- einfo "Compiling for Chromium"
- pushd ../chromium >/dev/null || die
- emake V=1 libffmpeg
- popd >/dev/null || die
- fi
- fi
-}
-
-multilib_src_install() {
- emake V=1 DESTDIR="${D}" install install-doc
-
- if multilib_is_native_abi; then
- for i in "${FFTOOLS[@]}" ; do
- if use fftools_${i} ; then
- dobin tools/${i}$(get_exeext)
- fi
- done
-
- if use chromium; then
- einfo "Installing for Chromium"
- pushd ../chromium >/dev/null || die
- emake V=1 DESTDIR="${D}" install-libffmpeg
- popd >/dev/null || die
- fi
- fi
-}
-
-multilib_src_install_all() {
- dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
- [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
- emake V=1 fate
-}
diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium.patch
deleted file mode 100644
index 60a3e5d..0000000
--- a/media-video/ffmpeg/files/chromium.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Allow libffmpeg to be built for Chromium-based browsers
-https://patchwork.ffmpeg.org/patch/4500/
-
-NOTE: This patch lacks the Makefile include line. We append it
-manually instead to make patching across different versions easier.
-
-diff --git a/ffbuild/libffmpeg.mak b/ffbuild/libffmpeg.mak
-new file mode 100644
-index 0000000..992cf3c
---- /dev/null
-+++ b/ffbuild/libffmpeg.mak
-@@ -0,0 +1,21 @@
-+LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF)
-+LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
-+
-+libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
-+ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FFEXTRALIBS)
-+
-+libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
-+ $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
-+
-+$(LIBFFMPEG): libffmpeg-$(CONFIG_SHARED)
-+libffmpeg: $(LIBFFMPEG)
-+
-+install-libffmpeg: $(LIBFFMPEG)
-+ $(Q)mkdir -p "$(SHLIBDIR)/chromium"
-+ $(INSTALL) -m 755 $< "$(SHLIBDIR)/chromium/$<"
-+ $(STRIP) "$(SHLIBDIR)/chromium/$<"
-+
-+uninstall-libffmpeg:
-+ $(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)"
-+
-+.PHONY: libffmpeg libffmpeg-* install-libffmpeg
---
-2.13.1
-
diff --git a/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch b/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
deleted file mode 100644
index afd130d..0000000
--- a/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur ffmpeg-3.3.orig/libavformat/tls_openssl.c ffmpeg-3.3/libavformat/tls_openssl.c
---- ffmpeg-3.3.orig/libavformat/tls_openssl.c 2017-04-14 09:44:45.035482446 -0700
-+++ ffmpeg-3.3/libavformat/tls_openssl.c 2017-04-14 09:47:43.399194503 -0700
-@@ -43,7 +43,7 @@
- TLSShared tls_shared;
- SSL_CTX *ctx;
- SSL *ssl;
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- BIO_METHOD* url_bio_method;
- #endif
- } TLSContext;
-@@ -68,7 +68,7 @@
-
- static int url_bio_create(BIO *b)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- BIO_set_init(b, 1);
- BIO_set_data(b, NULL);
- BIO_set_flags(b, 0);
-@@ -85,7 +85,7 @@
- return 1;
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- #define GET_BIO_DATA(x) BIO_get_data(x)
- #else
- #define GET_BIO_DATA(x) (x)->ptr
-@@ -129,7 +129,7 @@
- return url_bio_bwrite(b, str, strlen(str));
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
- static BIO_METHOD url_bio_method = {
- .type = BIO_TYPE_SOURCE_SINK,
- .name = "urlprotocol bio",
-@@ -208,7 +208,7 @@
- SSL_CTX_free(c->ctx);
- if (c->tls_shared.tcp)
- ffurl_close(c->tls_shared.tcp);
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- if (c->url_bio_method)
- BIO_meth_free(c->url_bio_method);
- #endif
-@@ -266,7 +266,7 @@
- ret = AVERROR(EIO);
- goto fail;
- }
--#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- p->url_bio_method = BIO_meth_new(BIO_TYPE_SOURCE_SINK, "urlprotocol bio");
- BIO_meth_set_write(p->url_bio_method, url_bio_bwrite);
- BIO_meth_set_read(p->url_bio_method, url_bio_bread);
diff --git a/media-video/ffmpeg/files/openjpeg22.patch b/media-video/ffmpeg/files/openjpeg22.patch
deleted file mode 100644
index a458c15..0000000
--- a/media-video/ffmpeg/files/openjpeg22.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit 078322f33ced4b2db6ac3e5002f98233d6fbf643
-Author: Reino17 <rwijnsma@xs4all.nl>
-Date: Fri Jun 23 23:49:31 2017 +0200
-
- Add support for LibOpenJPEG v2.2/git
-
- Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
-
-Index: ffmpeg-3.3.3/configure
-===================================================================
---- ffmpeg-3.3.3.orig/configure
-+++ ffmpeg-3.3.3/configure
-@@ -1875,6 +1875,7 @@ HEADERS_LIST="
- machine_ioctl_meteor_h
- malloc_h
- opencv2_core_core_c_h
-+ openjpeg_2_2_openjpeg_h
- openjpeg_2_1_openjpeg_h
- openjpeg_2_0_openjpeg_h
- openjpeg_1_5_openjpeg_h
-@@ -5805,7 +5806,9 @@ enabled libopencv && { check_hea
- require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
- require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+ check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
-+ { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
- check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
- { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
- { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-Index: ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
-===================================================================
---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c
-+++ ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
-@@ -34,7 +34,9 @@
- #include "internal.h"
- #include "thread.h"
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+# include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- # include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- # include <openjpeg-2.0/openjpeg.h>
-@@ -44,7 +46,7 @@
- # include <openjpeg.h>
- #endif
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- # define OPENJPEG_MAJOR_VERSION 2
- # define OPJ(x) OPJ_##x
- #else
-@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo
- opj_stream_set_read_function(stream, stream_read);
- opj_stream_set_skip_function(stream, stream_skip);
- opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- opj_stream_set_user_data(stream, &reader);
-Index: ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
-===================================================================
---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c
-+++ ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
-@@ -32,7 +32,9 @@
- #include "avcodec.h"
- #include "internal.h"
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+# include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- # include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- # include <openjpeg-2.0/openjpeg.h>
-@@ -42,7 +44,7 @@
- # include <openjpeg.h>
- #endif
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- # define OPENJPEG_MAJOR_VERSION 2
- # define OPJ(x) OPJ_##x
- #else
-@@ -305,7 +307,7 @@ static av_cold int libopenjpeg_encode_in
-
- opj_set_default_encoder_parameters(&ctx->enc_params);
-
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- switch (ctx->cinema_mode) {
- case OPJ_CINEMA2K_24:
- ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCo
- opj_stream_set_write_function(stream, stream_write);
- opj_stream_set_skip_function(stream, stream_skip);
- opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- opj_stream_set_user_data(stream, &writer);
diff --git a/media-video/ffmpeg/files/openjpeg23.patch b/media-video/ffmpeg/files/openjpeg23.patch
deleted file mode 100644
index 4398769..0000000
--- a/media-video/ffmpeg/files/openjpeg23.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From: Michael Bradshaw <mjbshaw at google.com>
-
-Signed-off-by: Michael Bradshaw <mjbshaw at google.com>
----
- configure | 5 ++++-
- libavcodec/libopenjpegdec.c | 8 +++++---
- libavcodec/libopenjpegenc.c | 10 ++++++----
- 3 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/configure b/configure
-index 391c141e7a..77c9a18c3c 100755
---- a/configure
-+++ b/configure
-@@ -1930,6 +1930,7 @@ HEADERS_LIST="
- machine_ioctl_meteor_h
- malloc_h
- opencv2_core_core_c_h
-+ openjpeg_2_3_openjpeg_h
- openjpeg_2_2_openjpeg_h
- openjpeg_2_1_openjpeg_h
- openjpeg_2_0_openjpeg_h
-@@ -5950,7 +5951,9 @@ enabled libopencv && { check_header opencv2/core/core_c.h &&
- require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
- require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg && { { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+ check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
-+ { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
- check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
- { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
- check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
-diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
-index 1210123265..67d47bd6a0 100644
---- a/libavcodec/libopenjpegdec.c
-+++ b/libavcodec/libopenjpegdec.c
-@@ -34,7 +34,9 @@
- #include "internal.h"
- #include "thread.h"
-
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+# include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
- # include <openjpeg-2.2/openjpeg.h>
- #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- # include <openjpeg-2.1/openjpeg.h>
-@@ -46,7 +48,7 @@
- # include <openjpeg.h>
- #endif
-
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- # define OPENJPEG_MAJOR_VERSION 2
- # define OPJ(x) OPJ_##x
- #else
-@@ -431,7 +433,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
- opj_stream_set_read_function(stream, stream_read);
- opj_stream_set_skip_function(stream, stream_skip);
- opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- opj_stream_set_user_data(stream, &reader);
-diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
-index b67e533d1d..92b4433b04 100644
---- a/libavcodec/libopenjpegenc.c
-+++ b/libavcodec/libopenjpegenc.c
-@@ -32,7 +32,9 @@
- #include "avcodec.h"
- #include "internal.h"
-
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+# include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
- # include <openjpeg-2.2/openjpeg.h>
- #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- # include <openjpeg-2.1/openjpeg.h>
-@@ -44,7 +46,7 @@
- # include <openjpeg.h>
- #endif
-
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- # define OPENJPEG_MAJOR_VERSION 2
- # define OPJ(x) OPJ_##x
- #else
-@@ -307,7 +309,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
-
- opj_set_default_encoder_parameters(&ctx->enc_params);
-
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- switch (ctx->cinema_mode) {
- case OPJ_CINEMA2K_24:
- ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
- opj_stream_set_write_function(stream, stream_write);
- opj_stream_set_skip_function(stream, stream_skip);
- opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
- opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- opj_stream_set_user_data(stream, &writer);
---
-2.13.5 (Apple Git-94)
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
deleted file mode 100644
index a0b4d7e..0000000
--- a/media-video/ffmpeg/metadata.xml
+++ /dev/null
@@ -1,65 +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>
- <use>
- <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
- <flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support with <pkg>media-libs/vo-amrwbenc</pkg>.</flag>
- <flag name="armv5te">Enables optimizations for armv5te processors.</flag>
- <flag name="armv6">Enables optimizations for armv6 processors.</flag>
- <flag name="armv6t2">Enables optimizations for armv6t2 processors.</flag>
- <flag name="armvfp">Enables VFP optimizations for ARM processors.</flag>
- <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
- <flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag>
- <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
- <flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
- <flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
- <flag name="chromium">Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.</flag>
- <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
- <flag name="ebur128">Enables EBU R128 loudness normalization filter via <pkg>media-libs/libebur128</pkg></flag>
- <flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
- <flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
- <flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
- <flag name="fribidi">Enables fribidi support in the drawtext filter.</flag>
- <flag name="gcrypt">Enables gcrypt support: Needed for rtmp(t)e support if openssl, librtmp or gmp is not used.</flag>
- <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
- <flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag>
- <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
- <flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
- <flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag>
- <flag name="libilbc">Enables iLBC de/encoding via <pkg>media-libs/libilbc</pkg>.</flag>
- <flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
- <flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
- <flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
- <flag name="mipsdspr1">Enables MIPS DSP ASE R1 optimizations.</flag>
- <flag name="mipsdspr2">Enables MIPS DSP ASE R2 optimizations.</flag>
- <flag name="mipsfpu">Enables floating point MIPS optimizations.</flag>
- <flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
- <flag name="network">Enables network streaming support</flag>
- <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
- <flag name="openh264">Enables H.264 encoding suppoprt via <pkg>media-libs/openh264</pkg>.</flag>
- <flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
- <flag name="opus">Adds (decoding) support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
- <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
- <flag name="postproc">Build and install libpostproc.</flag>
- <flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
- <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
- <flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
- <flag name="sofalizer">Enables Sofalizer filter</flag>
- <flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
- <flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
- <flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
- <flag name="webp">Enables WebP encoding with <pkg>media-libs/libwebp</pkg>.</flag>
- <flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
- <flag name="zeromq">Enables <pkg>net-libs/zeromq</pkg> support with the zmq/azmq filters.</flag>
- <flag name="zimg">Enables <pkg>media-libs/zimg</pkg> based scale filter.</flag>
- <flag name="zvbi">Enables <pkg>media-libs/zvbi</pkg> based teletext decoder.</flag>
- </use>
- <slots>
- <slot name="0">For building against. This is the only slot that provides
- headers and command line tools. Binary compatibility slots come and go
- as required, so always pin dependencies to this slot when appropriate.</slot>
- </slots>
-</pkgmetadata>
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
deleted file mode 100644
index c401e20..0000000
--- a/media-video/vlc/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX qt4-select.patch 2171 SHA256 30c76f06553d0a341224009c3130e54624a266cd77a034340e39d2b922c60d69 SHA512 0c3fab4457f1b8c9f1c2c9b690c1a137e1544a09a710e24ba9c8e228f0490ec27030846974610b8976bfca77e03054c5254719836cabc695a527f095659a651d WHIRLPOOL a4d8a2689a0e034f26f0e2d52275004f21a20f0a553050ce7483b1ab5d42faa8f465ff4dfed08a5defc25917d8f225922d14eaea5adb53d3556b6e41c5704a37
-AUX vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch 700 SHA256 91752f1ed1fbe8a2fcc78336a0725e1450946bab8085a4efce85a076dff40b87 SHA512 c3aa82ba9252f87d8f87c0bbfed7e0cdbd93c4f454e0ca6a9d73346e2efa294864af7eea1ea76b504354fb1baf5378cf626b35dcbfba3d888dbf0168ddfbed13 WHIRLPOOL 87c5017c8cdc1ad8cb313b6342f89af7ca7e90b20f151dd226ad8863407dae4cefb5934040154020778d3eb5dc78c5be43ae1e8e33fd0e823628c69c8cac7e61
-AUX vlc-2.1.0-fix-libtremor-libs.patch 453 SHA256 5b2d4272b0258b30d1e34717ad83ebe2bcea78a5247798a74c0b86ace6d39463 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae WHIRLPOOL 39d9d1670e244169087ecc81654b1d6407c9e5f0f0da1bb1b15d7c89a7dab232b9a174c2a5e9ed2586a57a370f3cd9d2c9434381387a1fbc70b7f7bd8de2ef85
-AUX vlc-2.1.0-libva-1.2.1-compat.patch 272 SHA256 fe9a4fdfe5447c869ec881f9e30236486a885b9f64b4c80004db7964b2b931c1 SHA512 74cba8136b2abb7a78b5ee8c8b5a9b3509a4a16ff9d4f136a3a7e2d6ff634ce20e34b8d140810ac63dd6cd3115d71cbb87a6e213fb172485494e55ade1b5230a WHIRLPOOL 1d2e747f4097c7903b798d7dfd17e11de41c01e903afda0b2c766ef5d7977da32362c52e5bc41c93a1f801a93c857c08d2cee3840f76a55afe0b2a768250073e
-AUX vlc-2.2.2-qt5widgets.patch 603 SHA256 b23c3bf441ac9bef25ca053a8bccec2652c9a251889d38624877ffc5562218ca SHA512 b5d8946406e84bce240376015ed994d6265d07fe9b777fd05c0f722142e99502bd129ec4acfe2cafa7a6dd98c9612913fa8644109489fa48dab6dc5522601050 WHIRLPOOL a00159f261e617f8e0e5c6b51b94428ba1080eb6107f13ce5b9506ae460437f9246ab79795a3443289cba2db36c7a6c2d5f585f6f888ca4881625856ce0ffaf3
-AUX vlc-2.2.4-ffmpeg3.patch 6377 SHA256 61c21d875d3ea5e0475194cfb199e2a95f20a5357bb2a0001d86dd1f4a5d3652 SHA512 efede86f7d4c8a475f14c88405d4f9810784b93b8dbee8a21ca2f59b4a62ba008996fbd72ad77300b76a6faa328720a7b99afdd753480f2a17dc25204e52d2ee WHIRLPOOL 49286dda70c1e510c8727f77bfec43786d0ae2b477f528032bf45e1fb9f34f9943e4a213c26f3c06e370c1e4856c16acb5d933cc91590d145a985fde81acbd09
-AUX vlc-2.2.4-gcc6-fixup.patch 8886 SHA256 480394a17f57c9bb1df1bc8f0ba3bf04afc7f09e8b8ac8b7099bc1f5dd55c57c SHA512 f0eb1fc5203c80ef5d1c243284cba62757051c288ca3013532c89f1a9febaa853827b564cf69edf31e8db48f7faab9f2ef71a9f0d110ac091d490676294a9c86 WHIRLPOOL d7246e1618b4e568c3befdb72eef078430d131f6ccc59f71993be3b0a1e120d93af674a2fbe41393d9ba4a73f8e9bfe8d2be8e65f0d9b7c86de9cc8d7d9246fa
-AUX vlc-2.2.4-relax_ffmpeg.patch 1686 SHA256 3b76abff4553f581457252b6b98d3c3a537c91cd7b981f2f5a6772eb6597fd18 SHA512 a15862d6ac60575c0c338faff6052e3c28c4bd75f86f37ff8fbe36a64bc1a82689c56b2dc19f05109fc0913b85aab7ba28a94bfdd5fdd0e3c87cb7e6e58d1caa WHIRLPOOL aefdcf024869e7b074f3bc64ca12d187967edcbe31f03bb72a9d9dbb82be8453ec4866fae655a77ce4f500f8cae80e583de6e33b012c1f5ff1cc549a298a0596
-AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb97097030f1d372bb81b63ef88231a17e5f237 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968 WHIRLPOOL df5cfdb4ba36ccd92e79de7b913b14c5416aca0834025dc51f8178db6c88f5eecb332ae7096800607d6f7526a56c7fb94e2f593bc0c0e19f643428bcd3eb5868
-DIST vlc-2.2.4.tar.xz 22199316 SHA256 1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be SHA512 2fc1fe957ba7903f2e0c9640884ed850cb10a60132d80658dee8da0b5abaf4a6ccdf95fa2b8c0a4a827be5e7e40341318bce44662a5248e04442f4779010f85c WHIRLPOOL 0d59d9c2a623f72a6c708f9face6f29b7c7e71a9b38faf3717b8f223641c6f599d1407a4976874226dbbd9e553ec528249dc4f301c5682bfb49f5745468934b2
-EBUILD vlc-2.2.4.ebuild 15720 SHA256 f3a7086654c6fdec8e22b5c5ae1fd911d15d83f79a51fd6c4686398e17d87c55 SHA512 a0a2b29f8b34003a1e956df380146f209eb49ce5368b150605239964520f86d5b70a42b87031b5e27fd490e7982e6c1aa02c3cfd43a290783439af9a78f853ee WHIRLPOOL 74a90f06208bbdc726a0e78405e77f316b78a4a8b705c06cafe883fcd7b0ef6267e32e254b016310a52f01097b0044482f2087bc3545013da1e7bcc18504fbf0
diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch
deleted file mode 100644
index fb1526a..0000000
--- a/media-video/vlc/files/qt4-select.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54
-For use until upstream ever accepts this patch or fixes it themsleves
---- a/configure.ac
-+++ b/configure.ac
-@@ -3709,7 +3709,8 @@
- ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
-- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
-+ AS_IF([test "${enable_qt}" != "4"], [
-+ PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
- PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
- VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
- VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
-@@ -3721,20 +3722,23 @@
- AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
- AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
- AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+ enable_qt="5"
-- ], [
-- PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
-- AS_IF([test -n "${enable_qt}"],[
-- AC_MSG_ERROR([${QT_PKG_ERRORS}.])
-- ],[
-- AC_MSG_WARN([${QT_PKG_ERRORS}.])
-- ])
-- enable_qt="no"
-+ ])
-+ ])
-+ AS_IF([test "${enable_qt}" != "5"], [
-+ PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
-+ AS_IF([test -n "${enable_qt}"],[
-+ AC_MSG_ERROR([${QT_PKG_ERRORS}.])
-+ ],[
-+ AC_MSG_WARN([${QT_PKG_ERRORS}.])
- ])
-- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-- AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+ enable_qt="no"
- ])
-+ QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+ AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+ ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
- VLC_ADD_PLUGIN([qt4])
-
diff --git a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch b/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
deleted file mode 100644
index 3163410..0000000
--- a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-index 2debbcd..72e7fcf 100644
---- a/modules/audio_output/pulse.c
-+++ b/modules/audio_output/pulse.c
-@@ -472,8 +472,17 @@ static void stream_underflow_cb(pa_stream *s, void *userdata)
- {
-+ uint32_t rate = pa_stream_get_sample_spec(s)->rate;
- audio_output_t *aout = userdata;
-
-- msg_Dbg(aout, "underflow");
-- (void) s;
-+ msg_Warn(aout, "underflow");
-+ stream_stop(s, aout);
-+
-+ aout_sys_t *sys = aout->sys;
-+ sys->first_pts = VLC_TS_INVALID;
-+
-+ pa_operation *op = pa_stream_update_sample_rate(s, rate, NULL, NULL);
-+ if (unlikely(op == NULL))
-+ return;
-+ pa_operation_unref(op);
- }
-
- static int stream_wait(pa_stream *stream, pa_threaded_mainloop *mainloop)
diff --git a/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch b/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch
deleted file mode 100644
index 8a58969..0000000
--- a/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modules/codec/Makefile.am
-+++ b/modules/codec/Makefile.am
-@@ -215,7 +215,7 @@
- libtremor_plugin_la_SOURCES = codec/vorbis.c
- libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
- libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
--libtremor_plugin_la_LIBADD = -lvorbisdec -logg
-+libtremor_plugin_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS)
- EXTRA_LTLIBRARIES += libtremor_plugin.la
- codec_LTLIBRARIES += $(LTLIBtremor)
-
diff --git a/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch
deleted file mode 100644
index db73a4e..0000000
--- a/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/modules/codec/avcodec/vaapi.c
-+++ b/modules/codec/avcodec/vaapi.c
-@@ -36,6 +36,9 @@
- #include <libavcodec/vaapi.h>
- #include <X11/Xlib.h>
- #include <va/va_x11.h>
-+#if VA_MINOR_VERSION >= 34
-+# include <va/va_compat.h>
-+#endif
-
- #include "avcodec.h"
- #include "va.h" \ No newline at end of file
diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
deleted file mode 100644
index a024d00..0000000
--- a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vlc-2.2.2/configure.ac
-+++ vlc-2.2.2/configure.ac
-@@ -3754,10 +3754,6 @@
- AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
- ])
-
-- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
-- AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
-- ])
--
- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
- QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
- AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
diff --git a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
deleted file mode 100644
index 3bc5954..0000000
--- a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Index: vlc-2.2.4/configure.ac
-===================================================================
---- vlc-2.2.4.orig/configure.ac
-+++ vlc-2.2.4/configure.ac
-@@ -2323,8 +2323,8 @@ AC_ARG_ENABLE(avcodec,
- [ --enable-avcodec libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
-- PKG_CHECK_EXISTS([libavutil < 55],, [
-- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
-+ PKG_CHECK_EXISTS([libavutil < 56],, [
-+ AC_MSG_ERROR([libavutil versions 56 and later are not supported.])
- ])
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
-Index: vlc-2.2.4/modules/codec/avcodec/audio.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/audio.c
-+++ vlc-2.2.4/modules/codec/avcodec/audio.c
-@@ -39,8 +39,6 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/mem.h>
-
--#include <libavutil/audioconvert.h>
--
- #include "avcodec.h"
-
- /*****************************************************************************
-Index: vlc-2.2.4/modules/codec/avcodec/encoder.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c
-+++ vlc-2.2.4/modules/codec/avcodec/encoder.c
-@@ -41,7 +41,6 @@
- #include <vlc_cpu.h>
-
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
-
- #include "avcodec.h"
- #include "avcommon.h"
-@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this )
- else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
- &psz_namecodec ) )
- {
-- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
-+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
- return VLC_EGENERIC; /* handed chroma output */
-
- i_cat = VIDEO_ES;
-@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this )
-
- if( p_codec->pix_fmts )
- {
-- const enum PixelFormat *p = p_codec->pix_fmts;
-+ const enum AVPixelFormat *p = p_codec->pix_fmts;
- for( ; *p != -1; p++ )
- {
- if( *p == p_context->pix_fmt ) break;
-@@ -1017,7 +1016,7 @@ errmsg:
- }
- }
-
-- p_sys->frame = avcodec_alloc_frame();
-+ p_sys->frame = av_frame_alloc();
- if( !p_sys->frame )
- {
- goto error;
-@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t *
- AVFrame *frame = NULL;
- if( likely(p_pict) ) {
- frame = p_sys->frame;
-- avcodec_get_frame_defaults( frame );
-+ av_frame_unref( frame );
- for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
- {
- p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
-@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc
- //How much we need to copy from new packet
- const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
-
-- avcodec_get_frame_defaults( p_sys->frame );
-+ av_frame_unref( p_sys->frame );
- p_sys->frame->format = p_sys->p_context->sample_fmt;
- p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
-
-@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t *
- while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
- ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
- {
-- avcodec_get_frame_defaults( p_sys->frame );
-+ av_frame_unref( p_sys->frame );
- if( p_sys->b_variable )
- p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
- else
-Index: vlc-2.2.4/modules/codec/avcodec/vaapi.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c
-+++ vlc-2.2.4/modules/codec/avcodec/vaapi.c
-@@ -598,7 +598,7 @@ static int Create( vlc_va_t *p_va, AVCod
- return err;
-
- /* Only VLD supported */
-- p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
-+ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
- p_va->setup = Setup;
- p_va->get = Get;
- p_va->release = Release;
-Index: vlc-2.2.4/modules/codec/avcodec/video.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/video.c
-+++ vlc-2.2.4/modules/codec/avcodec/video.c
-@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
- static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
- static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
- #endif
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
-- const enum PixelFormat * );
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
-+ const enum AVPixelFormat * );
-
- static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
- {
-@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
- p_sys->p_codec = p_codec;
- p_sys->i_codec_id = i_codec_id;
- p_sys->psz_namecodec = psz_namecodec;
-- p_sys->p_ff_pic = avcodec_alloc_frame();
-+ p_sys->p_ff_pic = av_frame_alloc();
- p_sys->b_delayed_open = true;
- p_sys->p_va = NULL;
- vlc_sem_init( &p_sys->sem_mt, 0 );
-@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
- if( ffmpeg_OpenCodec( p_dec ) < 0 )
- {
- msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
-- avcodec_free_frame( &p_sys->p_ff_pic );
-+ av_frame_free( &p_sys->p_ff_pic );
- vlc_sem_destroy( &p_sys->sem_mt );
- free( p_sys );
- return VLC_EGENERIC;
-@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
- wait_mt( p_sys );
-
- if( p_sys->p_ff_pic )
-- avcodec_free_frame( &p_sys->p_ff_pic );
-+ av_frame_free( &p_sys->p_ff_pic );
-
- if( p_sys->p_va )
- vlc_va_Delete( p_sys->p_va );
-@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
- }
- #endif
-
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-- const enum PixelFormat *pi_fmt )
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-+ const enum AVPixelFormat *pi_fmt )
- {
- decoder_t *p_dec = p_context->opaque;
- decoder_sys_t *p_sys = p_dec->p_sys;
diff --git a/media-video/vlc/files/vlc-2.2.4-gcc6-fixup.patch b/media-video/vlc/files/vlc-2.2.4-gcc6-fixup.patch
deleted file mode 100644
index 73be43c..0000000
--- a/media-video/vlc/files/vlc-2.2.4-gcc6-fixup.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-From 8b0a359be21c8b66c7f7f5d34b85df3cf6689035 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcvlcdev@free.fr>
-Date: Sun, 24 Jul 2016 12:59:20 +0200
-Subject: [PATCH] Fix build using old GCC intrinsics
-
-As the 2.2 headers are still using vlc_atomics (picture)
-we cannot have a way to avoid collisions with early
-or late <atomic> inclusion when using GCC >= 4.7
-
-Conditionals in vlc_atomic won't work.
-
-Happens in ProjectM and Qt5.
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/gui/qt4/actions_manager.cpp | 2 ++
- modules/gui/qt4/adapters/seekpoints.cpp | 4 +--
- modules/gui/qt4/adapters/seekpoints.hpp | 4 +--
- modules/gui/qt4/components/controller.cpp | 2 ++
- .../gui/qt4/components/playlist/playlist_model.hpp | 4 +--
- modules/gui/qt4/components/playlist/views.cpp | 6 ++++
- modules/gui/qt4/dialogs/messages.cpp | 2 ++
- modules/gui/qt4/dialogs/vlm.cpp | 4 ---
- modules/gui/qt4/dialogs/vlm.hpp | 4 ++-
- modules/gui/qt4/input_manager.cpp | 2 ++
- modules/gui/qt4/input_manager.hpp | 3 +-
- modules/gui/qt4/menus.cpp | 2 ++
- modules/gui/qt4/qt4.hpp | 32 ++++++++++++++++++----
- modules/gui/qt4/util/pictureflow.cpp | 2 ++
- modules/visualization/projectm.cpp | 4 +++
- 15 files changed, 56 insertions(+), 21 deletions(-)
-
-diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
-index eff40d9..b7ca967 100644
---- a/modules/gui/qt4/actions_manager.cpp
-+++ b/modules/gui/qt4/actions_manager.cpp
-@@ -25,6 +25,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include <vlc_vout.h>
- #include <vlc_keys.h>
-
-diff --git a/modules/gui/qt4/adapters/seekpoints.cpp b/modules/gui/qt4/adapters/seekpoints.cpp
-index fbf2957..a3564bb 100644
---- a/modules/gui/qt4/adapters/seekpoints.cpp
-+++ b/modules/gui/qt4/adapters/seekpoints.cpp
-@@ -19,14 +19,12 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-+#include "seekpoints.hpp"
-
- #include "recents.hpp"
- #include "dialogs_provider.hpp"
- #include "menus.hpp"
-
--#include "seekpoints.hpp"
--
--#include "qt4.hpp"
- #include "input_manager.hpp"
-
- SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) :
-diff --git a/modules/gui/qt4/adapters/seekpoints.hpp b/modules/gui/qt4/adapters/seekpoints.hpp
-index 0083989..bbb9214 100644
---- a/modules/gui/qt4/adapters/seekpoints.hpp
-+++ b/modules/gui/qt4/adapters/seekpoints.hpp
-@@ -22,9 +22,7 @@
- #ifndef SEEKPOINTS_HPP
- #define SEEKPOINTS_HPP
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "qt4.hpp"
-
- #include <vlc_common.h>
- #include <vlc_interface.h>
-diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
-index d93e0db..c43d929 100644
---- a/modules/gui/qt4/components/controller.cpp
-+++ b/modules/gui/qt4/components/controller.cpp
-@@ -26,6 +26,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include <vlc_vout.h> /* vout_thread_t for FSC */
-
- /* Widgets */
-diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
-index f9d1d0c..1f71ac9 100644
---- a/modules/gui/qt4/components/playlist/playlist_model.hpp
-+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
-@@ -25,9 +25,7 @@
- #ifndef _PLAYLIST_MODEL_H_
- #define _PLAYLIST_MODEL_H_
-
--#ifdef HAVE_CONFIG_H
--# include "config.h"
--#endif
-+#include "qt4.hpp"
-
- #include <vlc_input.h>
- #include <vlc_playlist.h>
-diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp
-index 59f6535..0066205 100644
---- a/modules/gui/qt4/components/playlist/views.cpp
-+++ b/modules/gui/qt4/components/playlist/views.cpp
-@@ -21,6 +21,12 @@
- * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include "qt4.hpp"
-+
- #include "components/playlist/views.hpp"
- #include "components/playlist/vlc_model.hpp" /* VLCModel */
- #include "components/playlist/sorting.h" /* Columns List */
-diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
-index 30793a2..9c79c99 100644
---- a/modules/gui/qt4/dialogs/messages.cpp
-+++ b/modules/gui/qt4/dialogs/messages.cpp
-@@ -24,6 +24,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include "dialogs/messages.hpp"
-
- #include <QPlainTextEdit>
-diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
-index 0da88cc..595f015 100644
---- a/modules/gui/qt4/dialogs/vlm.cpp
-+++ b/modules/gui/qt4/dialogs/vlm.cpp
-@@ -23,10 +23,6 @@
- * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
--#ifdef HAVE_CONFIG_H
--# include "config.h"
--#endif
--
- #include "dialogs/vlm.hpp"
-
- #ifdef ENABLE_VLM
-diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
-index a3c6e5d..dcf7110 100644
---- a/modules/gui/qt4/dialogs/vlm.hpp
-+++ b/modules/gui/qt4/dialogs/vlm.hpp
-@@ -25,8 +25,10 @@
- #ifndef QVLC_VLM_DIALOG_H_
- #define QVLC_VLM_DIALOG_H_ 1
-
-+#include "qt4.hpp"
-+
- #ifdef HAVE_CONFIG_H
--# include "config.h"
-+#include "config.h"
- #endif
-
- #ifdef ENABLE_VLM
-diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
-index fd45f4a..c50cb6c 100644
---- a/modules/gui/qt4/input_manager.cpp
-+++ b/modules/gui/qt4/input_manager.cpp
-@@ -30,6 +30,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include "input_manager.hpp"
- #include "recents.hpp"
-
-diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
-index 7d3b76a..4fbecbb 100644
---- a/modules/gui/qt4/input_manager.hpp
-+++ b/modules/gui/qt4/input_manager.hpp
-@@ -29,9 +29,10 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include <vlc_input.h>
-
--#include "qt4.hpp"
- #include "util/singleton.hpp"
- #include "adapters/variables.hpp"
-
-diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
-index 116e98c..46240b0 100644
---- a/modules/gui/qt4/menus.cpp
-+++ b/modules/gui/qt4/menus.cpp
-@@ -34,6 +34,8 @@
- # include "config.h"
- #endif
-
-+#include "qt4.hpp"
-+
- #include <vlc_common.h>
- #include <vlc_intf_strings.h>
- #include <vlc_vout.h> /* vout_thread_t */
-diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
-index 44d7db6..5aec957 100644
---- a/modules/gui/qt4/qt4.hpp
-+++ b/modules/gui/qt4/qt4.hpp
-@@ -29,12 +29,7 @@
- # include "config.h"
- #endif
-
--#include <vlc_common.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */
--#include <vlc_interface.h> /* intf_thread_t */
--#include <vlc_playlist.h> /* playlist_t */
--
--#define QT_NO_CAST_TO_ASCII
--#include <QString>
-+#include <QtGlobal>
-
- #if ( QT_VERSION < 0x040600 )
- # error Update your Qt version to at least 4.6.0
-@@ -43,6 +38,31 @@
- #define HAS_QT47 ( QT_VERSION >= 0x040700 )
- #define HAS_QT5 ( QT_VERSION >= 0x050000 )
-
-+#if HAS_QT5
-+ #include <QtCore/qcompilerdetection.h>
-+ #if defined(Q_COMPILER_ATOMICS) && \
-+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
-+ #define VLC_ATOMIC_H
-+ #include <atomic>
-+ using namespace std;
-+ # define atomic_store(object,desired) \
-+ do { \
-+ *(object) = (desired); \
-+ __sync_synchronize(); \
-+ } while (0)
-+
-+ # define atomic_load(object) \
-+ (__sync_synchronize(), *(object))
-+ #endif
-+#endif
-+
-+#include <vlc_common.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */
-+#include <vlc_interface.h> /* intf_thread_t */
-+#include <vlc_playlist.h> /* playlist_t */
-+
-+#define QT_NO_CAST_TO_ASCII
-+#include <QString>
-+
- enum {
- DialogEventTypeOffset = 0,
- IMEventTypeOffset = 100,
-diff --git a/modules/gui/qt4/util/pictureflow.cpp b/modules/gui/qt4/util/pictureflow.cpp
-index 9318953..a7e6a01 100644
---- a/modules/gui/qt4/util/pictureflow.cpp
-+++ b/modules/gui/qt4/util/pictureflow.cpp
-@@ -29,6 +29,8 @@
- THE SOFTWARE.
- */
-
-+#include "qt4.hpp"
-+
- #include "pictureflow.hpp"
-
- #include <QApplication>
-diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
-index e80fbf4..96d532d 100644
---- a/modules/visualization/projectm.cpp
-+++ b/modules/visualization/projectm.cpp
-@@ -30,6 +30,10 @@
- #endif
-
- #include <assert.h>
-+#if defined(__GNUC__) && \
-+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
-+ #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */
-+#endif
-
- #include <vlc_common.h>
- #include <vlc_plugin.h>
---
-2.8.1
-
-
diff --git a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
deleted file mode 100644
index 218af58..0000000
--- a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752
-Author: Rafaël Carré <funman@videolan.org>
-Date: Fri Feb 26 00:36:26 2016 +0000
-
- Relax requirements for FFmpeg hwaccel
-
- It doesn't error out anymore since 5edd1f62ca1
-
-Index: vlc-2.2.4/configure.ac
-===================================================================
---- vlc-2.2.4.orig/configure.ac
-+++ vlc-2.2.4/configure.ac
-@@ -2383,7 +2383,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
- case "${avfork}" in
- ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+ AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+ ])
- ])
- ;;
- esac
-@@ -2417,7 +2419,9 @@ AS_IF([test "${enable_dxva2}" != "no"],
- case "${avfork}" in
- ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+ ])
- ])
- ;;
- esac
-@@ -3181,7 +3185,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
- libav) av_vdpau_ver="55.26.0" ;;
- ffmpeg) av_vdpau_ver="55.42.100"
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+ AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+ ])
- ])
- ;;
- esac
diff --git a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
deleted file mode 100644
index adfdefe..0000000
--- a/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/modules/codec/avcodec/vaapi.c
-+++ b/modules/codec/avcodec/vaapi.c
-@@ -34,6 +34,9 @@
- #ifdef VLC_VA_BACKEND_XLIB
- # include <vlc_xlib.h>
- # include <va/va_x11.h>
-+#if VA_MINOR_VERSION >= 34
-+# include <va/va_compat.h>
-+#endif
- #endif
- #ifdef VLC_VA_BACKEND_DRM
- # include <sys/types.h>
diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild
deleted file mode 100644
index 6d5a4c8..0000000
--- a/media-video/vlc/vlc-2.2.4.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
- SCM="git-r3"
-
- if [ "${PV%.9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="git://git.videolan.org/vlc.git"
- fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
- SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
- SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-else
- SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-if [[ ${PV} != *9999 ]] ; then
- KEYWORDS="amd64 ~arm ~ppc ppc64 -sparc x86 ~x86-fbsd"
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
- +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
- directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
- fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
- growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
- +libsamplerate libtiger linsys libtar lirc live lua
- macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
- matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg
- mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
- png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
- schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
- taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
-
-RDEPEND="
- !<media-video/ffmpeg-1.2:0
- dev-libs/libgpg-error:0
- net-dns/libidn:0
- >=sys-libs/zlib-1.2.5.1-r2:0[minizip]
- virtual/libintl:0
- a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
- aalib? ( media-libs/aalib:0 )
- alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
- avcodec? (
- !libav? (
- >=media-video/ffmpeg-2.8:0=
- )
- libav? ( >=media-video/libav-11:0= )
- )
- avformat? (
- !libav? (
- >=media-video/ffmpeg-2.8:0=
- )
- libav? ( media-video/libav:0= )
- )
- bidi? ( >=dev-libs/fribidi-0.10.4:0 )
- bluray? ( >=media-libs/libbluray-0.3:0 )
- cddb? ( >=media-libs/libcddb-1.2:0 )
- chromaprint? ( >=media-libs/chromaprint-0.6:0 )
- dbus? ( >=sys-apps/dbus-1.6:0 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
- directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
- dts? ( >=media-libs/libdca-0.0.5:0 )
- dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0= )
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
- elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
- faad? ( >=media-libs/faad2-2.6.1:0 )
- fdk? ( media-libs/fdk-aac:0 )
- flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
- fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
- fontconfig? ( media-libs/fontconfig:1.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
- gme? ( media-libs/game-music-emu:0 )
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
- gnutls? ( >=net-libs/gnutls-3.0.20:0 )
- ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
- jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
- jpeg? ( virtual/jpeg:0 )
- kate? ( >=media-libs/libkate-0.3:0 )
- libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
- libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
- libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
- libsamplerate? ( media-libs/libsamplerate:0 )
- libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
- libtiger? ( >=media-libs/libtiger-0.3.1:0 )
- linsys? ( >=media-libs/zvbi-0.2.28:0 )
- lirc? ( app-misc/lirc:0 )
- live? ( >=media-plugins/live-2011.12.23:0 )
- lua? ( >=dev-lang/lua-5.1:0 )
- matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
- modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
- mp3? ( media-libs/libmad:0 )
- mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
- mtp? ( >=media-libs/libmtp-1:0 )
- musepack? ( >=media-sound/musepack-tools-444:0 )
- ncurses? ( sys-libs/ncurses:0=[unicode] )
- ogg? ( >=media-libs/libogg-1:0 )
- opencv? ( >media-libs/opencv-2:0 )
- opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
- opus? ( >=media-libs/opus-1.0.3:0 )
- png? ( media-libs/libpng:0= sys-libs/zlib:0 )
- postproc? (
- !libav? ( >=media-video/ffmpeg-2.2:0= )
- libav? ( media-libs/libpostproc:0= )
- )
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
- pulseaudio? ( >=media-sound/pulseaudio-1:0 )
- qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
- qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.5.1-r1:5
- >=dev-qt/qtx11extras-5.1:5 )
- rdp? ( >=net-misc/freerdp-1.0.1:0=[client] <net-misc/freerdp-2 )
- samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] )
- >=net-fs/samba-4.0.0_alpha1:0[client] ) )
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
- sdl? ( >=media-libs/libsdl-1.2.10:0
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
- sftp? ( net-libs/libssh2:0 )
- shout? ( >=media-libs/libshout-2.1:0 )
- sid? ( media-libs/libsidplay:2 )
- skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
- speex? ( media-libs/speex:0 )
- svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
- swscale? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
- theora? ( >=media-libs/libtheora-1.0_beta3: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-142:0 )
- upnp? ( net-libs/libupnp:0 )
- v4l? ( media-libs/libv4l:0 )
- vaapi? (
- x11-libs/libva:0[X,drm]
- !libav? ( >=media-video/ffmpeg-2.8:0=[vaapi] )
- libav? ( media-video/libav:0=[vaapi] )
- )
- vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
- zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-"
-
-# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
-# thus we'll have to wait for a new release there.
-RDEPEND="${RDEPEND}
- vdpau? (
- >=x11-libs/libvdpau-0.6:0
- !libav? (
- >=media-video/ffmpeg-2.8:0=
- )
- libav? ( >=media-video/libav-10:0= )
- )
- vnc? ( >=net-libs/libvncserver-0.9.9:0 )
- vorbis? ( >=media-libs/libvorbis-1.1:0 )
- vpx? ( media-libs/libvpx:0= )
- X? ( x11-libs/libX11:0 )
- x264? ( >=media-libs/x264-0.0.20090923:0= )
- x265? ( media-libs/x265:0= )
- xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
- xml? ( >=dev-libs/libxml2-2.5:2 )
- zvbi? ( >=media-libs/zvbi-0.2.25:0 )
-"
-
-DEPEND="${RDEPEND}
- kde? ( >=kde-base/kdelibs-4:4 )
- xcb? ( x11-proto/xproto:0 )
- app-arch/xz-utils:0
- x86? ( dev-lang/yasm:* )
- amd64? ( dev-lang/yasm:* )
- >=sys-devel/gettext-0.18.3:*
- virtual/pkgconfig:*
-"
-
-REQUIRED_USE="
- aalib? ( X )
- bidi? ( truetype )
- cddb? ( cdda )
- dvb? ( dvbpsi )
- dxva2? ( avcodec )
- ffmpeg? ( avcodec avformat swscale )
- fontconfig? ( truetype )
- gnutls? ( gcrypt )
- httpd? ( lua )
- libcaca? ( X )
- libtar? ( skins )
- libtiger? ( kate )
- qt4? ( X !qt5 )
- qt5? ( X !qt4 )
- sdl? ( X )
- skins? ( truetype X xml ^^ ( qt4 qt5 ) )
- vaapi? ( avcodec X )
- vdpau? ( xcb )
- vlm? ( encode )
- xv? ( xcb )
-"
-
-PATCHES=(
- # Fix build system mistake.
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
- # Patch up incompatibilities and reconfigure autotools.
- "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
-
- # Fix up broken audio when skipping using a fixed reversed bisected commit.
- "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
-
- # Bug #541678
- "${FILESDIR}"/qt4-select.patch
-
- # Allow QT5.5 since Gentoo has a patched QTwidgets
- "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
-
- # Bug #575072
- "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
- "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
-
- # BUg #587954
- "${FILESDIR}"/${PN}-2.2.4-gcc6-fixup.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then
- if ! version_is_at_least 4.5 $(gcc-version) ; then
- die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
- fi
- fi
-}
-
-src_unpack() {
- if [ "${PV%9999}" != "${PV}" ] ; then
- git-r3_src_unpack
- else
- unpack ${A}
- fi
-}
-
-src_prepare() {
- # Remove unnecessary warnings about unimplemented pragmas on gcc for now.
- # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
- #
- # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
- # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
- #
- # https://gcc.gnu.org/c99status.html
- if tc-is-gcc ; then
- sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
- fi
-
- # Bootstrap when we are on a git checkout.
- if [[ "${PV%9999}" != "${PV}" ]] ; then
- ./bootstrap
- fi
-
- # Make it build with libtool 1.5
- rm -f 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
-
- default
-
- # 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
-
- eautoreconf
-
- # Disable automatic running of tests.
- find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
- # Setting QT_SELECT environment variable will enforce correct binaries.
- if use qt4; then
- export QT_SELECT=qt4
- elif use qt5; then
- export QT_SELECT=qt5
- fi
-}
-
-src_configure() {
- # Compatibility fix for Samba 4.
- use samba && append-cppflags "-I/usr/include/samba-4.0"
-
- # We need to disable -fstack-check if use >=gcc 4.8.0.
- # See bug #499996
- use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
- # Needs libresid-builder from libsidplay:2 which is in another directory...
- # FIXME!
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
- if use truetype || use projectm ; then
- local dejavu="/usr/share/fonts/dejavu/"
- myconf="--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
-
- local qt_flag=""
- if use qt4 ; then
- qt_flag="--enable-qt=4"
- elif use qt5 ; then
- qt_flag="--enable-qt=5"
- else
- qt_flag="--disable-qt"
- fi
-
- econf \
- ${myconf} \
- --enable-vlc \
- --docdir=/usr/share/doc/${PF} \
- --disable-dependency-tracking \
- --disable-optimizations \
- --disable-update-check \
- --enable-fast-install \
- --enable-screen \
- $(use_enable a52) \
- $(use_enable aalib aa) \
- $(use_enable alsa) \
- $(use_enable altivec) \
- $(use_enable atmo) \
- $(use_enable audioqueue) \
- $(use_enable avcodec) \
- $(use_enable avformat) \
- $(use_enable bidi fribidi) \
- $(use_enable bluray) \
- $(use_enable cdda vcd) \
- $(use_enable cddb libcddb) \
- $(use_enable chromaprint) \
- $(use_enable dbus) \
- $(use_enable directfb) \
- $(use_enable directx) \
- $(use_enable dc1394) \
- $(use_enable debug) \
- $(use_enable dts dca) \
- $(use_enable dvbpsi) \
- $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
- $(use_enable dxva2) \
- $(use_enable encode sout) \
- $(use_enable faad) \
- $(use_enable fdk fdkaac) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable fontconfig) \
- $(use_enable gcrypt libgcrypt) \
- $(use_enable gme) \
- $(use_enable gnome gnomevfs) \
- $(use_enable gnutls) \
- $(use_enable growl) \
- $(use_enable httpd) \
- $(use_enable ieee1394 dv1394) \
- $(use_enable jack) \
- $(use_enable jpeg) \
- $(use_enable kate) \
- $(use_with kde kde-solid) \
- $(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-dialog-provider) \
- $(use_enable macosx-eyetv) \
- $(use_enable macosx-qtkit) \
- $(use_enable macosx-quartztext) \
- $(use_enable matroska mkv) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(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 ogg mux_ogg) \
- $(use_enable omxil) \
- $(use_enable omxil omxil-vout) \
- $(use_enable opencv) \
- $(use_enable opengl glspectrum) \
- $(use_enable opus) \
- $(use_enable optimisememory optimize-memory) \
- $(use_enable png) \
- $(use_enable postproc) \
- $(use_enable projectm) \
- $(use_enable pulseaudio pulse) \
- ${qt_flag} \
- $(use_enable rdp freerdp) \
- $(use_enable rtsp realrtsp) \
- $(use_enable run-as-root) \
- $(use_enable samba smbclient) \
- $(use_enable schroedinger) \
- $(use_enable sdl) \
- $(use_enable sdl-image) \
- $(use_enable sid) \
- $(use_enable sftp) \
- $(use_enable shout) \
- $(use_enable skins skins2) \
- $(use_enable speex) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable svg) \
- $(use_enable svg svgdec) \
- $(use_enable swscale) \
- $(use_enable taglib) \
- $(use_enable theora) \
- $(use_enable tremor) \
- $(use_enable truetype freetype) \
- $(use_enable twolame) \
- $(use_enable udev) \
- $(use_enable upnp) \
- $(use_enable v4l v4l2) \
- $(use_enable vaapi libva) \
- $(use_enable vcdx) \
- $(use_enable vdpau) \
- $(use_enable vlm) \
- $(use_enable vnc) \
- $(use_enable vorbis) \
- $(use_enable vpx) \
- $(use_enable wma-fixed) \
- $(use_with X x) \
- $(use_enable x264) \
- $(use_enable x265) \
- $(use_enable xcb) \
- $(use_enable xml libxml2) \
- $(use_enable xv xvideo) \
- $(use_enable zeroconf bonjour) \
- $(use_enable zvbi) $(use_enable !zvbi telx) \
- --disable-asdcp \
- --disable-coverage \
- --disable-cprof \
- --disable-crystalhd \
- --disable-decklink \
- --disable-gles1 \
- --disable-gles2 \
- --disable-goom \
- --disable-kai \
- --disable-kva \
- --disable-maintainer-mode \
- --disable-merge-ffmpeg \
- --disable-mfx \
- --disable-mmal-codec \
- --disable-mmal-vout \
- --disable-opensles \
- --disable-oss \
- --disable-quicktime \
- --disable-rpi-omxil \
- --disable-shine \
- --disable-sndio \
- --disable-vda \
- --disable-vsxu \
- --disable-wasapi
-
- # ^ We don't have these disabled libraries in the Portage tree yet.
-
- # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
- sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
- virtx emake check-TESTS
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-src_install() {
- default
-
- # Punt useless libtool's .la files
- find "${D}" -name '*.la' -delete
-}
-
-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" -f "/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
-}
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
deleted file mode 100644
index 04812e6..0000000
--- a/virtual/rust/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD rust-1.27.0.ebuild 316 BLAKE2B 42011cc292fb034308820d2daf342120b736834151bd05ccb12378551862a8fc5dba286401872c8af6a71741018cd5f709d0e7401cb92dcb295d36f23d91d28b SHA512 1083147da3fa25ba69f561eae232f1a60e8bb967205bb483dde126e3e3e69f83cbe02a8179d46849d3ef70aada88cb8d8ed1af4aa0ff1eacc558b141a28deb4e
-MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/metadata.xml b/virtual/rust/metadata.xml
deleted file mode 100644
index 85cf4eb..0000000
--- a/virtual/rust/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>rust@gentoo.org</email>
- <name>Rust Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/virtual/rust/rust-1.27.0.ebuild b/virtual/rust/rust-1.27.0.ebuild
deleted file mode 100644
index fa78c78..0000000
--- a/virtual/rust/rust-1.27.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"