gentoo resync : 29.01.2021

3 files changed, 2 insertions, 152 deletions

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 9f0bd51ec83e..9d6393c1c1e5 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -9,7 +9,6 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2446 BLAK
 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
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
-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-r101.ebuild 4135 BLAKE2B 2932746b57f1741d8d55a8d88ac279401a1962a48eb0566a2435bd26c8e2949a206fb3781f62332a3e94188325f426866402964f1166fb67796abc3aa51c99a3 SHA512 ebc44d89355dda856c6d7156df640807550937a4e21ff4ada0cc645e4dc7dbaf9c6a739b4f368c0fd73bf523bc2f2f6abfa5968291157d4dbffeb9e47d7a45fc
 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-r101.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r101.ebuild
index 4f54947828cf..d1d9ba908b03 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r101.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r101.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild
deleted file mode 100644
index 3ca8cba21bb9..000000000000
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r3.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"
-	"${FILESDIR}/${PV}/${P}-fix-boost170-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
-}