Merge remote-tracking branch 'github/pr/543'. Fixes bug 568878.

11 files changed, 113 insertions, 337 deletions

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 661bb7467bc..e696d2ddb43 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,5 +1,2 @@
-DIST aegisub-2.1.9.tar.xz 1670496 SHA256 e0591c96183f7713bb14f9d357a2e12bdd3478e4d0a8fad77f14f87a4fc22db7 SHA512 bdb02e3d29db2b7ed165eaf1d541515c15f22199bb209d517089e2c35289b7fc22f6159589004c7f8667a57d26eb7ab6211f9d85ca4bbcd076c5856ac10a3d4f WHIRLPOOL 4ac402e067ff0d863042a8f314c1e55154bacfcc13103772e7c4036b7d927f687b2172003eb51e35469f7af2b640e20f224ff1fa5be83f729eacfaac89c73144
 DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689
-DIST aegisub-3.1.2.tar.xz 4126244 SHA256 36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86 SHA512 d15e16f9f98c01447b72cde1998c915a2bfc1aa918a4380b54303de8e88ef881f46c3896ab9dc5eddaf4f1376f0908abd8427dbf6af395e6e0b3969ddca402ab WHIRLPOOL fa7afa1a3e736a410d686bc14d173518267e4b1570a468d9871334f06af821040fe7f40d6ba3b1bece9350a70dd43613c4aedfe8480629a283c9a16a2f54ab6d
-DIST aegisub-3.1.3.tar.xz 4215196 SHA256 efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58 SHA512 c406925623e7b8425df47d1cd31ef77d536861335d25c626ecb916ef091341a8156879430f094ffa1d27490a65f79e2edb84593609d589834f3411b2c2841297 WHIRLPOOL 12e40c2ce78e1659046d093d7d34b68b7ceda2744c36be0e15a71a379cc3ced4fb8cde2c364bbd3b7efa803f78229794d5d417c601ae140d79e0c0a9a2711fb0
 DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448
