gentoo resync : 22.01.2021

7 files changed, 55 insertions, 324 deletions

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index b96ae3f79644..9f0bd51ec83e 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,3 +1,4 @@
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch 1831 BLAKE2B f46889a5140423f29095e79a0a5778dd1b21d812570c8c5e444473266527ee3808a07d578b8aff4ce91d6ca665c230d66bcbf810851fa31a95e625c32e8c0fc6 SHA512 97623b47828b0db7dfcde2f8d9f00d835cb98dd8be2d9b727f1d4a3b73b13b5e3bc0c3f40ae41d6b21fadaab14b019a788a2b55a84fb365ad23bb75e76387df8
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch 1490 BLAKE2B 6b3fb8f98348585dc15fd92e992b231fb83f94dffd3ed97cf0d41323e28bd6c48a77e6e7eecd9e79a1f85ab933eee93f31feebf08ed2d18488d519dbe47b57a3 SHA512 59ec5d28424f9b2ab1d63b00c2e237263f6816d42baef977ab9494fa696aace7d3b7e949c672aa77c799dbb255c69fcd3acdc289413dd5b3f8569e28ba528cef
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch 496 BLAKE2B 33e646f71ced61c5411ddc871ff42fb61d5e89d068441e72c33a99927a27cad206068eab70563db94d21f4aa9516e69da8c34d0e78c46f15b1561b2170d8d5ff SHA512 58c8acc766751b6f9122821b5958ef3756c4802e91ed7ed8915c54eb7c8c960c46734a8d76cc200c064e0dab5a1f0008f99a5dd4a1c51ecda7983bb84ef6d645
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch 2369 BLAKE2B edbada9d9bb3fbd4ffcd3f8f6aa640132163e0127baada7d40eb39312479602cf57b80e9314b8d3a92aff74764a9ed8336b055cf9c2d387c27595553f1f01185 SHA512 7963b76652126e1aa574e89f56c09e6008afd745c9198a2b081ed65c8697a15cbd7e611d6aeae0e2513b0eb79409665fd78885ef3599ff6f0d074b42bb461a8a
@@ -6,11 +7,9 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 B
 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 2446 BLAKE2B 5b1a5556829fbcd5d10ad869af5dcce4c6227dbc9d460094f237448a4aac9e07a9752039ab857a3556d062297cd0101e71ace0b4d3643f481e7479f16ccdf2e3 SHA512 f5171353ac14806166e26c4b335e6c7d9e111ba1eb68c3160fc9f802e1e3de659df48c4be180a0a25c67f7733007c8875c191436314ccfc9d7696a1f8a1fa719
 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 2337 BLAKE2B 472a8312ac6d79acc494f3b77e55c09219158815dd608c35f1ecc5f0e7dfe2de729c5ade20b04ffa02d767492a0d981f3d9de729b61354cd2df0426cdaf8cd1e SHA512 df873bd18c9329541bc327a93e1a76af9c27d8a19d868375246b136d011330764f18c5b19d1fc0846060037ecf4613030a8e9549a1fbe2206f5fac3af9fce8c9
+AUX aegisub-9999-git.patch 1602 BLAKE2B ae40661da657c303eaaefc8b2d850e810ca506b60eb023bb34b6fe9839205dec15c7f781ab0e886f52e3c1d721338bf9bd9ec29814c65f236c8d5b99156a8a45 SHA512 7e4c1be034543b887b9ee6b84e686c2f1c26e6138a9aee997a0eab2dd5256a918c4ccfda41b0cc71a88fc0856f1726cee413e16fa4aef260faacb0803e01732d
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
-EBUILD aegisub-3.2.2_p20160518-r100.ebuild 4049 BLAKE2B 9d99d0d3663a875457e23fe5341d5390fa3fcacc010aa122b98f715165edcf14e8e05a0797edf29e5fbb5bbf29eaf39871d6f9854a81414928609ccfd011f350 SHA512 a453c22c73369d5dd818dd5954293505dd11972bc8f2f2db5370fa14e99e5c7abcd1c6d5454969e24aec53509b409611a7fc39c1a1cd1ea1d6f95561475c0530
-EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3551 BLAKE2B cff2e09de3983eb5f9bdc8f6ef68e1a4ba9b714707d1048dfd87d88b869bf2a50d671fdb779fc5ac23e46e4216609fcf6f294c95da22659483ad51f69fcdcaaa SHA512 f8455fe7205c84ebd039173ccfe7119068917f424839da5c0232922d8e02e17cde06fdf4ca06504e9a0e92c824dd888641a7643f8e777de01240ec8e79caac49
+EBUILD aegisub-3.2.2_p20160518-r101.ebuild 4137 BLAKE2B 47d2bc7581e575ef99e56b2d87c5074b097df450e81ace79add5e34f085bd0885ede2ef1c5c6295fa297ebca4d9419106c1fadfe6cde4726e914e0ab69f76c3c SHA512 c111a9c2cb50ce3b83b1400feed0bdbbd85430787478e7d8b86a512b1ee176907e01cf4013cc5b269869e82244b1887a9ed17a2f6e9791f16ec69f113a4a72b1
 EBUILD aegisub-3.2.2_p20160518-r3.ebuild 3601 BLAKE2B 53f7443999f2a1f07bd3d24c39315cca83df4dfbcba3ea42bf4ac6ef71dda782086f7ab86f0ae059f73500d991995606d58798e885ad1d736d879dfadbd39d8e SHA512 4eb7caa739fb28df49d8bc366452d0e465802a03e1d1341011d066ef3891d1150f2ed0257020b4bad2c2bfab9976cb3dc71bb5be3b199c690af996a0e1605993
