[gentoo-commits] repo/gentoo:master commit in: media-video/dcpomatic/, media-video/dcpomatic/files/, ...

[Andreas Sturmlechner]

commit:     965651cf8ff28d8b3d4d883236236052282e643b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 21:51:47 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 21:54:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=965651cf

profiles: Remove last-rited packages

media-video/dcpomatic
media-libs/libasdcp-cth
media-libs/libdcp
media-libs/libsub

Closes: https://bugs.gentoo.org/630924
Closes: https://bugs.gentoo.org/639310
Closes: https://bugs.gentoo.org/640728
Closes: https://bugs.gentoo.org/644654
Closes: https://bugs.gentoo.org/654892
Closes: https://bugs.gentoo.org/655096
Closes: https://bugs.gentoo.org/670822
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/libasdcp-cth/Manifest                   |   1 -
 .../files/libasdcp-cth-0.1.1-no-ldconfig.patch     |  12 ---
 .../libasdcp-cth-0.1.2-respect-cxxflags.patch      |  14 ---
 media-libs/libasdcp-cth/libasdcp-cth-0.1.3.ebuild  |  34 ------
 media-libs/libasdcp-cth/metadata.xml               |   5 -
 media-libs/libdcp/Manifest                         |   1 -
 .../libdcp/files/libdcp-1.3.3-no-ldconfig.patch    |  12 ---
 .../files/libdcp-1.3.4-respect-cxxflags.patch      |  56 ----------
 media-libs/libdcp/libdcp-1.5.2.ebuild              |  57 ----------
 media-libs/libdcp/libdcp-9999.ebuild               |  58 ----------
 media-libs/libdcp/metadata.xml                     |   5 -
 media-libs/libsub/Manifest                         |   1 -
 .../files/libsub-1.1.13-respect-cxxflags.patch     |  14 ---
 .../libsub/files/libsub-1.2.4-no-ldconfig.patch    |  12 ---
 media-libs/libsub/files/libsub-9999-boost.patch    |  31 ------
 media-libs/libsub/files/libsub-9999-iostream.patch |  90 ----------------
 .../libsub/files/libsub-9999-libcxml-9999.patch    |  21 ----
 .../libsub/files/libsub-9999-no-ldconfig.patch     |   9 --
 .../files/libsub-9999-respect-cxxflags.patch       |  13 ---
 media-libs/libsub/libsub-1.3.1.ebuild              |  47 ---------
 media-libs/libsub/libsub-9999.ebuild               |  51 ---------
 media-libs/libsub/metadata.xml                     |   5 -
 media-video/dcpomatic/Manifest                     |   1 -
 media-video/dcpomatic/dcpomatic-2.12.4.ebuild      | 116 --------------------
 media-video/dcpomatic/dcpomatic-9999.ebuild        | 117 ---------------------
 .../files/dcpomatic-2.10.2-respect-cxxflags.patch  |  13 ---
 .../dcpomatic/files/dcpomatic-2.8.0-desktop.patch  |  32 ------
 .../files/dcpomatic-2.8.0-no-ldconfig.patch        |  12 ---
 .../dcpomatic/files/dcpomatic-2.8.0-wxGTK3.patch   |  13 ---
 media-video/dcpomatic/metadata.xml                 |  15 ---
 profiles/package.mask                              |   8 --
 31 files changed, 876 deletions(-)

diff --git a/media-libs/libasdcp-cth/Manifest b/media-libs/libasdcp-cth/Manifest
deleted file mode 100644
index 781db5588a7..00000000000
--- a/media-libs/libasdcp-cth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libasdcp-cth-0.1.3.tar.bz2 637004 BLAKE2B 5c8a5a63f9d8b8a3e6ea245d7ad66715f4dc4f73af41bacc66d2259d25ecf52e2f1c951b240478fd674f34c8c9581a2867acd05e2bd23c5ad95609a22b5f7680 SHA512 db707a39e79ce4dcda7f20610b4fc3d1609d75dc9cc1f14a6bf7627231993882e843a3ebd9abb540a3f746c2898f94fa7bfd0617eb7c85d243585e4647e218c6

diff --git a/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.1-no-ldconfig.patch b/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.1-no-ldconfig.patch
deleted file mode 100644
index 097f31ecabb..00000000000
--- a/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.1-no-ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libasdcp-cth-0.1.1/wscript
-+++ libasdcp-cth-0.1.1/wscript
-@@ -84,8 +84,7 @@
-     bld.add_post_fun(post)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass
- 
- def tags(bld):
-     os.system('etags src/*.cc src/*.h')

