gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-08 18:27:07 -08:00
Code Issues Projects Releases Wiki Activity

x11-misc/xkeyboard-config: restrict <pycountry-23.12.7

Browse Source 
* Fix usage of python_has_version.
* Unkeyword ~s390 again.

Bug: https://bugs.gentoo.org/917501
Closes: https://bugs.gentoo.org/920278
Closes: https://github.com/gentoo/gentoo/pull/34367
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Alfred Wingate
2023-12-21 09:54:29 -05:00
committed by Matt Turner
parent b3b60ae6d3
commit 2ecfe96d99
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild
+7 -5
View File
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
LICENSE="MIT"
@@ -22,6 +22,7 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
# <dev-python/pycountry-23.12.7 bug #920278
BDEPEND="
dev-lang/perl
dev-libs/libxslt
@@ -31,7 +32,7 @@ BDEPEND="
x11-apps/xkbcomp
x11-libs/libxkbcommon
$(python_gen_any_dep '
dev-python/pycountry[${PYTHON_USEDEP}]
<dev-python/pycountry-23.12.7[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
')
@@ -40,9 +41,10 @@ BDEPEND="
python_check_deps() {
use test || return 0
python_has_version "dev-python/pycountry[${PYTHON_USEDEP}]"
python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
python_has_version \
"<dev-python/pycountry-23.12.7[${PYTHON_USEDEP}]" \
"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
"dev-python/pytest[${PYTHON_USEDEP}]"
}
pkg_setup() {
x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+6 -4
View File
@@ -22,6 +22,7 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
# <dev-python/pycountry-23.12.7 bug #920278
BDEPEND="
dev-lang/perl
dev-libs/libxslt
@@ -31,7 +32,7 @@ BDEPEND="
x11-apps/xkbcomp
x11-libs/libxkbcommon
$(python_gen_any_dep '
dev-python/pycountry[${PYTHON_USEDEP}]
<dev-python/pycountry-23.12.7[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
')
@@ -40,9 +41,10 @@ BDEPEND="
python_check_deps() {
use test || return 0
python_has_version "dev-python/pycountry[${PYTHON_USEDEP}]"
python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
python_has_version \
"<dev-python/pycountry-23.12.7[${PYTHON_USEDEP}]" \
"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
"dev-python/pytest[${PYTHON_USEDEP}]"
}
pkg_setup() {