[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

[Sam James]

commit:     d1524eec1755d46264c01249b925ee981b1dd1b1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 23:13:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 31 23:19:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1524eec

media-video/handbrake: sync live ebuild

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/handbrake/handbrake-1.3.3-r1.ebuild | 10 +++-------
 media-video/handbrake/handbrake-9999.ebuild     | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
index 73db57b803d..01c79b64512 100644
--- a/media-video/handbrake/handbrake-1.3.3-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
@@ -19,8 +19,8 @@ fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
 HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
@@ -69,16 +69,12 @@ RDEPEND="
 		x11-libs/pango
 	)
 	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
-	"
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-lang/nasm
-	dev-util/cmake
-	dev-util/intltool
-	dev-util/meson
-	sys-devel/automake"
+	dev-util/intltool"
 
 PATCHES=(
 	# Remove libdvdnav duplication and call it on the original instead.

diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 115170471f2..d90a6c15069 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -12,15 +12,15 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	MY_P="HandBrake-${PV}"
-	SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
+	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="http://handbrake.fr/"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
@@ -46,7 +46,7 @@ RDEPEND="
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	>=media-video/ffmpeg-4.2.1:0=[fdk?]
+	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -74,9 +74,8 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
+	dev-lang/nasm
+	dev-util/intltool"
 
 PATCHES=(
 	# Remove libdvdnav duplication and call it on the original instead.
@@ -88,6 +87,9 @@ PATCHES=(
 
 	# 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"
 )
 
 src_prepare() {
@@ -152,15 +154,11 @@ pkg_postinst() {
 		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
 	fi
 
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }