media-libs/libde265: Add missing MULTILIB_USEDEP, fix USE=qt5

Qt5 is not multilib enabled, so disable if !multilib_is_native_abi

Bug: https://bugs.gentoo.org/656772
Package-Manager: Portage-2.3.49, Repoman-2.3.10

diff --git a/media-libs/libde265/libde265-1.0.3.ebuild b/media-libs/libde265/libde265-1.0.3.ebuild
index c9de64e6a520e7c775ce00325ed44f34932a0424..90112fb2fd03bdb76782cf75c4f30278ecbf38d0 100644 (file)
--- a/media-libs/libde265/libde265-1.0.3.ebuild
+++ b/media-libs/libde265/libde265-1.0.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit autotools multilib-minimal
 
@@ -13,8 +13,6 @@ if [[ ${PV} == "9999" ]] ; then
 else
        SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
-
-       PATCHES+=( "${FILESDIR}"/${P}-use-new-FFMPEG-enum-names.patch )
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
@@ -23,11 +21,11 @@ HOMEPAGE="https://github.com/strukturag/libde265"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug qt5 static-libs cpu_flags_x86_sse"
+IUSE="cpu_flags_x86_sse debug qt5 static-libs"
 
 DEPEND="
-       media-libs/libsdl
-       virtual/ffmpeg
+       media-libs/libsdl[${MULTILIB_USEDEP}]
+       virtual/ffmpeg[${MULTILIB_USEDEP}]
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtgui:5
@@ -36,6 +34,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES+=( "${FILESDIR}"/${P}-use-new-FFMPEG-enum-names.patch )
+
 src_prepare() {
        default
 
@@ -52,10 +52,18 @@ multilib_src_configure() {
                $(use_enable debug log-info)
                $(use_enable debug log-debug)
                $(use_enable debug log-trace)
-               $(use_enable qt5 dec265)
-               $(use_enable qt5 sherlock265)
                --enable-log-error
        )
+
+       if ! multilib_is_native_abi; then
+               myeconfargs+=( --disable-dec265 --disable-sherlock265 )
+       else
+               myeconfargs+=(
+                       $(use_enable qt5 dec265)
+                       $(use_enable qt5 sherlock265)
+               )
+       fi
+
        econf "${myeconfargs[@]}"
 }
 

diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild
index 271e443495b1969a1a8b741eb5063e3733b603da..91cbdf94843c3b0bd4b7513d5099bf7bd93dbf87 100644 (file)
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit autotools multilib-minimal
 
@@ -21,11 +21,11 @@ HOMEPAGE="https://github.com/strukturag/libde265"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug qt5 static-libs cpu_flags_x86_sse"
+IUSE="cpu_flags_x86_sse debug qt5 static-libs"
 
 DEPEND="
-       media-libs/libsdl
-       virtual/ffmpeg
+       media-libs/libsdl[${MULTILIB_USEDEP}]
+       virtual/ffmpeg[${MULTILIB_USEDEP}]
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtgui:5
@@ -50,10 +50,18 @@ multilib_src_configure() {
                $(use_enable debug log-info)
                $(use_enable debug log-debug)
                $(use_enable debug log-trace)
-               $(use_enable qt5 dec265)
-               $(use_enable qt5 sherlock265)
                --enable-log-error
        )
+
+       if ! multilib_is_native_abi; then
+               myeconfargs+=( --disable-dec265 --disable-sherlock265 )
+       else
+               myeconfargs+=(
+                       $(use_enable qt5 dec265)
+                       $(use_enable qt5 sherlock265)
+               )
+       fi
+
        econf "${myeconfargs[@]}"
 }