| 1 |
commit: 917787fc90ea1dd54599572d33848dc5b8358d3e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 25 19:40:35 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 25 19:41:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917787fc |
| 7 |
|
| 8 |
media-libs/x264: EAPI 6, obsolete blocker, DOCS array |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
media-libs/x264/x264-0.0.20170701.ebuild | 14 ++++++-------- |
| 13 |
media-libs/x264/x264-9999.ebuild | 12 +++++------- |
| 14 |
2 files changed, 11 insertions(+), 15 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/x264/x264-0.0.20170701.ebuild b/media-libs/x264/x264-0.0.20170701.ebuild |
| 17 |
index 5b43cae05d1..1364b9d5060 100644 |
| 18 |
--- a/media-libs/x264/x264-0.0.20170701.ebuild |
| 19 |
+++ b/media-libs/x264/x264-0.0.20170701.ebuild |
| 20 |
@@ -1,15 +1,15 @@ |
| 21 |
# Copyright 1999-2018 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=5 |
| 25 |
+EAPI=6 |
| 26 |
|
| 27 |
-inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal |
| 28 |
+inherit flag-o-matic multilib-minimal toolchain-funcs |
| 29 |
|
| 30 |
DESCRIPTION="A free library for encoding X264/AVC streams" |
| 31 |
HOMEPAGE="https://www.videolan.org/developers/x264.html" |
| 32 |
if [[ ${PV} == 9999 ]]; then |
| 33 |
- inherit git-2 |
| 34 |
- EGIT_REPO_URI="https://git.videolan.org/x264.git" |
| 35 |
+ inherit git-r3 |
| 36 |
+ EGIT_REPO_URI="https://git.videolan.org/git/x264.git" |
| 37 |
else |
| 38 |
inherit versionator |
| 39 |
MY_P="x264-snapshot-$(get_version_component_range 3)-2245" |
| 40 |
@@ -28,11 +28,9 @@ ASM_DEP=">=dev-lang/nasm-2.13" |
| 41 |
DEPEND="abi_x86_32? ( ${ASM_DEP} ) |
| 42 |
abi_x86_64? ( ${ASM_DEP} ) |
| 43 |
opencl? ( dev-lang/perl )" |
| 44 |
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] ) |
| 45 |
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 |
| 46 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" |
| 47 |
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )" |
| 48 |
|
| 49 |
-DOCS="AUTHORS doc/*.txt" |
| 50 |
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) |
| 51 |
|
| 52 |
multilib_src_configure() { |
| 53 |
tc-export CC |
| 54 |
|
| 55 |
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild |
| 56 |
index 388a9eef9f2..be9802ee557 100644 |
| 57 |
--- a/media-libs/x264/x264-9999.ebuild |
| 58 |
+++ b/media-libs/x264/x264-9999.ebuild |
| 59 |
@@ -1,9 +1,9 @@ |
| 60 |
-# Copyright 1999-2017 Gentoo Foundation |
| 61 |
+# Copyright 1999-2018 Gentoo Foundation |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
-EAPI=5 |
| 65 |
+EAPI=6 |
| 66 |
|
| 67 |
-inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal |
| 68 |
+inherit flag-o-matic multilib-minimal toolchain-funcs |
| 69 |
|
| 70 |
DESCRIPTION="A free library for encoding X264/AVC streams" |
| 71 |
HOMEPAGE="https://www.videolan.org/developers/x264.html" |
| 72 |
@@ -28,11 +28,9 @@ ASM_DEP=">=dev-lang/nasm-2.13" |
| 73 |
DEPEND="abi_x86_32? ( ${ASM_DEP} ) |
| 74 |
abi_x86_64? ( ${ASM_DEP} ) |
| 75 |
opencl? ( dev-lang/perl )" |
| 76 |
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] ) |
| 77 |
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 |
| 78 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" |
| 79 |
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )" |
| 80 |
|
| 81 |
-DOCS="AUTHORS doc/*.txt" |
| 82 |
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) |
| 83 |
|
| 84 |
multilib_src_configure() { |
| 85 |
tc-export CC |
Archives