diff --git a/media-video/aegisub/aegisub-2.1.9.ebuild b/media-video/aegisub/aegisub-2.1.9.ebuild
deleted file mode 100644
index 0f49837b22c..00000000000
--- a/media-video/aegisub/aegisub-2.1.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-WX_GTK_VER="2.8"
-inherit autotools wxwidgets
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/"
-SRC_URI="https://rion-overlay.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug +ffmpeg lua nls openal oss portaudio pulseaudio spell"
-
-RDEPEND="
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
-	virtual/opengl
-	virtual/glu
-	>=media-libs/libass-0.9.11[fontconfig]
-	virtual/libiconv
-	>=media-libs/fontconfig-2.4.2
-	media-libs/freetype:2
-
-	alsa? ( media-libs/alsa-lib )
-	portaudio? ( =media-libs/portaudio-19* )
-	pulseaudio? ( media-sound/pulseaudio )
-	openal? ( media-libs/openal )
-
-	lua? ( >=dev-lang/lua-5.1.1 )
-
-	spell? ( >=app-text/hunspell-1.2 )
-	ffmpeg? ( >=media-libs/ffmpegsource-2.17 )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	media-gfx/imagemagick
-"
-
-src_prepare() {
-	sh autogen.sh --skip-configure
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with portaudio) \
-		$(use_with pulseaudio) \
-		$(use_with openal) \
-		$(use_with lua) \
-		$(use_with ffmpeg ffms) \
-		$(use_with spell hunspell) \
-		$(use_enable debug) \
-		$(use_enable nls)
-}
diff --git a/media-video/aegisub/aegisub-3.1.2.ebuild b/media-video/aegisub/aegisub-3.1.2.ebuild
deleted file mode 100644
index 9152199e3be..00000000000
--- a/media-video/aegisub/aegisub-3.1.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-WX_GTK_VER="3.0"
-PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
-inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/"
-SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
-
-REQUIRED_USE="
-	|| ( alsa openal oss portaudio pulseaudio )
-"
-
-RDEPEND="
-	>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
-	virtual/opengl
-	virtual/glu
-	>=media-libs/libass-0.10.0[fontconfig]
-	virtual/libiconv
-	>=dev-lang/lua-5.1.1
-	>=dev-libs/boost-1.52.0:=[icu,nls,threads]
-	>=dev-libs/icu-4.8.1.1:=
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2.3.5:2
-
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	portaudio? ( =media-libs/portaudio-19* )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.5 )
-	openal? ( media-libs/openal )
-
-	spell? ( >=app-text/hunspell-1.2.2 )
-	ffmpeg? ( >=media-libs/ffmpegsource-2.17:= )
-	fftw? ( >=sci-libs/fftw-3.3 )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )
-	>=sys-devel/gettext-0.18
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "s:${1}\.po::" po/Makefile || die
-		rm "po/${1}.po" || die
-	}
-
-	l10n_find_plocales_changes 'po' '' '.po'
-	if [ -z "$(l10n_get_locales)" ]; then
-		sed -e 's/^\s*po\s*$//' -i Makefile || die
-	else
-		l10n_for_each_disabled_locale_do my_rm_loc
-	fi
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# testing openal does not work in sandbox, bug #508184
-	use openal && export agi_cv_with_openal="yes"
-	local myeconfargs=(
-		$(use_with alsa)
-		$(use_with oss)
-		$(use_with portaudio)
-		$(use_with pulseaudio libpulse)
-		$(use_with openal)
-		$(use_with ffmpeg ffms2)
-		$(use_with fftw fftw3)
-		$(use_with spell hunspell)
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/aegisub/aegisub-3.1.3.ebuild b/media-video/aegisub/aegisub-3.1.3.ebuild
deleted file mode 100644
index 78f1562b10e..00000000000
--- a/media-video/aegisub/aegisub-3.1.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-WX_GTK_VER="3.0"
-PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
-inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/"
-SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
-
-REQUIRED_USE="
-	|| ( alsa openal oss portaudio pulseaudio )
-"
-
-RDEPEND="
-	>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
-	virtual/opengl
-	virtual/glu
-	>=media-libs/libass-0.10.0[fontconfig]
-	virtual/libiconv
-	>=dev-libs/boost-1.53.0:=[icu,nls,threads]
-	>=dev-libs/icu-4.8.1.1:=
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2.3.5:2
-
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	portaudio? ( =media-libs/portaudio-19* )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.5 )
-	openal? ( media-libs/openal )
-
-	spell? ( >=app-text/hunspell-1.2.2 )
-	ffmpeg? ( >=media-libs/ffmpegsource-2.17:= )
-	fftw? ( >=sci-libs/fftw-3.3 )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )
-	>=sys-devel/gettext-0.18
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "s:${1}\.po::" po/Makefile || die
-		rm "po/${1}.po" || die
-	}
-
-	l10n_find_plocales_changes 'po' '' '.po'
-	if [ -z "$(l10n_get_locales)" ]; then
-		sed -e 's/^\s*po\s*$//' -i Makefile || die
-	else
-		l10n_for_each_disabled_locale_do my_rm_loc
-	fi
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# testing openal does not work in sandbox, bug #508184
-	use openal && export agi_cv_with_openal="yes"
-	local myeconfargs=(
-		$(use_with alsa)
-		$(use_with oss)
-		$(use_with portaudio)
-		$(use_with pulseaudio libpulse)
-		$(use_with openal)
-		$(use_with ffmpeg ffms2)
-		$(use_with fftw fftw3)
-		$(use_with spell hunspell)
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index f7d68891b3c..4474823fc38 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -61,7 +61,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.2.2-fix-lua-regexp.patch"
 	"${FILESDIR}/${P}-unbundle-luajit.patch"
 	"${FILESDIR}/${P}-add-missing-pthread-flags.patch"
-	"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
+	"${FILESDIR}/${PN}-3.2.2-respect-user-compiler-flags.patch"
 )
 
 pkg_pretend() {
diff --git a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
index c1aa14a3c83..ed45de7a9bd 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
@@ -1,16 +1,40 @@
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index c93b9dc..8c5678a 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -99,7 +99,7 @@ LIBS_LIBPULSE      = @LIBPULSE_LIBS@
+ LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
+ LIBS_OPENAL        = @OPENAL_LIBS@
+ LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
+-LIBS_PTHREAD       = @PTHREAD_LIBS@
++LIBS_PTHREAD       = @PTHREAD_LIBS@ -lpthread
+ 
+ ifeq (yes, $(BUILD_DARWIN))
+ LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile
+index 64204ef..178044d 100644
+--- a/libaegisub/Makefile
++++ b/libaegisub/Makefile
+@@ -41,7 +41,8 @@ aegisub_OBJ += $(d)common/dispatch.o
+ endif
+ 
+ aegisub_PCH := $(d)lagi_pre.h
+-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
++aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC \
++	$(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+ 
+ $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
+ $(d)common/parser.o_FLAGS := -ftemplate-depth=256
 diff --git a/tools/Makefile b/tools/Makefile
-index 81bcef3..f9a6cd3 100644
+index 81bcef3..d9f64b8 100644
 --- a/tools/Makefile
 +++ b/tools/Makefile
-@@ -7,8 +7,9 @@ PROGRAM += $(d)osx-bundle-restart-helper
+@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper
  endif
  
  repack-thes-dict_OBJ  := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
 -repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
--repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
 +repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
-+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
-+	$(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
  
  PROGRAM += $(d)repack-thes-dict
- 
diff --git a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
index caecf82a7ff..3cb268615b3 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
@@ -28,3 +28,23 @@ index be657b0..fca48e0 100644
    ])
  ])
  
