gentoo resync : 29.12.2022

5 files changed, 29 insertions, 10 deletions

diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 34733dc4e0f2..751aca8d7265 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
+AUX libepoxy-1.5.10-use-opengl.pc-without-x.patch 590 BLAKE2B cef810cccd2133045a60bb5d6e812f048402f1ad65b3befaca34b14950df60b5b7fa732de09eec1a998782ecf846d6863432713b62a29ee6b6ed25b1c2e1cd77 SHA512 567e3f838e62fb607e3cb4f15a5694ffe2407f575acfc1198b15f042fdaef333a05cd3dda28204fad8224967da13c62d87d2ea073c38f1f239d9e0ac7d520dd7
 DIST libepoxy-1.5.10.tar.gz 332078 BLAKE2B d56b45a8fc38901fdb23c50b569a667fce8ca289103a8d7ca19f96a76c75d3c2ff9d6959ed2ed47bd64806add95dafe42dc85dfc5bc60af14b5500b70070e008 SHA512 6786f31c6e2865e68a90eb912900a86bf56fd3df4d78a477356886ac3b6ef52ac887b9c7a77aa027525f868ae9e88b12e5927ba56069c2e115acd631fca3abee
-DIST libepoxy-1.5.9.tar.gz 331982 BLAKE2B 2bac6dae7fa2fcc70c1a5cacb1e6b6d21aaf65a65792d3c60eb0745acc4967092136aad1fbba6009a8c8e9bb1091a5d0a38fca05e63be2b9141d9c7e3042b426 SHA512 2b7c269063dc1c156c1a2a525e27a0a323baaa7fa4ac091536e4cc5fc4c247efe9770d7979dbddb54deb14853008bb6f4d67fddd26d87cbd264eb1e6e65bc5a8
-EBUILD libepoxy-1.5.10.ebuild 1067 BLAKE2B 4d264a225cf22ea07db960c91693906ca46615073b3543a37e78e4972930f002566f6d48adf13f5eb4645e62be33eabf945d70ad9485d82b5027c5641cce1a34 SHA512 11fd739b8f79f6372ee1e7e3253e27ff14951e13924d653e423b1f66fd1e3d048a35b9d2fe185c06f1fe5513eda048358106d2686367f3dbbdc3d815d87e01a3
-EBUILD libepoxy-1.5.9-r1.ebuild 1063 BLAKE2B 1a71ee8959c3e61b63fa1b4ea10f24641559d9ab6a691ee0f238d7a917b5c62e996bd84a0b82bd81532c57a48a8342940512f9693cf404e3c05dd1278239b495 SHA512 31503d253f341f102425516acab418eff73b58975e312a20624659657b85727226e58c7946ce2ce9c74054bb2aa8bb4943b8a9cdf02b9c420755bf495ad138a1
-EBUILD libepoxy-9999.ebuild 1071 BLAKE2B 880dc225465d58b7cd81322253bcc9b04541e2fb48570fd1f0b8d5228c026cc938e602df97b21413360a0f432628f9bc64c2a44959f2a0fd74c3139afe96cf1c SHA512 e9cef595b5fffe659e990b64b323b62cf1fc36f7755ce7774aa813122f3ad86512cbd1c75eb871424233fa84cef320c9791bd1a3574e556e9c9bafea265472f3
+EBUILD libepoxy-1.5.10-r1.ebuild 1144 BLAKE2B 0b703da689f81eb822d90fc5d1e63f59101270890699cb092253d81960b43c6f0cde1227585738b2c63885cac34a58b95a0a04ded2183f193a1159df1617aa8e SHA512 3fc05fd42d2918abdc782c16367f2d6b7cb7a5884b66a6d93201a9e79742b78abda4bfe4bf5345e1265f0b6f1d5087430b0fc673fe54c44d2a3099f504385220
+EBUILD libepoxy-1.5.10.ebuild 1063 BLAKE2B e2cac5cdf0595fd42a33dedf9a04863839187903a36cfb2ea4c414ff0b656b90e73f73db5efcf0029dab2f71cc5f1c000ed75a712bc456ffc42fec9dca0370b5 SHA512 0e4ef5e9214a06e07c3b623f8050a4c8d0617017a1196eb9734e4855a2352650f9496b1f91fcfaf25c317493952c2a5945ab52a27ab1f8ae0a0c01f112de9352
+EBUILD libepoxy-9999.ebuild 1144 BLAKE2B 0b703da689f81eb822d90fc5d1e63f59101270890699cb092253d81960b43c6f0cde1227585738b2c63885cac34a58b95a0a04ded2183f193a1159df1617aa8e SHA512 3fc05fd42d2918abdc782c16367f2d6b7cb7a5884b66a6d93201a9e79742b78abda4bfe4bf5345e1265f0b6f1d5087430b0fc673fe54c44d2a3099f504385220
 MISC metadata.xml 376 BLAKE2B 980a035e0ac8a5a3126ee27c032e8f14353ca5e7f2920769b74a23aa827a1110ff8f55a49a1f3072889ea1fed9f76f39bb3c2fddc6f6e2e736773c961ea4be3b SHA512 d1b9e9349929118e39201157b34e7955b32301ceaea877025fdf929d1039af536618eec5a9b0c638622c390201cd4d3106d981f884cf0c1c6469534fa65797af
diff --git a/media-libs/libepoxy/files/libepoxy-1.5.10-use-opengl.pc-without-x.patch b/media-libs/libepoxy/files/libepoxy-1.5.10-use-opengl.pc-without-x.patch
new file mode 100644
index 000000000000..0ed9c2f17681
--- /dev/null
+++ b/media-libs/libepoxy/files/libepoxy-1.5.10-use-opengl.pc-without-x.patch
@@ -0,0 +1,15 @@
+diff -Naur a/src/meson.build b/src/meson.build
+--- a/src/meson.build	2022-02-17 14:56:12.000000000 +0200
++++ b/src/meson.build	2022-06-17 15:17:20.388423154 +0300
+@@ -98,8 +98,10 @@
+ # not needed when building Epoxy; we do want to add them to the generated
+ # pkg-config file, for consumers of Epoxy
+ gl_reqs = []
+-if gl_dep.found() and gl_dep.type_name() == 'pkgconfig'
++if build_glx and gl_dep.found() and gl_dep.type_name() == 'pkgconfig'
+   gl_reqs += 'gl'
++else
++  gl_reqs += 'opengl'
+ endif
+ if build_egl and egl_dep.found() and egl_dep.type_name() == 'pkgconfig'
+   gl_reqs += 'egl'
diff --git a/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
index 486240d79bdb..bd71baf5f2e5 100644
--- a/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='xml(+)'
 inherit meson-multilib python-any-r1 virtualx
 
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/libepoxy-1.5.10-use-opengl.pc-without-x.patch )
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Degl=$(usex egl)
diff --git a/media-libs/libepoxy/libepoxy-1.5.10.ebuild b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
index 2f254719a4f5..c5d061d1589a 100644
--- a/media-libs/libepoxy/libepoxy-1.5.10.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 9af6e42c5e71..bd71baf5f2e5 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='xml(+)'
 inherit meson-multilib python-any-r1 virtualx
 
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/libepoxy-1.5.10-use-opengl.pc-without-x.patch )
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Degl=$(usex egl)