gentoo resync : 15.12.2019

4 files changed, 74 insertions, 10 deletions

diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 4399ebd7242b..1c0f0a583504 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,6 @@
 DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-EBUILD libepoxy-1.5.3-r1.ebuild 1289 BLAKE2B 9e159119dbebfdd182be34075c3d29c0aa1b827e6389d752a13d245ac56b187b9ce18ba442ee4e71f3f006dcba395c8776a4bd58769a70140a4bb22116b769ea SHA512 cc7cf93c2e54150e45ec68273b5ffca52153be81431ca25b1f0cfada0efc5393973ed4b6370130542ffe0ffcd7686455bcf29c93ac7a2a71eb7d9039509745df
-EBUILD libepoxy-9999.ebuild 1294 BLAKE2B d693bd46618793f86ac48d05ac49ac87716b987713c8ed0ff99fb7f53e9e2b11af343e8ec5a56671900d9a6b3a5fe6886ea5c5de1e854371dcb0f2ed86e2b030 SHA512 18c375fc8b8060c3f829095bb85a861f26bb90a4ef10cf43bc22ee70026078f878de331ec7a787bcd4c815049e60fc19bbee2eb7a9fb39fd8e4be1c83cb6bc7a
+DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
+EBUILD libepoxy-1.5.3-r1.ebuild 1316 BLAKE2B 166f9905aa1e35e8568679c1a6e8dd74341d26257a31035bb429e4075a654e05eb3bfecaeddda7e14edc978677b123af373fb29904f9d8fed5cc5c271495c5a2 SHA512 aa6a8cecec9fd18c5bed126105eb2c9bafa49ad2c3d750e42f81997de82f5d6ef3f528924a0fc4bf05b3fc09fedc4f90bca5ce6399f6e663411bff3f660d8431
+EBUILD libepoxy-1.5.4.ebuild 1295 BLAKE2B 471776c6d120620538d3c4f32b87893ca8c624f3c7bfd46e1dd5cec062dcf34f8cab9ad8282544c11968704037ab43ca7a5ecd055d5cfc5b236602e8eb734079 SHA512 b286117484a4d075b7b2c0ec2945ebb6fafb82933685f0757ef8f3e4ac89761ec1541bb9b270b22aec73fd792be90baa3560a3dbcc5f8d6a466334969b20966f
+EBUILD libepoxy-9999.ebuild 1295 BLAKE2B 471776c6d120620538d3c4f32b87893ca8c624f3c7bfd46e1dd5cec062dcf34f8cab9ad8282544c11968704037ab43ca7a5ecd055d5cfc5b236602e8eb734079 SHA512 b286117484a4d075b7b2c0ec2945ebb6fafb82933685f0757ef8f3e4ac89761ec1541bb9b270b22aec73fd792be90baa3560a3dbcc5f8d6a466334969b20966f
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
index ac36a7ad49c6..708bfd86c630 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 IUSE="+egl test +X"
+RESTRICT="!test? ( test )"
 
 RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
 DEPEND="${PYTHON_DEPS}
diff --git a/media-libs/libepoxy/libepoxy-1.5.4.ebuild b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
new file mode 100644
index 000000000000..667228151062
--- /dev/null
+++ b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_REQ_USE='xml(+)'
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
+
+DESCRIPTION="Epoxy is a library for handling OpenGL function pointer management for you"
+HOMEPAGE="https://github.com/anholt/libepoxy"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+IUSE="+egl test +X"
+
+RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
+DEPEND="X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Degl=$(usex egl)
+		-Dglx=$(usex X)
+		$(meson_use X x11)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 6c2f3fa8e696..667228151062 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
 
@@ -18,19 +18,19 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="MIT"
 SLOT="0"
+RESTRICT="!test? ( test )"
 IUSE="+egl test +X"
 
 RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	>=dev-util/meson-0.47.0
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+DEPEND="X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 
 src_unpack() {
@@ -42,8 +42,8 @@ multilib_src_configure() {
 	local emesonargs=(
 		-Degl=$(usex egl)
 		-Dglx=$(usex X)
-		-Dx11=$(usex X true false)
-		-Dtests=$(usex test true false)
+		$(meson_use X x11)
+		$(meson_use test tests)
 	)
 	meson_src_configure
 }