gentoo resync : 16.01.2021

3 files changed, 46 insertions, 214 deletions

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 0b661e3f8120..0cd677989578 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -5,10 +5,9 @@ AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 4037 BLAKE2B fa3d059198f79334d2b4e8109fd5d39d9f02ded8e46c287009bb8486d9c968b5387813f894fb78ccdd584e4f72fbcc4ee42cd00fc834933f90601c7fb08d0737 SHA512 155b8f5585a66167ae39d568d4c12227ffb7cf327707b556ed28532e6f8adce1a81601ae35403e14d6850e3c9411b1b9142c90dc2af50be1083abe21fa3d68f7
 AUX handbrake-9999-system-tools.patch 1489 BLAKE2B 2a3286dc1cd37d85e1edb1312688a354f000d560a767dc4c4fc23b7874bec46692f21a5b7e2c2b6cc7b6efb221a00084355659ee9d9965a28a23c7012adfbd3d SHA512 eb07b8e675cf6a8b4eee1d0fcb682ae7d61c9ec8423202b6c8672fc94f6b011b1e01a5e9654b2e63d15b66c122e8c2c57b385e36a43d3c68fba69bf144beb508
-DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
 DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b SHA512 ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e
-EBUILD handbrake-1.3.3-r4.ebuild 4178 BLAKE2B a0ff4a6cf384aaf7712660f289e1936eecc17d14cd32a56a17bdc4ceb576bdfc15626870535728d1a256e76c32181ca82237f75de45a544f66a7923e6557c3c9 SHA512 9796e6b756a75c2f84038ce2bcbc1f9d341f032180d515b292262084de9cf8d309b23eb38348ad4a260b87b1555abbc26272cbe71e95a9fd0f30577f064644bf
-EBUILD handbrake-1.3.3-r5.ebuild 4343 BLAKE2B 90a574d179c050c2bb32fb24743e7671a592d58b1096f0d0fe61b6f869d854a4dffc1376ea5a03b0a2a1d7e0b50cae44fc594436d65023700d53f7e92b929dee SHA512 2dfb30c83671a3f06623ad28e2b324440416538c58674be37aac3c895598139f17370d3ebefe12d5cb97e8261314f78c1071fd1a887adbeb2adf39d873431786
+DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1 SHA512 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568
 EBUILD handbrake-1.4.2-r2.ebuild 4072 BLAKE2B 965d544ea6ebc761306ff09503ca4211f2d6283031d42a9fc5ae29e7bbb9988744dfec15b9549eb8c75f9e892cf64f0430384802d0ff867205c84612d09fbca6 SHA512 18e0e2b7794fcf39af1c1951fb4b0a8b4e046ac0d021af913502ad6fb3335aa184630b68f472a363edf075f2ff7fb9a7ffedcba152d70704595ce4a780c6a95a
+EBUILD handbrake-1.5.1.ebuild 4073 BLAKE2B 67d8825b04fe1ee55254e5b602a8f8c9c1e7c4818eaa9ffd90729ae9f2b9897af50dc30c093c64d85b3cc7470dc09f001e1d58f53ec678767d27375e6aa4d549 SHA512 34e63623fe7e6bf8c0bcde6b4308130ef97214aab742cdbd20d1704084c4707023edf30cc9c99fe7fccb303b222874800188654767dc8664977b85d1fa2cd8ac
 EBUILD handbrake-9999.ebuild 4073 BLAKE2B 8b2d6db78de39f0d96a3ebd2f5c1a2a68c683f59a7e0bcbc26e62f9c75c81d7f16f371e6d468b4295e5a1bd13d580ddb4681c5ce8becc38f0e6bcb72ce4735e3 SHA512 aefa37c8343d79e4bf283f7198a096356665f72c1387458f17ed905ff61b32c52c076eebcc265062edc808a555489bc8284bb39fee7c4f9eda7e16dc0bbef525
 MISC metadata.xml 1111 BLAKE2B af0af39468b2c04ae8e9f4005ee813eec2c707fe0e39f28df0b18d7836f7b6c2b46cbe9a790ca5ff2d67e15548707dc080b2fb5a4028ebed711b92f0df09ad41 SHA512 e6adea6ce757118935546923c6073b6764e8ad93e2ed6cc96789f3fc0236c762f461f31fbf94cc49b4e191ec99ac903070b1496adff79fe3af91082dbc5bc4d1