+diff --git a/src/Makefile b/src/Makefile
+index 60d7101..1f7b2bc 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -182,14 +182,13 @@ endif
+ #####################
+ # SOURCE-LEVEL CFLAGS
+ #####################
+-$(d)MatroskaParser.o_FLAGS              := -Wno-sometimes-uninitialized
+ $(d)audio_player.o_FLAGS                := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
+ $(d)audio_provider_factory.o_FLAGS      := $(CFLAGS_FFMS2)
+ $(d)auto4_base.o_FLAGS                  := $(CFLAGS_FREETYPE)
+ $(d)charset_detect.o_FLAGS              := -D_X86_
+ $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
+ $(d)subtitles_provider.o_FLAGS          := $(CFLAGS_LIBASS)
+-$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
++$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS)
+ $(d)text_file_reader.o_FLAGS            := -D_X86_
+ $(d)video_provider_manager.o_FLAGS      := $(CFLAGS_FFMS2)
+ $(d)auto4_lua.o_FLAGS                   := -I$(TOP)vendor/luajit/include
diff --git a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
index de0907229db..ff033cb969e 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
@@ -28,6 +28,22 @@ index c93b9dc..ae018c3 100644
  FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
  
  #####################
+diff --git a/automation/Makefile b/automation/Makefile
+index 45a5ce2..db51a61 100644
+--- a/automation/Makefile
++++ b/automation/Makefile
+@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
+ $(DESTDIR)$(P_DATA)/automation/%: $(d)%
+ 	$(MKDIR_INSTALL)
+ 
+-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
++aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
+ aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
+-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
++aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
+ 
+ PROGRAM += $(d)aegisub-lua
+ 
 diff --git a/configure.ac b/configure.ac
 index be657b0..de586d5 100644
 --- a/configure.ac
@@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644
  
  subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
 diff --git a/src/Makefile b/src/Makefile
-index 60d7101..757bdc6 100644
+index 60d7101..1d4779c 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
@@ -70,8 +86,8 @@ index 60d7101..757bdc6 100644
  src_CXXFLAGS := $(CXXFLAGS_WX)
  src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
 -	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3)  $(LIBS_BOOST) $(LIBS_ICU)
-+	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \
-+	$(LIBS_LUA)
++	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
++	$(LIBS_ICU) $(LIBS_LUA)
  src_PCH := $(d)agi_pre.h
  src_INSTALLNAME := $(AEGISUB_COMMAND)
  
diff --git a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
index 1d709fe18fd..363136134e8 100644
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
@@ -1,14 +1,27 @@
-diff --git a/tools/Makefile b/tools/Makefile
-index d9f64b8..f9a6cd3 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -8,7 +8,8 @@ endif
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index d1e1da4..699ac77 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -99,7 +99,7 @@ LIBS_LIBPULSE      = @LIBPULSE_LIBS@
+ LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
+ LIBS_OPENAL        = @OPENAL_LIBS@
+ LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
+-LIBS_PTHREAD       = @PTHREAD_LIBS@
++LIBS_PTHREAD       = @PTHREAD_LIBS@ -lpthread
  