diff --git a/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.2-respect-cxxflags.patch b/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.2-respect-cxxflags.patch
deleted file mode 100644
index 15eeceb5842..00000000000
--- a/media-libs/libasdcp-cth/files/libasdcp-cth-0.1.2-respect-cxxflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libasdcp-cth-0.1.2/wscript
-+++ libasdcp-cth-0.1.2/wscript
-@@ -38,11 +38,6 @@
-     else:
-         boost_lib_suffix = ''
- 
--    if conf.options.enable_debug:
--        conf.env.append_value('CXXFLAGS', '-g')
--    else:
--        conf.env.append_value('CXXFLAGS', '-O2')
--
-     conf.check_cxx(fragment="""
-                             #include <boost/version.hpp>\n
-                             #if BOOST_VERSION < 104500\n

diff --git a/media-libs/libasdcp-cth/libasdcp-cth-0.1.3.ebuild b/media-libs/libasdcp-cth/libasdcp-cth-0.1.3.ebuild
deleted file mode 100644
index 06b2c20ea9c..00000000000
--- a/media-libs/libasdcp-cth/libasdcp-cth-0.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="implementation of SMPTE and the MXF Interop Sound & Picture Track File format"
-HOMEPAGE="http://carlh.net/asdcplib"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.1-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-0.1.2-respect-cxxflags.patch)
-
-src_prepare() {
-	rm -r waf aclocal.m4 m4 configure{,.ac} Makefile.{am,in} || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	default
-}

diff --git a/media-libs/libasdcp-cth/metadata.xml b/media-libs/libasdcp-cth/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/media-libs/libasdcp-cth/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/media-libs/libdcp/Manifest b/media-libs/libdcp/Manifest
deleted file mode 100644
index 2c8d9065056..00000000000
--- a/media-libs/libdcp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libdcp-1.5.2.tar.bz2 754546 BLAKE2B 69cedd7a782fe89e538b893a6f919515e87bbb24331a189cde6d16bafcc9d2a442156a5db58eb963088511ca2b233a24695d1a124a7830f955f8074b1b059d30 SHA512 717486e06af2f89795dcaff09ccea38eeba786a55bc3df01acc576749a475df4a6dbd74b3edaceb08af5615468c24f45fec0527b315e2e5842683333f9118499

diff --git a/media-libs/libdcp/files/libdcp-1.3.3-no-ldconfig.patch b/media-libs/libdcp/files/libdcp-1.3.3-no-ldconfig.patch
deleted file mode 100644
index f8dbb1ba30e..00000000000
--- a/media-libs/libdcp/files/libdcp-1.3.3-no-ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libdcp-1.3.3/wscript
-+++ libdcp-1.3.3/wscript
-@@ -206,8 +206,7 @@
-         sys.exit(-1)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass
- 
- def tags(bld):
-     os.system('etags src/*.cc src/*.h')

diff --git a/media-libs/libdcp/files/libdcp-1.3.4-respect-cxxflags.patch b/media-libs/libdcp/files/libdcp-1.3.4-respect-cxxflags.patch
deleted file mode 100644
index 0082d92391b..00000000000
--- a/media-libs/libdcp/files/libdcp-1.3.4-respect-cxxflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- libdcp-1.3.4/wscript
-+++ libdcp-1.3.4/wscript
-@@ -133,13 +133,6 @@
-     else:
-         boost_lib_suffix = ''
- 
--    if conf.options.enable_debug:
--        conf.env.append_value('CXXFLAGS', '-g')
--    else:
--        # Somewhat experimental use of -O2 rather than -O3 to see if
--        # Windows builds are any more reliable
--        conf.env.append_value('CXXFLAGS', '-O2')
--
-     conf.check_cxx(fragment="""
-                             #include <boost/version.hpp>\n
-                             #if BOOST_VERSION < 104500\n
---- libdcp-1.4.4/src/wscript
-+++ libdcp-1.4.4/src/wscript
-@@ -196,7 +196,7 @@
-         obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH'
-         obj.use = 'libkumu-libdcp%s libasdcp-libdcp%s' % (bld.env.API_VERSION, bld.env.API_VERSION)
-         obj.source = source
--        obj.cppflags = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
-+        obj.cppflags = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline', '-fno-default-inline', '-fno-elide-constructors']
- 
-     bld.install_files('${PREFIX}/include/libdcp%s/dcp' % bld.env.API_VERSION, headers)
-     if bld.env.STATIC:
---- libdcp-1.4.4/test/wscript
-+++ libdcp-1.4.4/test/wscript
-@@ -52,7 +52,7 @@
-     obj = bld(features='cxx cxxprogram')
-     obj.name   = 'tests'
-     obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL'
--    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
-+    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors']
-     if bld.is_defined('HAVE_GCOV'):
-         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
-         obj.lib = ['gcov']
-@@ -101,7 +101,7 @@
-     obj = bld(features='cxx cxxprogram')
-     obj.name   = 'subs_in_out'
-     obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
--    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
-+    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors']
-     if bld.is_defined('HAVE_GCOV'):
-         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
-         obj.lib = ['gcov']
-@@ -116,7 +116,7 @@
-     obj = bld(features='cxx cxxprogram')
-     obj.name   = 'rewrite_subs'
-     obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
--    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
-+    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors']
-     if bld.is_defined('HAVE_GCOV'):
-         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
-         obj.lib = ['gcov']

diff --git a/media-libs/libdcp/libdcp-1.5.2.ebuild b/media-libs/libdcp/libdcp-1.5.2.ebuild
deleted file mode 100644
index 6df4350313e..00000000000
--- a/media-libs/libdcp/libdcp-1.5.2.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
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="create and read Digital Cinema Packages using JPEG2000 and WAV files"
-HOMEPAGE="http://carlh.net/libdcp"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	>=dev-libs/boost-1.61.0
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/libsigc++:2
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	dev-libs/xmlsec
-	>=media-libs/libasdcp-cth-0.1.3
-	media-libs/openjpeg:2
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	test? ( app-text/xmldiff )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.3-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.3.4-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/atmos_test.cc/d' \
-		-e '/certificates_test.cc/d' \
-		-e '/dcp_test.cc/d' \
-		-e '/decryption_test.cc/d' \
-		-e '/read_smpte_subtitle_test.cc/d' \
-		-e '/sound_frame_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./build/test/tests || die
-}