-EBUILD aegisub-3.2.2_p20160518-r4.ebuild 3660 BLAKE2B 0e24a41fa570fe561564d9b59692975b0b8bbd586504316459361f9589477451e6584f57d7543e59f234e393286f9526ad3266217f2efb9afe2b8f4abbfb155d SHA512 242a6543a631309a0d2791f171a43897dbf46ec8ad0ccdfef9be4e71bac3db21fe8471ea0ef06812d229b8061d9b6dbdf31cc05fb894dad90fd341b0e682895b
-EBUILD aegisub-9999.ebuild 2873 BLAKE2B 8967ace19b9aa1536682aaaf310f8d9a22286f5227777dd77575af6d65b52571b21218f14f4b9f851bdbc84a63233206aa96d34d15f547be928afe1d0fe42333 SHA512 c528ca6e2f1dbfa4915e51045618ff62347f6abc7695b90918d3d93966b9cccf75ab92be62a0ff97f7846dd2d8d2520286bf039982bda3b638c89d568a968902
+EBUILD aegisub-9999.ebuild 2872 BLAKE2B 9f8c40a8786e508c3d8e803fe47b1e006db0efc97b03819f20954e1d55035750e230df7623b82f09d54785945e0d7b431e0183d828515d0fbba48b85b184839c SHA512 da8aa9a3e14f8dce836614c284a6bf5fbc2570ca86d9e88d0b7952ac07bff6d5862e017e8395d541e9c99081bb4366897d9fa39846f737987de69fd02252ab88
 MISC metadata.xml 489 BLAKE2B b26abe2056ef0465a81ea8f9928c6d05053595b5650aff750251173ddce6f5248a30331104710c1b05cafe9641c072764c45f66935b25857785bc833af31174a SHA512 450c45be100ed72d7f0b69fe596862137ea2f421597e99129325bf2f58940600a62e1502ee4d6c7cbbab17b4cbd99da8c481ceb6fec2709452c17d8cb7aaae48
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r100.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r101.ebuild
index fa12808a3cd6..4f54947828cf 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r100.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -73,6 +73,7 @@ PATCHES=(
 	"${FILESDIR}/${PV}/${P}-fix-boost170-build.patch"
 	"${FILESDIR}/${PV}/${P}-fix-makefile-for-make4.3.patch"
 	"${FILESDIR}/${PV}/${P}-tests_luarocks_lua_version.patch"
+	"${FILESDIR}/${PV}/${P}-avoid-conveying-positional-parameters-to-source-builtin.patch"
 )
 
 aegisub_check_compiler() {
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
deleted file mode 100644
index 1a0ea043f038..000000000000
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 sr_RS@latin uk_UA vi zh_CN zh_TW"
-COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234"
-
-inherit autotools flag-o-matic gnome2-utils l10n wxwidgets xdg-utils vcs-snapshot
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
-SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
-RESTRICT="!test? ( 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="
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
-	dev-lang/luajit:2[lua52compat]
-	dev-libs/boost:=[icu,nls,threads]
-	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-sound/pulseaudio )
-	spell? ( app-text/hunspell:= )
-	uchardet? ( app-i18n/uchardet )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		>=dev-cpp/gtest-1.8.1
-		dev-lua/busted
-		dev-lua/luarocks
-	)
-"
-
-REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
-
-PATCHES=(
-	"${FILESDIR}/${PV}/${P}-fix-system-luajit-build.patch"
-	"${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
-	"${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
-	"${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-icu62-build.patch"
-
-)
-
-aegisub_check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
-	fi
-}
-
-pkg_pretend() {
-	aegisub_check_compiler
-}
-
-pkg_setup() {
-	aegisub_check_compiler
-}
-
-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
-	}
-
-	l10n_find_plocales_changes 'po' '' '.po'
-	l10n_for_each_disabled_locale_do remove_locale
-
-	# See http://devel.aegisub.org/ticket/1914
-	config_rpath_update "${S}"/config.rpath
-
-	eautoreconf
-
-	cat <<- EOF > build/git_version.h || die
-		#define BUILD_GIT_VERSION_NUMBER 8897
-		#define BUILD_GIT_VERSION_STRING "${PV}"
-		#define TAGGED_RELEASE 0
-	EOF
-}
-
-src_configure() {
-	# 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)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake WITH_SYSTEM_GTEST=$(usex test)
-}
-
-src_test() {
-	emake test-automation
-	emake test-libaegisub
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r4.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r4.ebuild
deleted file mode 100644
index 9707aa452f83..000000000000
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 sr_RS@latin uk_UA vi zh_CN zh_TW"
-COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234"
-
-inherit autotools flag-o-matic gnome2-utils l10n wxwidgets xdg-utils vcs-snapshot
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
-SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
-RESTRICT="!test? ( 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="
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
-	dev-lang/luajit:2[lua52compat]
-	dev-libs/boost:=[icu,nls,threads]
-	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-sound/pulseaudio )
-	spell? ( app-text/hunspell:= )
-	uchardet? ( app-i18n/uchardet )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		>=dev-cpp/gtest-1.8.1
-		dev-lua/busted
-		dev-lua/luarocks
-	)
-"
-
-REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
-
-PATCHES=(
-	"${FILESDIR}/${PV}/${P}-fix-system-luajit-build.patch"
-	"${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
-	"${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
-	"${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-icu62-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-boost170-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-makefile-for-make4.3.patch"
-)
-
-aegisub_check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
-	fi
-}
-
-pkg_pretend() {
-	aegisub_check_compiler
-}
-
-pkg_setup() {
-	aegisub_check_compiler
-}
-
-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
-	}
-
-	l10n_find_plocales_changes 'po' '' '.po'
-	l10n_for_each_disabled_locale_do remove_locale
-
-	# See http://devel.aegisub.org/ticket/1914
-	config_rpath_update "${S}"/config.rpath
-
-	eautoreconf
-
-	cat <<- EOF > build/git_version.h || die
-		#define BUILD_GIT_VERSION_NUMBER 8897
-		#define BUILD_GIT_VERSION_STRING "${PV}"
-		#define TAGGED_RELEASE 0
-	EOF
-}
-
-src_configure() {
-	# 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)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake WITH_SYSTEM_GTEST=$(usex test)
-}
-
-src_test() {
-	emake test-automation
-	emake test-libaegisub
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index bcc8a14c9a32..58b02287943b 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -12,8 +12,8 @@ PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_B
 inherit autotools l10n lua-single wxwidgets xdg-utils git-r3
 
 DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
-EGIT_REPO_URI="https://github.com/${PN^}/${PN^}.git"
+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=()
 
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch
new file mode 100644
index 000000000000..bc0a669fda63
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch
@@ -0,0 +1,47 @@
+commit c663944bb4a9040e49811037fc3984d2d15764be
+Author: Kerin Millar <kfm@plushkava.net>
+Date:   Sun Jan 10 22:52:26 2021 +0000
+
+    Don't convey positional parameters to the . builtin
+    
+    To do so is a bashism; POSIX makes no provision for it. Fortunately, there
+    is no need to begin with. The srcdir variable is already defined at the
+    point that build/version.sh is sourced from the configure script and, thus,
+    does not need to be passed.
+    
+    As version.sh is only ever sourced, that would be a valid fix in and as of
+    itself. However, because version.sh has the executable bit set, there is an
+    implication that the original author may have intended for it to be so; for
+    testing purposes, perhaps. So as to continue to support this potential use
+    case, have the script retain the ability to assign the value of $1 to
+    srcdir, provided that srcdir is empty and provided that at least one
+    positional parameter was specified.
+    
+    Signed-off-by: Kerin Millar <kfm@plushkava.net>
+    Closes: https://bugs.gentoo.org/764881
+
+diff --git a/build/version.sh b/build/version.sh
+index 8cea0a3f3..614c74615 100755
+--- a/build/version.sh
++++ b/build/version.sh
+@@ -1,4 +1,6 @@
+-srcdir="$1"
++if [ -z "$srcdir" ] && [ $# -gt 0 ]; then
++  srcdir=$1
++fi
+ 
+ # If no git repo try to read from the existing git_version.h, for building from tarballs
+ if ! test -d "${srcdir}/.git"; then
+diff --git a/configure.ac b/configure.ac
+index 1d8c93067..d50541f40 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ PKG_PROG_PKG_CONFIG([pkgconfig_required_version])
+ # Developers only
+ #################
+ AC_MSG_CHECKING([for version])
+-. $srcdir/build/version.sh "$srcdir"
++. $srcdir/build/version.sh
+ AC_MSG_RESULT([$BUILD_GIT_VERSION_STRING $VERSION_SOURCE])
+ 
+ AC_MSG_CHECKING([for build date])
diff --git a/media-video/aegisub/files/aegisub-9999-git.patch b/media-video/aegisub/files/aegisub-9999-git.patch
index 80fd243703b1..a5883336757b 100644
--- a/media-video/aegisub/files/aegisub-9999-git.patch
+++ b/media-video/aegisub/files/aegisub-9999-git.patch
@@ -59,20 +59,3 @@ index e45a54767..1bd0120ed 100644
    CPPFLAGS="$aegisub_save_CPPFLAGS"
    LIBS="$aegisub_save_LIBS"
  ])
-diff --git a/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp
-index 79dc0f16c..8648d2987 100644
---- a/src/libresrc/libresrc.cpp
-+++ b/src/libresrc/libresrc.cpp
-@@ -22,9 +22,10 @@
- 
- wxBitmap libresrc_getimage(const unsigned char *buff, size_t size, double scale, int dir) {
- 	wxMemoryInputStream mem(buff, size);
-+        auto img = wxImage(mem);
- 	if (dir != wxLayout_RightToLeft)
--		return wxBitmap(wxImage(mem), -1, scale);
--	return wxBitmap(wxImage(mem).Mirror(), -1, scale);
-+            return wxBitmap(img.Scale(img.GetHeight() * scale, img.GetWidth() * scale));
-+	return wxBitmap(img.Mirror().Scale(img.GetHeight() * scale, img.GetWidth() * scale));
- }
- 
- wxIcon libresrc_geticon(const unsigned char *buff, size_t size) {