[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/

[Mike Frysinger]

commit:     ed2a9f5a33a677590473ecc498dcf97ed7ead8fe
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 13:19:30 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 13:19:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2a9f5a

media-tv/kodi: run epatch_user before regenerating files #562092

 media-tv/kodi/kodi-14.1.ebuild | 4 ++--
 media-tv/kodi/kodi-15.1.ebuild | 3 +--
 media-tv/kodi/kodi-9999.ebuild | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index 7740ec6..7ad19f1 100644
--- a/media-tv/kodi/kodi-14.1.ebuild
+++ b/media-tv/kodi/kodi-14.1.ebuild
@@ -154,6 +154,8 @@ src_prepare() {
        epatch "${FILESDIR}"/${P}-no-arm-flags.patch #400617
        epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36
        epatch "${FILESDIR}"/${P}-gcc-5.patch #557300
+       epatch_user #293109
+
        # The mythtv patch touches configure.ac, so force a regen
        rm -f configure
 
@@ -185,8 +187,6 @@ src_prepare() {
                -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
                xbmc/linux/*.cpp || die
 
-       epatch_user #293109
-
        # Tweak autotool timestamps to avoid regeneration
        find . -type f -exec touch -r configure {} +
 }

diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-15.1.ebuild
index 912c5e5..198691d 100644
--- a/media-tv/kodi/kodi-15.1.ebuild
+++ b/media-tv/kodi/kodi-15.1.ebuild
@@ -155,6 +155,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
        epatch "${FILESDIR}"/${P}-texturepacker.patch
        epatch "${FILESDIR}"/${P}-gcc-5.patch #544760
+       epatch_user #293109
 
        # some dirs ship generated autotools, some dont
        multijob_init
@@ -189,8 +190,6 @@ src_prepare() {
                -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
                xbmc/linux/*.cpp || die
 
-       epatch_user #293109
-
        # Tweak autotool timestamps to avoid regeneration
        find . -type f -exec touch -r configure {} +
 }

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 165dacb..bf98528 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -155,6 +155,7 @@ src_unpack() {
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
        epatch "${FILESDIR}"/${PN}-9999-texturepacker.patch
+       epatch_user #293109
 
        # some dirs ship generated autotools, some dont
        multijob_init
@@ -189,8 +190,6 @@ src_prepare() {
                -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
                xbmc/linux/*.cpp || die
 
-       epatch_user #293109
-
        # Tweak autotool timestamps to avoid regeneration
        find . -type f -exec touch -r configure {} +
 }