diff --git a/media-libs/libdcp/libdcp-9999.ebuild b/media-libs/libdcp/libdcp-9999.ebuild
deleted file mode 100644
index 8edf105423e..00000000000
--- a/media-libs/libdcp/libdcp-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit git-r3 python-any-r1 waf-utils
-
-DESCRIPTION="create and read Digital Cinema Packages using JPEG2000 and WAV files"
-HOMEPAGE="http://carlh.net/libdcp"
-EGIT_REPO_URI="https://github.com/cth103/${PN}.git"
-EGIT_BRANCH="1.0"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS=""
-IUSE="test"
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	>=dev-libs/boost-1.61.0
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/libsigc++:2
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	dev-libs/xmlsec
-	>=media-libs/libasdcp-cth-0.1.3
-	media-libs/openjpeg:2
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	test? ( app-text/xmldiff )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.3-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.3.4-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/atmos_test.cc/d' \
-		-e '/certificates_test.cc/d' \
-		-e '/dcp_test.cc/d' \
-		-e '/decryption_test.cc/d' \
-		-e '/read_smpte_subtitle_test.cc/d' \
-		-e '/sound_frame_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./build/test/tests || die
-}

diff --git a/media-libs/libdcp/metadata.xml b/media-libs/libdcp/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/media-libs/libdcp/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/media-libs/libsub/Manifest b/media-libs/libsub/Manifest
deleted file mode 100644
index 468b66e930a..00000000000
--- a/media-libs/libsub/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libsub-1.3.1.tar.bz2 178834 BLAKE2B 3b25d16ec9578445091ae393408ff33cb8ad4f18610a8ee4fd098897306635cea8171b37c8a0d4afc5136b53fc670fbab9fd12493af33ad166ff54e35c1d09b1 SHA512 650725d1a0f1b5c4be3d1df79f4645661a33d8086e0c239847176d8725f0b522f74aa4f6e52acb90b9de9d865dc975876311f3748be63eea998f77f33299e534

diff --git a/media-libs/libsub/files/libsub-1.1.13-respect-cxxflags.patch b/media-libs/libsub/files/libsub-1.1.13-respect-cxxflags.patch
deleted file mode 100644
index 59687755c65..00000000000
--- a/media-libs/libsub/files/libsub-1.1.13-respect-cxxflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libsub-1.1.13/wscript
-+++ libsub-1.1.13/wscript
-@@ -24,11 +24,6 @@
-     conf.env.DISABLE_TESTS = conf.options.disable_tests
-     conf.env.API_VERSION = API_VERSION
- 
--    if conf.options.enable_debug:
--        conf.env.append_value('CXXFLAGS', '-g')
--    else:
--        conf.env.append_value('CXXFLAGS', '-O3')
--
-     # Disable libxml++ deprecation warnings for now
-     conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations'])
- 

