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

[Ian Whyman]

commit:     7d9e2ecbba97b1e1db4b7238c2c1d106a6eb0388
Author:     Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sat May  5 13:29:49 2018 +0000
Commit:     Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sat May  5 13:30:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9e2ecb

media-video/handbrake: Bump ffmpeg/libav deps.

Update live ebuild with changes from 1.1.0.

Closes: https://bugs.gentoo.org/653932
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../{handbrake-1.1.0.ebuild => handbrake-1.1.0-r1.ebuild}  |  4 ++--
 media-video/handbrake/handbrake-9999.ebuild                | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.1.0.ebuild 
b/media-video/handbrake/handbrake-1.1.0-r1.ebuild
similarity index 97%
rename from media-video/handbrake/handbrake-1.1.0.ebuild
rename to media-video/handbrake/handbrake-1.1.0-r1.ebuild
index e5423a88492..cd52cd8ded2 100644
--- a/media-video/handbrake/handbrake-1.1.0.ebuild
+++ b/media-video/handbrake/handbrake-1.1.0-r1.ebuild
@@ -42,8 +42,8 @@ RDEPEND="
        media-libs/x264:=
        media-sound/lame
        sys-libs/zlib
-       libav? ( >=media-video/libav-10.1:0=[fdk?] )
-       !libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
+       libav? ( >=media-video/libav-12.2:0=[fdk?] )
+       !libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] )
        gstreamer? (
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0

diff --git a/media-video/handbrake/handbrake-9999.ebuild 
b/media-video/handbrake/handbrake-9999.ebuild
index 0ce63641f6e..2ba4dd148d2 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils gnome2-utils python-any-r1
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
        KEYWORDS=""
 else
        MY_P="HandBrake-${PV}"
-       SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> 
${P}.tar.bz2"
+       SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> 
${P}.tar.bz2"
        S="${WORKDIR}/${MY_P}"
        KEYWORDS="~amd64 ~x86"
 fi
@@ -42,8 +42,8 @@ RDEPEND="
        media-libs/x264:=
        media-sound/lame
        sys-libs/zlib
-       libav? ( >=media-video/libav-10.1:0=[fdk?] )
-       !libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
+       libav? ( >=media-video/libav-12.3:0=[fdk?] )
+       !libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] )
        gstreamer? (
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0
@@ -99,7 +99,7 @@ src_prepare() {
        default
 
        # Get rid of libav specific code when using ffmpeg
-       use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+       use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch"
 
        cd "${S}/gtk"
        # Don't run autogen.sh.
@@ -145,6 +145,7 @@ pkg_postinst() {
        fi
 
        gnome2_icon_cache_update
+       xdg_desktop_database_update
 }
 
 pkg_preinst() {
@@ -153,4 +154,5 @@ pkg_preinst() {
 
 pkg_postrm() {
        gnome2_icon_cache_update
+       xdg_desktop_database_update
 }