gentoo auto-resync : 23:11:2023 - 22:30:19

9 files changed, 293 insertions, 79 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 0b337b3cb646..6876b09213f2 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 753fed22fe47..7415da588b99 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -10,8 +10,10 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch 996 BLAK
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BLAKE2B 67558c0d8a1227e03d6ab97e4f417ec0ef557609be908b403ea5d4c4b12b58dd33822611b98e42afdbc3e65741094ef52d19812fd4eea5611f12a7e109b0986f SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2452 BLAKE2B 96b3712ec2f01eecff986b6e7fa8f2844b194e4cf139c0195d87fc7bd7aa77734c1b603c23081179fcbc4699e3c887fbb8069e58a23c44d706d79233a5418a1e SHA512 c3c8e5d13f73257278323bc2bba97b3abf838af0c727dc77aa8ba76b16440354d8d450ac9f6b5ab89cac3b1f44cc883a3ef80f22cf4f3ddd7ade05ee06c59cbb
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505 BLAKE2B d92ab5c7604b9c04296ea82d3c5b093a900bb9345289539262e5d057bf21d003ce1fdfce7e6f57b8dad3cb62c3e604ada6e9bd596a3673afbbced338230ba638 SHA512 71bc5511bc0fcb9d55e893300066f7e755da5bad04f74e0ba103e622cac6ebf99d1fa7b1ca9f08d2b5169d305a4bee6a7782cb14304352ca108d126931851a5b
-AUX aegisub-9999-git.patch 1602 BLAKE2B ae40661da657c303eaaefc8b2d850e810ca506b60eb023bb34b6fe9839205dec15c7f781ab0e886f52e3c1d721338bf9bd9ec29814c65f236c8d5b99156a8a45 SHA512 7e4c1be034543b887b9ee6b84e686c2f1c26e6138a9aee997a0eab2dd5256a918c4ccfda41b0cc71a88fc0856f1726cee413e16fa4aef260faacb0803e01732d
+AUX 3.3.3/aegisub-3.3.3-support-system-gtest.patch 2932 BLAKE2B e05519e4734f7532f605d63d27fd9386fba7eb0b36055235701ad65ee704f86424fbfc89fa36da6137c11fb149d11e793f37ae1e3c1e7820eaf236a774d2fa83 SHA512 643b7525e6f170d552551b6ebeffc9a5b37b8a38570f654fb93d523d2ccce355403ce50ddb337ee1761a4997235e12440d86684f296619196c418183989727cd
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
+DIST aegisub-3.3.3.tar.gz 6580314 BLAKE2B b6a6b6d9a805fb1aec943f00452e5f074c050d7d8970e0fa57da54a7a3c12b86241eafafd957577625bcce395c9f909fe60a22c9d76fcf8f018a4ea03921dacf SHA512 19e44667ad8742560559387c15f6c00339194cd26e1140624c63f34c6b4da6bb0b80be0f636a2d1cd0b15f1598e0580218d648e0622635b12eeaad3a40df9abc
 EBUILD aegisub-3.2.2_p20160518-r105.ebuild 4277 BLAKE2B a0f15d4785fe42e9da2b4d76066130d0df1e08f230c1a1651496ca437fefb453d9765089b9131b1b0de965ccda32a12fe1cb1a97347b7d3be1c20488632c111b SHA512 f990a74d8a767584482eea686eeebf24e8cb5116b59313a346b9cbe56fe7f0bc2fbc79b3d9526d85f064bd4cb93eaf5344c500c21138a7dd971a3c6f61bbdfc3
-EBUILD aegisub-9999.ebuild 2937 BLAKE2B a0a546aab6cf469f32c5adc714dedeeea7d073b1d7ae25d4515535ccdcd5d189e2fc5a1e72d1c5bac0b8a6425323cd6b91c7b42d3f3e706c956a46bc8741f27d SHA512 4ae58807060beb18669e631fb8b4b8959de80930db0f8d1def67c0073505bebc77b4944578b015aed8258a23d1f9dcd0bf838a2c2d88c57f94d2fee770dc475a
-MISC metadata.xml 490 BLAKE2B 1f9546d336e50825e1490d8f0b54a21c076ec000427f0c319781e702ec0a58966bd4193e26c0c7cc4e677bea67a865a9a2f040fd4f58356d8e5539c5c7592665 SHA512 7717dcf3bbe125775a8a93682cde4477294649cbd6d01dcccc132b51880d7a58a61314134cb83f7ffd43e104f4818d9d27c1b90685f988ebe78ecdd9156db9eb
+EBUILD aegisub-3.3.3.ebuild 3917 BLAKE2B 3bcc249ae52755ed55e06bc5422532bf460988af45b0da1028e4f22e5531e1d806962a0b13e506e2ba88283edcec550d68bf2dc37882752feb6ad4b6dd334e9c SHA512 648b0a44500379c6be599acef5b53a5dbc5af283b46c783aaeacdf2e4da2844007c41648be3da9c673341675f986d1407c5efa86e98cb8114702f6b2b5f95397
+EBUILD aegisub-9999.ebuild 3917 BLAKE2B 3bcc249ae52755ed55e06bc5422532bf460988af45b0da1028e4f22e5531e1d806962a0b13e506e2ba88283edcec550d68bf2dc37882752feb6ad4b6dd334e9c SHA512 648b0a44500379c6be599acef5b53a5dbc5af283b46c783aaeacdf2e4da2844007c41648be3da9c673341675f986d1407c5efa86e98cb8114702f6b2b5f95397
+MISC metadata.xml 490 BLAKE2B dd77320afb5975e48eae5240c165ed9470fe5ae1ed917b8ba022a9c63d1b446c75b820eafef914c885afb9c32c8634bf6ee55e1340a1efce91d0fe019a589cc8 SHA512 deee9b5cbcbd3fa37a665b333094334c3a298face98c7deb992127191d77cbe0f7781945fd8297ce9f26ca34988539a4abc27877c4dff79228d64dc1c4bfeddd
diff --git a/media-video/aegisub/aegisub-3.3.3.ebuild b/media-video/aegisub/aegisub-3.3.3.ebuild
new file mode 100644
index 000000000000..208e6b0e5adb
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.3.3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+LUA_REQ_USE="lua52compat"
+
+WX_GTK_VER=3.2-gtk3
+PLOCALES="ar be 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 sr_RS@latin uk_UA vi zh_CN zh_TW"
+
+inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git"
+	# Submodules are used to pull bundled libraries.
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/wangqr/Aegisub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+RESTRICT="test"
+
+# aegisub bundles luabins (https://github.com/agladysh/luabins).
+# Unfortunately, luabins upstream is practically dead since 2010.
+# Thus unbundling luabins isn't worth the effort.
+RDEPEND="${LUA_DEPS}
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	media-libs/ffmpegsource:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libass:=[fontconfig]
+	sys-libs/zlib
+	virtual/libiconv
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( >=sci-libs/fftw-3.3:= )
+	openal? ( media-libs/openal )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( media-libs/libpulse )
+	spell? ( app-text/hunspell:= )
+	uchardet? ( app-i18n/uchardet )
+"
+DEPEND="${RDEPEND}"
+# luarocks is only used as a command-line tool so there is no need to enforce
+# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version
+# bounds in order to make sure we use a version migrated to Lua eclasses.
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		>=dev-cpp/gtest-1.8.1
+		>=dev-lua/luarocks-3.4.0-r100
+		$(lua_gen_cond_dep '
+			dev-lua/busted[${LUA_USEDEP}]
+		')
+	)
+"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	|| ( alsa openal oss portaudio pulseaudio )"
+
+PATCHES=(
+	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch"
+	"${FILESDIR}/3.3.3/${PN}-3.3.3-support-system-gtest.patch"
+	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-tests_luarocks_lua_version.patch"
+	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost-181-build.patch"
+)
+
+aegisub_check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++14; then
+		die "Your compiler lacks C++14 support."
+	fi
+}
+
+pkg_pretend() {
+	aegisub_check_compiler
+}
+
+pkg_setup() {
+	aegisub_check_compiler
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Remove tests that require unavailable uuid Lua module.
+	rm automation/tests/modules/lfs.moon || die
+
+	remove_locale() {
+		rm "po/${1}.po" || die
+	}
+
+	plocale_find_changes 'po' '' '.po'
+	plocale_for_each_disabled_locale remove_locale
+
+	# See http://devel.aegisub.org/ticket/1914
+	config_rpath_update "${S}"/config.rpath
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+	# Prevent access violations from OpenAL detection. See Gentoo bug 508184.
+	use openal && export agi_cv_with_openal="yes"
+
+	setup-wxwidgets
+	local myeconfargs=(
+		--disable-update-checker
+		--with-ffms2
+		--with-system-luajit
+		$(use_enable debug)
+		$(use_with alsa)
+		$(use_with fftw fftw3)
+		$(use_with openal)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio libpulse)
+		$(use_with spell hunspell)
+		$(use_with uchardet)
+	)
+	export FORCE_GIT_VERSION="v${PV}"
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake WITH_SYSTEM_GTEST=$(usex test)
+}
+
+src_test() {
+	emake test-automation
+	emake test-libaegisub
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index ef73d1cff4ee..208e6b0e5adb 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -6,21 +6,26 @@ EAPI=7
 LUA_COMPAT=( luajit )
 LUA_REQ_USE="lua52compat"
 
-WX_GTK_VER=3.0-gtk3
+WX_GTK_VER=3.2-gtk3
 PLOCALES="ar be 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 sr_RS@latin uk_UA vi zh_CN zh_TW"
 
-inherit autotools lua-single plocale wxwidgets xdg-utils git-r3
+inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot toolchain-funcs
 
 DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub"
-EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git"
-# Submodules are used to pull bundled libraries.
-EGIT_SUBMODULES=()
 
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git"
+	# Submodules are used to pull bundled libraries.
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/wangqr/Aegisub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell +uchardet"
+IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
 RESTRICT="test"
 
 # aegisub bundles luabins (https://github.com/agladysh/luabins).
@@ -46,20 +51,44 @@ RDEPEND="${LUA_DEPS}
 	uchardet? ( app-i18n/uchardet )
 "
 DEPEND="${RDEPEND}"
+# luarocks is only used as a command-line tool so there is no need to enforce
+# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version
+# bounds in order to make sure we use a version migrated to Lua eclasses.
 BDEPEND="dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		>=dev-cpp/gtest-1.8.1
+		>=dev-lua/luarocks-3.4.0-r100
+		$(lua_gen_cond_dep '
+			dev-lua/busted[${LUA_USEDEP}]
+		')
+	)
 "
 
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	|| ( alsa openal oss portaudio pulseaudio )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-git.patch"
+	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch"
+	"${FILESDIR}/3.3.3/${PN}-3.3.3-support-system-gtest.patch"
+	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-tests_luarocks_lua_version.patch"
 	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost-181-build.patch"
 )
 