diff --git a/media-libs/libsub/files/libsub-1.2.4-no-ldconfig.patch b/media-libs/libsub/files/libsub-1.2.4-no-ldconfig.patch
deleted file mode 100644
index cfb645d0d89..00000000000
--- a/media-libs/libsub/files/libsub-1.2.4-no-ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libsub-1.2.4/wscript
-+++ libsub-1.2.4/wscript
-@@ -151,8 +151,7 @@
-         sys.exit(-1)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass
- 
- def tags(bld):
-     os.system('etags src/*.cc src/*.h')

diff --git a/media-libs/libsub/files/libsub-9999-boost.patch b/media-libs/libsub/files/libsub-9999-boost.patch
deleted file mode 100644
index 347610f5854..00000000000
--- a/media-libs/libsub/files/libsub-9999-boost.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libsub-9999/test/dcp_reader_test.cc
-+++ libsub-9999/test/dcp_reader_test.cc
-@@ -19,6 +19,7 @@
- 
- #include "interop_dcp_reader.h"
- #include "collect.h"
-+#include <boost/optional/optional_io.hpp>
- #include <boost/test/unit_test.hpp>
- #include <fstream>
- #include <iostream>
---- libsub-9999/test/wscript
-+++ libsub-9999/test/wscript
-@@ -17,7 +17,7 @@
- def build(bld):
-     obj = bld(features='cxx cxxprogram')
-     obj.name   = 'tests'
--    obj.uselib = 'BOOST_TEST DCP CXML'
-+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM DCP CXML'
-     obj.use    = 'libsub-1.0'
-     obj.source = """
-                  dcp_reader_test.cc
---- libsub-9999/tools/wscript
-+++ libsub-9999/tools/wscript
-@@ -1,6 +1,6 @@
- def build(bld):
-     obj = bld(features = 'cxx cxxprogram')
-     obj.use = ['libsub-1.0']
--    obj.uselib = 'OPENJPEG DCP CXML'
-+    obj.uselib = 'OPENJPEG DCP CXML BOOST_FILESYSTEM'
-     obj.source = 'dumpsubs.cc'
-     obj.target = 'dumpsubs'

diff --git a/media-libs/libsub/files/libsub-9999-iostream.patch b/media-libs/libsub/files/libsub-9999-iostream.patch
deleted file mode 100644
index 48a94c9737d..00000000000
--- a/media-libs/libsub/files/libsub-9999-iostream.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- libsub-1.9999/src/stl_text_reader.cc
-+++ libsub-1.9999/src/stl_text_reader.cc
-@@ -22,6 +22,7 @@
- #include <boost/algorithm/string.hpp>
- #include <boost/lexical_cast.hpp>
- #include <vector>
-+#include <iostream>
- 
- using std::list;
- using std::ostream;
---- libsub-9999/src/dcp_reader.cc
-+++ libsub-9999/src/dcp_reader.cc
-@@ -26,6 +26,7 @@
- #include "dcp/subtitle.h"
- #include <libcxml/cxml.h>
- #include <libxml++/libxml++.h>
-+#include <iostream>
- 
- using std::list;
- using std::cout;
---- libsub-9999/src/sub_time.cc
-+++ libsub-9999/src/sub_time.cc
-@@ -21,6 +21,7 @@
- #include "exceptions.h"
- #include <cmath>
- #include <iomanip>
-+#include <iostream>
- 
- using std::ostream;
- using std::cout;
---- libsub-9999/test/dcp_reader_test.cc
-+++ libsub-9999/test/dcp_reader_test.cc
-@@ -21,6 +21,7 @@
- #include "collect.h"
- #include <boost/test/unit_test.hpp>
- #include <fstream>
-+#include <iostream>
- 
- using std::list;
- using std::cout;
---- libsub-9999/test/stl_binary_reader_test.cc
-+++ libsub-9999/test/stl_binary_reader_test.cc
-@@ -24,7 +24,6 @@
- #include "test.h"
- 
- using std::list;
--using std::cout;
- using std::ifstream;
- 
- /* Test reading of a binary STL file */
---- libsub-9999/test/subrip_reader_test.cc
-+++ libsub-9999/test/subrip_reader_test.cc
-@@ -24,6 +24,7 @@
- #include <boost/test/unit_test.hpp>
- #include <boost/filesystem.hpp>
- #include <fstream>
-+#include <iostream>
- 
- using std::list;
- using std::cerr;
---- libsub-9999/test/test.cc
-+++ libsub-9999/test/test.cc
-@@ -22,6 +22,7 @@
- #include <boost/test/unit_test.hpp>
- #include <boost/filesystem.hpp>
- #include <fstream>
-+#include <iostream>
- #include <string>
- #include "iso6937_tables.h"
- 
---- libsub-9999/tools/dumpsubs.cc
-+++ libsub-9999/tools/dumpsubs.cc
-@@ -23,6 +23,7 @@
- #include <getopt.h>
- #include <boost/filesystem.hpp>
- #include <map>
-+#include <iostream>
- 
- using std::string;
- using std::cerr;
---- libsub-9999/asdcplib/src/h__Writer.cpp
-+++ libsub-9999/asdcplib/src/h__Writer.cpp
-@@ -32,7 +32,6 @@
- #include "AS_DCP_internal.h"
- #include "KLV.h"
- 
--using std::cout;
- using namespace ASDCP;
- using namespace ASDCP::MXF;
- 

diff --git a/media-libs/libsub/files/libsub-9999-libcxml-9999.patch b/media-libs/libsub/files/libsub-9999-libcxml-9999.patch
deleted file mode 100644
index 9937b138742..00000000000
--- a/media-libs/libsub/files/libsub-9999-libcxml-9999.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libsub-9999/src/smpte_dcp_reader.cc
-+++ libsub-9999/src/smpte_dcp_reader.cc
-@@ -29,7 +29,6 @@
- 
- using std::string;
- using std::list;
--using std::stringstream;
- using boost::shared_ptr;
- using namespace sub;
- 
-@@ -46,9 +45,7 @@
- 	
- 		string s;
- 		reader.ReadTimedTextResource (s, 0, 0);
--		stringstream t;
--		t << s;
--		xml->read_stream (t);
-+		xml->read_string (s);
- 
- 		ASDCP::WriterInfo info;
- 		reader.FillWriterInfo (info);

diff --git a/media-libs/libsub/files/libsub-9999-no-ldconfig.patch b/media-libs/libsub/files/libsub-9999-no-ldconfig.patch
deleted file mode 100644
index 46851bf833e..00000000000
--- a/media-libs/libsub/files/libsub-9999-no-ldconfig.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- libsub-1.9999/wscript
-+++ libsub-1.9999/wscript
-@@ -128,5 +128,4 @@
-         sys.exit(-1)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass

diff --git a/media-libs/libsub/files/libsub-9999-respect-cxxflags.patch b/media-libs/libsub/files/libsub-9999-respect-cxxflags.patch
deleted file mode 100644
index 992ef6bccce..00000000000
--- a/media-libs/libsub/files/libsub-9999-respect-cxxflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libsub-9999/wscript
-+++ libsub-9999/wscript
-@@ -23,10 +23,6 @@
-     conf.env.DISABLE_TESTS = conf.options.disable_tests
-     conf.env.API_VERSION = API_VERSION
- 
--    if conf.options.enable_debug:
--        conf.env.append_value('CXXFLAGS', '-g')
--    else:
--        conf.env.append_value('CXXFLAGS', '-O3')
- 
-     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
- 

diff --git a/media-libs/libsub/libsub-1.3.1.ebuild b/media-libs/libsub/libsub-1.3.1.ebuild
deleted file mode 100644
index 57dc3eeafc2..00000000000
--- a/media-libs/libsub/libsub-1.3.1.ebuild
+++ /dev/null
@@ -1,47 +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 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="read and write subtitles in a few different formats"
-HOMEPAGE="http://carlh.net/libsub"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-libs/boost:=
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/openssl:0
-	>=media-libs/libasdcp-cth-0.1.3"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.4-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.1.13-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/ssa_reader_test.cc/d' \
-		-e '/dcp_to_stl_binary_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./run/tests || die
-}

diff --git a/media-libs/libsub/libsub-9999.ebuild b/media-libs/libsub/libsub-9999.ebuild
deleted file mode 100644
index 8772a9cff0d..00000000000
--- a/media-libs/libsub/libsub-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit git-r3 python-any-r1 waf-utils
-
-DESCRIPTION="read and write subtitles in a few different formats"
-HOMEPAGE="http://carlh.net/libsub"
-EGIT_REPO_URI="https://github.com/cth103/${PN}.git"
-EGIT_BRANCH="1.0"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-libs/boost:=
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/openssl:0
-	>=media-libs/libasdcp-cth-0.1.3"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${P}-no-ldconfig.patch
-	"${FILESDIR}"/${P}-respect-cxxflags.patch
-	"${FILESDIR}"/${P}-iostream.patch
-	"${FILESDIR}"/${P}-libcxml-9999.patch
-	"${FILESDIR}"/${P}-boost.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/ssa_reader_test.cc/d' \
-		-e '/dcp_to_stl_binary_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./run/tests || die
-}

diff --git a/media-libs/libsub/metadata.xml b/media-libs/libsub/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/media-libs/libsub/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/media-video/dcpomatic/Manifest b/media-video/dcpomatic/Manifest
deleted file mode 100644
index cacc1b4d972..00000000000
--- a/media-video/dcpomatic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dcpomatic-2.12.4.tar.bz2 177868575 BLAKE2B 5ace00aad6bfd44790841da380b45aa28577b058e11d2f7b6ef9d8611cf4c370054735ded599da210764fa1eed45d49bc1fb111862167998f2479251dc8cd308 SHA512 e7d16c603c7c1ae8ee489279b28a22ced74794c7974a67fb2f8ff1403f3f6041223b3c89eaf4f1ad1a56fb41dc0090c9176ded36e8fa2a8dbedba49a57d2ba82

diff --git a/media-video/dcpomatic/dcpomatic-2.12.4.ebuild b/media-video/dcpomatic/dcpomatic-2.12.4.ebuild
deleted file mode 100644
index 8c107aa068f..00000000000
--- a/media-video/dcpomatic/dcpomatic-2.12.4.ebuild
+++ /dev/null
@@ -1,116 +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_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils wxwidgets gnome2-utils
-
-DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
-HOMEPAGE="https://dcpomatic.com/"
-SRC_URI="https://dcpomatic.com/dl.php?id=source&version=${PV} -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+alsa +gtk jack pulseaudio"
-
-REQUIRED_USE="^^ ( alsa jack pulseaudio )"
-
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/boost
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/libcxml
-	dev-libs/libzip
-	dev-libs/openssl:0
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
-	media-libs/fontconfig:1.0
-	>media-libs/libdcp-1.4.4:1.0
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/libsub-1.2.1:1.0
-	media-libs/rtaudio[alsa?,jack?,pulseaudio?]
-	>=media-video/ffmpeg-3:=
-	net-libs/libssh
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/wxGTK:3.0 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
-	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
-	)
-
-src_prepare() {
-	rm -v waf
-	export WAF_BINARY=${EROOT}usr/bin/waf
-	if [ -z "${PYTHONPATH}" ] ; then
-		export PYTHONPATH="${S}"
-	else
-		export PYTHONPATH="${S}:${PYTHONPATH}"
-	fi
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed \
-		-e '/4k_test.cc/d' \
-		-e '/audio_analysis_test.cc/d' \
-		-e '/audio_decoder_test.cc/d' \
-		-e '/audio_processor_test.cc/d' \
-		-e '/black_fill_test.cc/d' \
-		-e '/client_server_test.cc/d' \
-		-e '/dcp_subtitle_test.cc/d' \
-		-e '/ffmpeg_decoder_sequential_test.cc/d' \
-		-e '/file_naming_test.cc/d' \
-		-e '/import_dcp_test.cc/d' \
-		-e '/interrupt_encoder_test.cc/d' \
-		-e '/j2k_bandwidth_test.cc/d' \
-		-e '/recover_test.cc/d' \
-		-e '/reels_test.cc/d' \
-		-e '/render_subtitles_test.cc/d' \
-		-e '/repeat_frame_test.cc/d' \
-		-e '/scaling_test.cc/d' \
-		-e '/skip_frame_test.cc/d' \
-		-e '/srt_subtitle_test.cc/d' \
-		-e '/ssa_subtitle_test.cc/d' \
-		-e '/vf_test.cc/d' \
-		-e '/video_mxf_content_test.cc/d' \
-        -e '/film_metadata_test.cc/d' \
-		-i test/wscript || die
-
-	if use alsa ; then
-		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::LINUX_ALSA|"\
-			-i src/wx/wx_util.h || die
-	elif use jack ; then
-		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::UNIX_JACK|"\
-			-i src/wx/wx_util.h || die
-	fi
-
-	default
-}
-
-src_configure() {
-	waf-utils_src_configure $(usex gtk "" "--disable-gui")
-}
-
-src_test() {
-	./run/tests || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/media-video/dcpomatic/dcpomatic-9999.ebuild b/media-video/dcpomatic/dcpomatic-9999.ebuild
deleted file mode 100644
index 0ae91e62c08..00000000000
--- a/media-video/dcpomatic/dcpomatic-9999.ebuild
+++ /dev/null
@@ -1,117 +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_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit git-r3 python-any-r1 waf-utils wxwidgets gnome2-utils
-
-DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
-HOMEPAGE="http://dcpomatic.com/"
-EGIT_REPO_URI="https://github.com/cth103/${PN}.git"
-EGIT_SUBMODULES=()
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+alsa +gtk jack pulseaudio"
-
-REQUIRED_USE="^^ ( alsa jack pulseaudio )"
-
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/boost
-	dev-libs/glib:2
-	dev-libs/icu
-	>dev-libs/libcxml-1.15.4
-	dev-libs/libzip
-	dev-libs/openssl:0
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
-	media-libs/fontconfig:1.0
-	>media-libs/libdcp-1.4.4:1.0
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/libsub-1.2.1:1.0
-	media-libs/rtaudio[alsa?,jack?,pulseaudio?]
-	>=media-video/ffmpeg-3:=
-	net-libs/libssh
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/wxGTK:3.0 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
-	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
-	)
-
-src_prepare() {
-	rm -v waf
-	export WAF_BINARY=${EROOT}usr/bin/waf
-	if [ -z "${PYTHONPATH}" ] ; then
-		export PYTHONPATH="${S}"
-	else
-		export PYTHONPATH="${S}:${PYTHONPATH}"
-	fi
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed \
-		-e '/4k_test.cc/d' \
-		-e '/audio_analysis_test.cc/d' \
-		-e '/audio_decoder_test.cc/d' \
-		-e '/audio_processor_test.cc/d' \
-		-e '/black_fill_test.cc/d' \
-		-e '/client_server_test.cc/d' \
-		-e '/dcp_subtitle_test.cc/d' \
-		-e '/ffmpeg_decoder_sequential_test.cc/d' \
-		-e '/file_naming_test.cc/d' \
-		-e '/import_dcp_test.cc/d' \
-		-e '/interrupt_encoder_test.cc/d' \
-		-e '/j2k_bandwidth_test.cc/d' \
-		-e '/recover_test.cc/d' \
-		-e '/reels_test.cc/d' \
-		-e '/render_subtitles_test.cc/d' \
-		-e '/repeat_frame_test.cc/d' \
-		-e '/scaling_test.cc/d' \
-		-e '/skip_frame_test.cc/d' \
-		-e '/srt_subtitle_test.cc/d' \
-		-e '/ssa_subtitle_test.cc/d' \
-		-e '/vf_test.cc/d' \
-		-e '/video_mxf_content_test.cc/d' \
-        -e '/film_metadata_test.cc/d' \
-		-i test/wscript || die
-
-	if use alsa ; then
-		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::LINUX_ALSA|"\
-			-i src/wx/wx_util.h || die
-	elif use jack ; then
-		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::UNIX_JACK|"\
-			-i src/wx/wx_util.h || die
-	fi
-
-	default
-}
-
-src_configure() {
-	waf-utils_src_configure $(usex gtk "" "--disable-gui")
-}
-
-src_test() {
-	./run/tests || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/media-video/dcpomatic/files/dcpomatic-2.10.2-respect-cxxflags.patch b/media-video/dcpomatic/files/dcpomatic-2.10.2-respect-cxxflags.patch
deleted file mode 100644
index 330dfd0609f..00000000000
--- a/media-video/dcpomatic/files/dcpomatic-2.10.2-respect-cxxflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- dcpomatic-2.10.2/wscript
-+++ dcpomatic-2.10.2/wscript
-@@ -89,9 +89,7 @@
-     have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
- 
-     if conf.options.enable_debug:
--        conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
--    else:
--        conf.env.append_value('CXXFLAGS', '-O2')
-+        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
- 
-     #
-     # Windows/Linux/OS X specific

diff --git a/media-video/dcpomatic/files/dcpomatic-2.8.0-desktop.patch b/media-video/dcpomatic/files/dcpomatic-2.8.0-desktop.patch
deleted file mode 100644
index 615a998e2a7..00000000000
--- a/media-video/dcpomatic/files/dcpomatic-2.8.0-desktop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- dcpomatic-2.8.0/platform/linux/dcpomatic.desktop.in
-+++ dcpomatic-2.8.0/platform/linux/dcpomatic.desktop.in
-@@ -7,4 +7,4 @@
- Name=DCP-o-matic 2
- Icon=dcpomatic2
- Comment=DCP generator
--Categories=AudioVideo;Video
-+Categories=AudioVideo;Video;
---- dcpomatic-2.8.0/platform/linux/dcpomatic_server.desktop.in
-+++ dcpomatic-2.8.0/platform/linux/dcpomatic_server.desktop.in
-@@ -7,4 +7,4 @@
- Name=DCP-o-matic 2 Encode Server
- Icon=dcpomatic2_server
- Comment=DCP generator
--Categories=AudioVideo;Video
-+Categories=AudioVideo;Video;
---- dcpomatic-2.8.0/platform/linux/dcpomatic_kdm.desktop.in
-+++ dcpomatic-2.8.0/platform/linux/dcpomatic_kdm.desktop.in
-@@ -7,4 +7,4 @@
- Name=DCP-o-matic 2 KDM Creator
- Icon=dcpomatic2_kdm
- Comment=DCP generator
--Categories=AudioVideo;Video
-+Categories=AudioVideo;Video;
---- dcpomatic-2.8.0/platform/linux/dcpomatic_batch.desktop.in
-+++ dcpomatic-2.8.0/platform/linux/dcpomatic_batch.desktop.in
-@@ -7,4 +7,4 @@
- Name=DCP-o-matic 2 Batch Converter
- Icon=dcpomatic2_batch
- Comment=DCP generator
--Categories=AudioVideo;Video
-+Categories=AudioVideo;Video;

diff --git a/media-video/dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch b/media-video/dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch
deleted file mode 100644
index 106e2395e73..00000000000
--- a/media-video/dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dcpomatic-2.8.0/wscript
-+++ dcpomatic-2.8.0/wscript
-@@ -503,8 +503,7 @@
-         sys.exit(-1)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass
- 
- def pot(bld):
-     bld.recurse('src')

diff --git a/media-video/dcpomatic/files/dcpomatic-2.8.0-wxGTK3.patch b/media-video/dcpomatic/files/dcpomatic-2.8.0-wxGTK3.patch
deleted file mode 100644
index 9d85ad58331..00000000000
--- a/media-video/dcpomatic/files/dcpomatic-2.8.0-wxGTK3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- dcpomatic-2.8.0/src/wx/wscript
-+++ dcpomatic-2.8.0/src/wx/wscript
-@@ -103,8 +103,8 @@
- 
- def configure(conf):
-     try:
--        wx_config = 'wx-config-3.0-gtk2'
--        conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
-+        wx_config = 'wx-config-3.0'
-+        conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0',
-                        package='',
-                        path=wx_config,
-                        args='--cppflags --cxxflags --libs std,richtext',

diff --git a/media-video/dcpomatic/metadata.xml b/media-video/dcpomatic/metadata.xml
deleted file mode 100644
index 192510bcea5..00000000000
--- a/media-video/dcpomatic/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-DCP-o-matic is a free, open-source program to create Digital Cinema Packages (DCPs) from videos, images, sound and subtitle files. You can use it to make content for playback on DCI-compliant cinema projectors.
-
-It can take files in many different formats, including MP4, Apple ProRes, MOV, AVI, VOB (from DVDs), M2TS (from Blu-Ray), WMV, MKV, JPEG, PNG, TIFF and lots of others.
-</longdescription>
-<use>
-	<flag name="alsa">Utilize alsa output of media-libs/rtaudio.</flag>
-	<flag name="jack">Utilize jack output of media-libs/rtaudio.</flag>
-	<flag name="pulseaudio">Utilize pulseaudio output of media-libs/rtaudio.</flag>
-</use>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index f967c404ede..3d27dd78c3d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -657,14 +657,6 @@ x11-drivers/xf86-video-voodoo
 # Masked for removal in 30 days. Bug #679256
 x11-libs/libxkbui
 
-# Andreas Sturmlechner <asturm@g.o> (02 Mar 2019)
-# Completely broken. Masked for removal in 30 days.
-# Bugs 630924, 639310, 640728, 644654, 654892, 655096, 670822
-media-video/dcpomatic
-media-libs/libasdcp-cth
-media-libs/libdcp
-media-libs/libsub
-
 # Eray Aslan <eras@g.o> (01 Mar 2019)
 # Mask experimental software
 =mail-mta/postfix-3.5*