- repack-thes-dict_OBJ  := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
- repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
--repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
-+	$(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+ ifeq (yes, $(BUILD_DARWIN))
+ LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile
+index 4efb685..f53c372 100644
+--- a/libaegisub/Makefile
++++ b/libaegisub/Makefile
+@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o
+ endif
  
- PROGRAM += $(d)repack-thes-dict
+ aegisub_PCH := $(d)lagi_pre.h
+-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
++aegisub_CPPFLAGS := -I$(d)include -I$(TOP) \
++	$(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
  
+ $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
+ $(d)common/parser.o_FLAGS := -ftemplate-depth=256
diff --git a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
deleted file mode 100644
index ae1f5c1c1ea..00000000000
--- a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d0b5152..2609161 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -136,20 +136,17 @@ AS_IF([test x$build_darwin != xyes], [
- AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
- 
- AS_IF([test x$enable_compiler_flags != xno], [
--  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
--  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-+  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
-+  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter"
-+  AC_C_FLAG([-std=gnu99])
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
-   # -O* messes with debugging.
-   AS_IF([test x$enable_debug = xyes], [
--    CFLAGS="$CFLAGS -O0"
--    CXXFLAGS="$CXXFLAGS -O0"
--  ], [
--    CFLAGS="$CFLAGS -O3"
--    CXXFLAGS="$CXXFLAGS -O3"
-+    CFLAGS="$CFLAGS -O0 -g"
-+    CXXFLAGS="$CXXFLAGS -O0 -g"
-   ])
- ])
- 
-diff --git a/src/Makefile b/src/Makefile
-index 08f9216..e2e5602 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -182,14 +182,13 @@ endif
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
--$(d)MatroskaParser.o_FLAGS              := -Wno-sometimes-uninitialized
- $(d)audio_player.o_FLAGS                := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
- $(d)audio_provider_factory.o_FLAGS      := $(CFLAGS_FFMS2)
- $(d)auto4_base.o_FLAGS                  := $(CFLAGS_FREETYPE)
- $(d)charset_detect.o_FLAGS              := -D_X86_
- $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
- $(d)subtitles_provider.o_FLAGS          := $(CFLAGS_LIBASS)
--$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
-+$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS)
- $(d)text_file_reader.o_FLAGS            := -D_X86_
- $(d)video_provider_manager.o_FLAGS      := $(CFLAGS_FFMS2)
- $(d)auto4_lua.o_FLAGS                   := -I$(TOP)vendor/luajit/include
diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
index 4eea654b2e0..cfae62ae7fe 100644
--- a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
+++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
@@ -28,6 +28,22 @@ index d1e1da4..aa26b81 100644
  FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
  
  #####################
+diff --git a/automation/Makefile b/automation/Makefile
+index d5425b7..121aae7 100644
+--- a/automation/Makefile
++++ b/automation/Makefile
+@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
+ $(DESTDIR)$(P_DATA)/automation/%: $(d)%
+ 	$(MKDIR_INSTALL)
+ 
+-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
++aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
+ aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
+-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
++aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
+ 
+ PROGRAM += $(d)aegisub-lua
+ 
 diff --git a/configure.ac b/configure.ac
 index d0b5152..ecec4de 100644
 --- a/configure.ac
@@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644
  
  subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
 diff --git a/src/Makefile b/src/Makefile
-index 08f9216..bb9233b 100644
+index 08f9216..53c60b6 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
@@ -70,8 +86,8 @@ index 08f9216..bb9233b 100644
  src_CXXFLAGS := $(CXXFLAGS_WX)
  src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
 -	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3)  $(LIBS_BOOST) $(LIBS_ICU)
-+	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \
-+	$(LIBS_LUA)
++	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
++	$(LIBS_ICU) $(LIBS_LUA)
  src_PCH := $(d)agi_pre.h
  src_INSTALLNAME := $(AEGISUB_COMMAND)