gentoo resync : 14.12.2020

4 files changed, 190 insertions, 14 deletions

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index d2cc1976b96d..b96ae3f79644 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -5,10 +5,12 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-makefile-for-make4.3.patch 729 B
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 BLAKE2B 635bfd2317a05b1393c26b648f0081920be30e9ca29eeac0a5d25b75a141a3eb40cded94d27934eddb4d2ad1f28a1d8752faf97f264cc4a2a4ef0ffaedeed7b4 SHA512 247dba6e593212294f3157226c03e2fb5d3a5a8eaf9a16e0a65ea1fee006b8f21fadbdd80fb0b748be3a9b043779a0da6bb6007fac07b7908fb46f27a055704e
 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
 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-r3.ebuild 3601 BLAKE2B 53f7443999f2a1f07bd3d24c39315cca83df4dfbcba3ea42bf4ac6ef71dda782086f7ab86f0ae059f73500d991995606d58798e885ad1d736d879dfadbd39d8e SHA512 4eb7caa739fb28df49d8bc366452d0e465802a03e1d1341011d066ef3891d1150f2ed0257020b4bad2c2bfab9976cb3dc71bb5be3b199c690af996a0e1605993
 EBUILD aegisub-3.2.2_p20160518-r4.ebuild 3660 BLAKE2B 0e24a41fa570fe561564d9b59692975b0b8bbd586504316459361f9589477451e6584f57d7543e59f234e393286f9526ad3266217f2efb9afe2b8f4abbfb155d SHA512 242a6543a631309a0d2791f171a43897dbf46ec8ad0ccdfef9be4e71bac3db21fe8471ea0ef06812d229b8061d9b6dbdf31cc05fb894dad90fd341b0e682895b
-EBUILD aegisub-9999.ebuild 2825 BLAKE2B 667a98ee5b7c68e1a0dc189dd097f7b10dc8c0b7df2094196c97de470db6005dde5c30fb1768541d7859f82c1a1b4b376d870b8cde8b21eb963e7678742a9bfb SHA512 a36170ee5b54edb32f22e7dbd9717805b90e8e97b2998b2f7ae45259d51b9c9124e0ff54de3bc7478a13f96d3b45efc47985c9e06ca159171f7e62054c56202d
+EBUILD aegisub-9999.ebuild 2873 BLAKE2B 8967ace19b9aa1536682aaaf310f8d9a22286f5227777dd77575af6d65b52571b21218f14f4b9f851bdbc84a63233206aa96d34d15f547be928afe1d0fe42333 SHA512 c528ca6e2f1dbfa4915e51045618ff62347f6abc7695b90918d3d93966b9cccf75ab92be62a0ff97f7846dd2d8d2520286bf039982bda3b638c89d568a968902
 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-r100.ebuild
new file mode 100644
index 000000000000..fa12808a3cd6
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r100.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 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.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 l10n lua-single 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="${LUA_DEPS}
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
+	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}"
+# 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}/${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"
+	"${FILESDIR}/${PV}/${P}-tests_luarocks_lua_version.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
+	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
+	}
+
+	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_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 dedf8a1e8582..bcc8a14c9a32 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+LUA_COMPAT=( luajit )
+LUA_REQ_USE="lua52compat"
 
 WX_GTK_VER=3.0-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 gnome2-utils l10n wxwidgets xdg-utils git-r3
+inherit autotools l10n lua-single wxwidgets xdg-utils git-r3
 
 DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
@@ -23,9 +26,8 @@ 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="
+RDEPEND="${LUA_DEPS}
 	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:=
@@ -43,18 +45,23 @@ RDEPEND="
 	spell? ( app-text/hunspell:= )
 	uchardet? ( app-i18n/uchardet )
 "
-DEPEND="${RDEPEND}
-	dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	|| ( alsa openal oss portaudio pulseaudio )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-git.patch"
 )
 
+pkg_setup() {
+	lua-single_pkg_setup
+}
+
 src_prepare() {
 	default_src_prepare
 
@@ -107,16 +114,12 @@ src_test() {
 	emake test-libaegisub
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch
new file mode 100644
index 000000000000..c441b8fe083b
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch
@@ -0,0 +1,14 @@
+Make sure 'luarocks path' outputs the paths for the Lua ABI version
+required by aegisub, not the one used internally by luarocks.
+
+--- a/automation/Makefile
++++ b/automation/Makefile
+@@ -19,7 +19,7 @@
+ PROGRAM += $(d)aegisub-lua
+ 
+ test-automation: $(PROGRAM)
+-	eval `luarocks path`; cd $(TOP)automation; ./aegisub-lua tests/busted.lua -p 'moon' tests/modules
++	eval `luarocks --lua-version 5.1 path`; cd $(TOP)automation; ./aegisub-lua tests/busted.lua -p 'moon' tests/modules
+ 
+ test: test-automation
+