From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1582432-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E5015158015
for <garchives@archives.gentoo.org>; Thu, 21 Dec 2023 14:54:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 130202BC013;
Thu, 21 Dec 2023 14:54:38 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id BBB062BC013
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Dec 2023 14:54:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0D2CD340BEF
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Dec 2023 14:54:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A59F09C4
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Dec 2023 14:54:35 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1703170469.2ecfe96d99aed2238535bd2ee6df24732febeebf.mattst88@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
X-VCS-Directories: x11-misc/xkeyboard-config/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 2ecfe96d99aed2238535bd2ee6df24732febeebf
X-VCS-Branch: master
Date: Thu, 21 Dec 2023 14:54:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b9bb8bde-4dd6-41a3-98f4-f2954adf0ab4
X-Archives-Hash: 3d5f895bcd101dfe935b289427e46ea3
commit: 2ecfe96d99aed2238535bd2ee6df24732febeebf
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Tue Dec 19 08:58:35 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 14:54:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ecfe96d
x11-misc/xkeyboard-config: restrict <pycountry-23.12.7
* 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 <AT> protonmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild | 12 +++++++-----
x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | 10 ++++++----
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild
index f921fd1f7cc2..f3922e76d870 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild
@@ -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() {
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 4456bf37dfdd..026837b87ed2 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -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() {