commit:     a5050e185f4c3c35ce0ff57d0a34d46a95cfd5e8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 10 22:59:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 10 22:59:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5050e18

x11-libs/libva: revbump for dropping wayland-scanner multilib

While we could avoid doing this, it avoids the need for backtracking on 
upgrades.

Closes: https://bugs.gentoo.org/828799
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/libva/{libva-9999.ebuild => libva-2.13.0-r2.ebuild} | 6 +++---
 x11-libs/libva/libva-9999.ebuild                             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-libs/libva/libva-9999.ebuild 
b/x11-libs/libva/libva-2.13.0-r2.ebuild
similarity index 90%
copy from x11-libs/libva/libva-9999.ebuild
copy to x11-libs/libva/libva-2.13.0-r2.ebuild
index a5e8ebf286e2..fb840c456a59 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-2.13.0-r2.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999 ]] ; then
        EGIT_BRANCH=master
        EGIT_REPO_URI="https://github.com/intel/libva";
 else
-       
SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2";
+       # 
SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2";
        # The upstream provides periodically tarball with pre-built 'configure'.
        # To simplify updates, portage use tarballs without pre-build 
'configure'
        # which are always available.
-       # SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+       SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -30,7 +30,6 @@ RDEPEND="
        opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
        wayland? (
                >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
-               dev-util/wayland-scanner[${MULTILIB_USEDEP}]
        )
        X? (
                >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -40,6 +39,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+       dev-util/wayland-scanner
        virtual/pkgconfig
 "
 PDEPEND="utils? ( media-video/libva-utils )"

diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index a5e8ebf286e2..8e84bcf7bb12 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
        opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
        wayland? (
                >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
-               dev-util/wayland-scanner[${MULTILIB_USEDEP}]
        )
        X? (
                >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -40,6 +39,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+       dev-util/wayland-scanner
        virtual/pkgconfig
 "
 PDEPEND="utils? ( media-video/libva-utils )"

Reply via email to