+aegisub_check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++14; then
+		die "Your compiler lacks C++14 support."
+	fi
+}
+
+pkg_pretend() {
+	aegisub_check_compiler
+}
+
 pkg_setup() {
+	aegisub_check_compiler
 	lua-single_pkg_setup
 }
 
@@ -83,6 +112,7 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export PKG_CONFIG
 	# Prevent access violations from OpenAL detection. See Gentoo bug 508184.
 	use openal && export agi_cv_with_openal="yes"
 
@@ -100,14 +130,13 @@ src_configure() {
 		$(use_with pulseaudio libpulse)
 		$(use_with spell hunspell)
 		$(use_with uchardet)
-		--disable-compiler-flags
 	)
+	export FORCE_GIT_VERSION="v${PV}"
 	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-	# Concurrent builds seem to break the build process.
-	emake -j1
+	emake WITH_SYSTEM_GTEST=$(usex test)
 }
 
 src_test() {
diff --git a/media-video/aegisub/files/3.3.3/aegisub-3.3.3-support-system-gtest.patch b/media-video/aegisub/files/3.3.3/aegisub-3.3.3-support-system-gtest.patch
new file mode 100644
index 000000000000..ac7834e541d8
--- /dev/null
+++ b/media-video/aegisub/files/3.3.3/aegisub-3.3.3-support-system-gtest.patch
@@ -0,0 +1,89 @@
+commit 83f868ea8decbbe97891631fe142e84c883ee33d
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Wed Jun 1 20:00:37 2016 +0300
+
+Allow to build and run tests with a system copy of gtest (googletest)
+
+Also add LIBS_UCHARDET to the mix only when uchardet is requested.
+
+Closes #1923
+
+Bug: http://devel.aegisub.org/ticket/1923
+---
+
+diff --git a/configure.ac b/configure.ac
+index 856e38993..197d0a788 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -144,7 +144,7 @@ AS_IF([test x$enable_compiler_flags != xno], [
+   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
+ 
+   # For mac compiler which still stuck on c++98
+-  AC_CXX_FLAG([-std=c++11])
++  AC_CXX_FLAG([-std=c++14])
+ 
+   # -O* messes with debugging.
+   AS_IF([test x$enable_debug = xyes], [
+diff --git a/tests/Makefile b/tests/Makefile
+index 137430854..bafb59a0f 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -1,24 +1,46 @@
+ include $(dir $(lastword $(MAKEFILE_LIST)))../header.mk
+ 
++WITH_SYSTEM_GTEST ?= no
++
++ifeq (no, $(WITH_SYSTEM_GTEST))
+ GTEST_ROOT ?= $(TOP)vendor/googletest
+ GTEST_FILE := ${GTEST_ROOT}/src/gtest-all
++GTEST_CPPFLAGS := -I$(GTEST_ROOT) -I$(GTEST_ROOT)/include
++GTEST_LIBS := $(LIBS_PTHREAD)
++else
++GTEST_CPPFLAGS := $(shell ${PKG_CONFIG} --cflags-only-I gtest)
++GTEST_LIBS := $(shell ${PKG_CONFIG} --libs gtest)
++endif
++
++GTEST_CXXFLAGS := $(CFLAGS_PTHREAD)
+ 
+ run_PCH := $(d)support/tests_pre.h
+ run_CPPFLAGS := -I$(TOP)libaegisub/include -I$(TOP) -I$(d)support \
+-	-I$(GTEST_ROOT) -I$(GTEST_ROOT)/include $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+-run_CXXFLAGS := -Wno-unused-value -Wno-sign-compare
+-run_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_UCHARDET) $(LIBS_PTHREAD)
++	$(CPPFLAGS_BOOST) $(CFLAGS_LUA) $(GTEST_CPPFLAGS)
++run_CXXFLAGS := -Wno-unused-value -Wno-sign-compare $(GTEST_CXXFLAGS)
++run_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_UCHARDET) $(LIBS_PTHREAD) $(GTEST_LIBS)
+ run_OBJ := \
+ 	$(patsubst %.cpp,%.o,$(wildcard $(d)tests/*.cpp)) \
+ 	$(d)support/main.o \
+ 	$(d)support/util.o \
+-	$(TOP)lib/libaegisub.a \
+-	$(GTEST_FILE).o
++	$(TOP)lib/libaegisub.a
++
++ifeq (yes, $(HAVE_UCHARDET))
++run_LIBS += $(LIBS_UCHARDET)
++endif
++
++ifeq (no, $(WITH_SYSTEM_GTEST))
++run_OBJ += $(GTEST_FILE).o
+ 
+ # This bit of goofiness is to make it only try to build the tests if google
+ # test can be found and silently skip it if not, by using $(wildcard) to check
+ # for file existence
+ PROGRAM += $(subst $(GTEST_FILE).cc,$(d)run,$(wildcard $(GTEST_FILE).cc))
++test: $(subst $(GTEST_FILE).cc,test-libaegisub,$(wildcard $(GTEST_FILE).cc))
++else
++PROGRAM += $(d)run
++test: test-libaegisub
++endif
+ 
+ ifeq (yes, $(BUILD_DARWIN))
+ run_LIBS += -framework ApplicationServices -framework Foundation
+@@ -31,6 +53,4 @@ gtest_filter ?= *
+ test-libaegisub: $(d)run $(d)data
+ 	cd $(TOP)tests; ./run --gtest_filter="$(gtest_filter)"
+ 
+-test: $(subst $(GTEST_FILE).cc,test-libaegisub,$(wildcard $(GTEST_FILE).cc))
+-
+ include $(TOP)Makefile.target
diff --git a/media-video/aegisub/files/aegisub-9999-git.patch b/media-video/aegisub/files/aegisub-9999-git.patch
deleted file mode 100644
index a5883336757b..000000000000
--- a/media-video/aegisub/files/aegisub-9999-git.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..65de0e767 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -79,13 +79,13 @@ endif
- all: $(LIB_TARGETS)
- 
- clean:
--	$(BIN_RM) -f $(OBJ) $(CLEANFILES) $(LIB_TARGETS)
-+	$(BIN_RM) -f -- $(OBJ) $(CLEANFILES) $(LIB_TARGETS)
- 
- distclean: clean
--	$(BIN_RM) -rf $(DISTCLEANFILES) $(DEP)
-+	$(BIN_RM) -rf -- $(DISTCLEANFILES) $(DEP)
- 
- depclean: clean
--	$(BIN_RM) -rf $(DEP)
-+	$(BIN_RM) -rf -- $(DEP)
- 
- install:
- 
-diff --git a/header.mk b/header.mk
-index 613b38ff1..2c238e125 100644
---- a/header.mk
-+++ b/header.mk
-@@ -5,15 +5,13 @@ TOP := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))/
- include $(TOP)Makefile.inc
- 
- subdirs := \
--	automation \
- 	libaegisub \
- 	packages/desktop \
- 	po \
- 	src \
- 	tests \
--	tools \
- 	vendor/luabins \
--	vendor/luajit
-+	tools
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
- 
-diff --git a/m4macros/ac_agi.m4 b/m4macros/ac_agi.m4
-index e45a54767..1bd0120ed 100644
---- a/m4macros/ac_agi.m4
-+++ b/m4macros/ac_agi.m4
-@@ -20,12 +20,14 @@ AC_DEFUN([AC_AGI_LINK],[
-   aegisub_save_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $4"
-   LIBS="$LIBS $5"
-+  AC_LANG_PUSH(C++)
-   AC_CHECK_HEADER([$3], [agi_cv_header="yes"], [agi_cv_header="no"])
-   AS_IF([test "x$agi_cv_header" = xyes],
-         [AC_CACHE_CHECK(
-           [whether $1 works], [agi_cv_with_$2],
-           [AC_LINK_IFELSE([AC_LANG_SOURCE([$6])], [eval agi_cv_with_$2="yes"], [eval agi_cv_with_$2="no"])])]
-         [eval agi_cv_with_$2="no"])
-+  AC_LANG_POP(C++)
-   CPPFLAGS="$aegisub_save_CPPFLAGS"
-   LIBS="$aegisub_save_LIBS"
- ])
diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml
index be8099ce66c5..331bf705f1d7 100644
--- a/media-video/aegisub/metadata.xml
+++ b/media-video/aegisub/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="uchardet">Enable charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
 	</use>
 	<upstream>
-		<bugs-to>http://devel.aegisub.org/wiki/NewTicket</bugs-to>
-		<remote-id type="github">Aegisub/Aegisub</remote-id>
+		<bugs-to>https://github.com/wangqr/Aegisub/issues</bugs-to>
+		<remote-id type="github">wangqr/Aegisub</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 56bc8f32c075..2b5c8c9e8858 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,7 +2,7 @@ AUX mpv-0.36.0-sub-match-audio.patch 1621 BLAKE2B aa774960703d3b5f2f5a8c3dc327bb
 AUX mpv-0.36.0-tests-odr.patch 1118 BLAKE2B 8a87385922af6ee08adc3972ce2271f1f700842dba8415ac27f04ba7147b070b665279c7b4d50e06b85d258a9ab47db23a82a9f9a4db444efb97a677ef2f6317 SHA512 8ccec2ce0108468c8fc048d3e892b1c8f177f434809d899f38a00526515b1453e0cb5cd2bfd5843568a025fda314fd172c94c548c8e144514353904066b917f3
 DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B 7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1 SHA512 51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
 DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B 31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68 SHA512 a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
-EBUILD mpv-0.36.0-r1.ebuild 7516 BLAKE2B a100b97f0ccd7d85c5188740a1aa008a1d2958cf897de1dc346710570eecf055e7236d6898f93cb3c3a7773a7565a973aebebd72a6b3626037215e5058c4122d SHA512 31e3bc8fb3d87f55c5ff8037a2662359b00f3d005e31e7033cb3eaf3b2c0cb531a604e61ce964977a633efa104189deeca9ec579ef0ad5db3ee4e5538658c59a
+EBUILD mpv-0.36.0-r1.ebuild 7515 BLAKE2B 4803c6c650526632de3cb55ebaf1fe20c4f427c3890135e0c2a43a2787fb381cf872a0fee551b152ce6dc5318650d399a57e51ad27e4ed840e6ada0ecd51f08c SHA512 f6319c75533f9285dba3c69687ab313c4e0dbb18e6e36f4449072d434fb5da94f9c41d384b4e22c1270cac46d7872f92d95b25e66e79ab7a834227bdb3ef2404
 EBUILD mpv-0.37.0.ebuild 7035 BLAKE2B 9abfe0ab4e55a4ea05f90bd2aa0e3e1b4a4ede174db39d40b8f14a4d71efc084f7388eeac43c1e3b6e32e82f5e505b1b8476f603c796c0b764f2b9961688fb08 SHA512 9a1c9d648433437150dab1105dfb09f64c7051423971be26e6f90d564460c42aa138266f117eb0771f10229e9b49f1e99415bb40832808bf26aa768b51cf510c
 EBUILD mpv-9999.ebuild 7046 BLAKE2B 438d3c48b4caead14e5ac7767586b62b4ef570132cfb2a4088f8addb41172c71bf50a95a7b64c3b6352624fc7d4a874284e0209be1970111a8299f5cc5a8bc97 SHA512 ac97e421fdc49914b87829083c5884dff6d7a4806063936bde55fe4e41fb52589231dcbe77ffb0d5b76cd7e603b79704d2435b94e0107d1bda7f2321a1bc305b
 MISC metadata.xml 2324 BLAKE2B 6fe57270fef9275f47b0d7f282fbf4ff5c4a76c74e43820a8e0a4d56348eb72dc89dfdb06a9ff9a2b6f73d35102f861200d6c8c6f4dc41cfb4e42ff69d70da8a SHA512 0418e3315b4ded29714099d80075f61f6d1b38d9109bbb3bc372abbaceb14f705d5798eac2c14ef0fd0e1c557785291a4acb5e773dffb46f0b7f7962bf38d041
diff --git a/media-video/mpv/mpv-0.36.0-r1.ebuild b/media-video/mpv/mpv-0.36.0-r1.ebuild
index d4c540278992..63b54c674210 100644
--- a/media-video/mpv/mpv-0.36.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.36.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
 else
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
 fi
 
 DESCRIPTION="Media player for the command line"