commit: 917787fc90ea1dd54599572d33848dc5b8358d3e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 25 19:40:35 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 25 19:41:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917787fc
media-libs/x264: EAPI 6, obsolete blocker, DOCS array Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-libs/x264/x264-0.0.20170701.ebuild | 14 ++++++-------- media-libs/x264/x264-9999.ebuild | 12 +++++------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/media-libs/x264/x264-0.0.20170701.ebuild b/media-libs/x264/x264-0.0.20170701.ebuild index 5b43cae05d1..1364b9d5060 100644 --- a/media-libs/x264/x264-0.0.20170701.ebuild +++ b/media-libs/x264/x264-0.0.20170701.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal +inherit flag-o-matic multilib-minimal toolchain-funcs DESCRIPTION="A free library for encoding X264/AVC streams" HOMEPAGE="https://www.videolan.org/developers/x264.html"; if [[ ${PV} == 9999 ]]; then - inherit git-2 - EGIT_REPO_URI="https://git.videolan.org/x264.git"; + inherit git-r3 + EGIT_REPO_URI="https://git.videolan.org/git/x264.git"; else inherit versionator MY_P="x264-snapshot-$(get_version_component_range 3)-2245" @@ -28,11 +28,9 @@ ASM_DEP=">=dev-lang/nasm-2.13" DEPEND="abi_x86_32? ( ${ASM_DEP} ) abi_x86_64? ( ${ASM_DEP} ) opencl? ( dev-lang/perl )" -RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )" -DOCS="AUTHORS doc/*.txt" +DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) multilib_src_configure() { tc-export CC diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index 388a9eef9f2..be9802ee557 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal +inherit flag-o-matic multilib-minimal toolchain-funcs DESCRIPTION="A free library for encoding X264/AVC streams" HOMEPAGE="https://www.videolan.org/developers/x264.html"; @@ -28,11 +28,9 @@ ASM_DEP=">=dev-lang/nasm-2.13" DEPEND="abi_x86_32? ( ${ASM_DEP} ) abi_x86_64? ( ${ASM_DEP} ) opencl? ( dev-lang/perl )" -RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )" -DOCS="AUTHORS doc/*.txt" +DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) multilib_src_configure() { tc-export CC