diff --git a/media-video/handbrake/handbrake-1.3.3-r5.ebuild b/media-video/handbrake/handbrake-1.3.3-r5.ebuild
deleted file mode 100644
index a0f00a16d9e2..000000000000
--- a/media-video/handbrake/handbrake-1.3.3-r5.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="https://handbrake.fr/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	app-arch/xz-utils
-	media-libs/speex
-	dev-libs/jansson:=
-	dev-libs/libxml2
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0:=
-	>=media-libs/dav1d-0.5.1:=
-	media-libs/libdvdnav
-	media-libs/libdvdread:=
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	>=media-libs/libvpx-1.8:=
-	nvenc? ( media-libs/nv-codec-headers )
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-		media-plugins/gst-plugins-gdkpixbuf:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-libs/libgudev:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac:= )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/nasm
-	dev-util/intltool"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${P}-remove-faac-dependency.patch"
-
-	# Use whichever python is set by portage
-	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
-
-	# Fix x265 linkage... again again #730034
-	"${FILESDIR}/${PN}-1.3.3-x265-link.patch"
-
-	# Fix missing audio stream when using MPEG-4 avformat with ffmpeg-4.4 #791220
-	"${FILESDIR}/${PN}-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch"
-)
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	# Libav was replaced in 1.2 with ffmpeg by default
-	# but I've elected to not make people change their use flags for AAC
-	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		--disable-flatpak \
-		--disable-gtk4 \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(usex !gtk --disable-gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable numa) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
-	einfo "do not use the bundled (and often patched) upstream libraries."
-	einfo ""
-	einfo "Please do not raise bugs with upstream because of these ebuilds,"
-	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-	if use gtk ; then
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.3.3-r4.ebuild b/media-video/handbrake/handbrake-1.5.1.ebuild
index 9c12dd2d8f8f..e8bee8b1fe39 100644
--- a/media-video/handbrake/handbrake-1.3.3-r4.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools gnome2-utils python-any-r1 xdg-utils
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-any-r1 toolchain-funcs xdg
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
@@ -17,7 +18,7 @@ else
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="https://handbrake.fr/"
+HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,25 +28,27 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
 
 RDEPEND="
 	app-arch/xz-utils
-	media-libs/speex
 	dev-libs/jansson:=
 	dev-libs/libxml2
 	media-libs/a52dec
+	>=media-libs/dav1d-0.5.1:=
+	media-libs/libjpeg-turbo:=
 	media-libs/libass:=
 	>=media-libs/libbluray-1.0:=
-	>=media-libs/dav1d-0.5.1:=
 	media-libs/libdvdnav
 	media-libs/libdvdread:=
 	media-libs/libsamplerate
 	media-libs/libtheora
 	media-libs/libvorbis
 	>=media-libs/libvpx-1.8:=
-	nvenc? ( media-libs/nv-codec-headers )
 	media-libs/opus
+	media-libs/speex
 	media-libs/x264:=
+	media-libs/zimg
 	media-sound/lame
-	sys-libs/zlib
 	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+	sys-libs/zlib
+	fdk? ( media-libs/fdk-aac:= )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -67,13 +70,15 @@ RDEPEND="
 		x11-libs/libnotify
 		x11-libs/pango
 	)
-	fdk? ( media-libs/fdk-aac:= )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
+	nvenc? ( media-libs/nv-codec-headers )
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+"
+DEPEND="
 	${PYTHON_DEPS}
+	${RDEPEND}
 	dev-lang/nasm
-	dev-util/intltool"
+	dev-util/intltool
+"
 
 PATCHES=(
 	# Remove libdvdnav duplication and call it on the original instead.
@@ -81,7 +86,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
 
 	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${P}-remove-faac-dependency.patch"
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Detect system tools - bug 738110
+	"${FILESDIR}/${PN}-9999-system-tools.patch"
 
 	# Use whichever python is set by portage
 	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
@@ -98,45 +106,41 @@ src_prepare() {
 
 	default
 
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	cd "${S}/gtk" || die
 	eautoreconf
 }
 
 src_configure() {
+	tc-export AR RANLIB STRIP
+
 	# Libav was replaced in 1.2 with ffmpeg by default
 	# but I've elected to not make people change their use flags for AAC
 	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		--disable-flatpak \
-		--disable-gtk4 \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(usex !gtk --disable-gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable numa) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
+	local myconfargs=(
+		--force
+		--verbose
+		--prefix="${EPREFIX}/usr"
+		--disable-gtk-update-checks
+		--disable-flatpak
+		--disable-gtk4
+		$(use_enable libav-aac ffmpeg-aac)
+		$(use_enable fdk fdk-aac)
+		$(usex !gtk --disable-gtk)
+		$(usex !gstreamer --disable-gst)
+		$(use_enable numa)
+		$(use_enable nvenc)
+		$(use_enable x265)
+	)
+
+	./configure "${myconfargs[@]}" || die "Configure failed."
 }
 
 src_compile() {
 	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
 }
 
 src_install() {
 	emake -C build DESTDIR="${D}" install
-
 	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
 }
 
@@ -152,11 +156,5 @@ pkg_postinst() {
 		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
 	fi
 
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }