Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-portage/mgorny-dev-scripts/Manifest3
-rw-r--r--app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild29
-rw-r--r--app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild29
-rw-r--r--app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24-r1.ebuild33
-rw-r--r--dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild26
-rw-r--r--dev-python/pypy3/pypy3-7.3.9_p5-r2.ebuild (renamed from dev-python/pypy3/pypy3-7.3.9_p5-r1.ebuild)4
-rw-r--r--eclass/linux-info.eclass5
7 files changed, 13 insertions, 116 deletions
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index fc28e297af8b..5944a3a338e5 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,4 +1 @@
-DIST mgorny-dev-scripts-21.tar.gz 11674 BLAKE2B cb3c217df259a6ef48f8e11da8d42c3dcba6c50cbed7e9006d0a02520b0f4bd54a7ea330c680f8570a93d799accfd7f93f410e8fc085cd544fb9f09168a47f84 SHA512 be49f0f5392817cf881ec9bcbca78da525f8170b0f9babdfcc0f7c2b9fdd3a0bd31db332498e98c937b22b3b6a5b6325ec2f7150548847cbbdc915d589a99b06
-DIST mgorny-dev-scripts-22.tar.gz 11684 BLAKE2B 6a17ecec290d761df650d8607f246411d85e80e8511ef1073d671878544785c055dfc4e35bb9e8d937747eac731e4c18075dcbc95044fff3bfe3e8567ed9300b SHA512 597505fe6d27fb0f21308a4966714bc9161e976abe66ac5437d4705a161d960a4beeaa9d3dc36346e69221b1dc912a5957a6ad537ae0f7b4b96f33a419d6933b
-DIST mgorny-dev-scripts-24.tar.gz 11691 BLAKE2B bfc81908b4769a111eee3ad12c931f8d3c1b60715d6b9828ff091da19a7df8258878105cfb402f7b1f4760f27e746db5e65e452bc5a727366cdd51be442e5bd2 SHA512 f2fd31f1a8c9de6b7310c7cc24bf861836948a9d88adb389ebdde9fc0d365efafae908f7fdba556a83c6de607587c55a90fd96116c48e78d39900e8b6dfb15b7
DIST mgorny-dev-scripts-25.tar.gz 11688 BLAKE2B 224234844956e0adfad6d731e3693d5741405b41f454f570fd431cc126520b35ed3d34beb12368ac5977b76138c88e7843b92c1d89e35a2bad766342ead5a7ec SHA512 b6423b080e6931aef8ddd7f9dd8a10ba4939793b9837b218742dc9c4357448b161cba8d9798af510db13cccc5912080e2a05f8f2c9173f828907bdce6fc7141e
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
deleted file mode 100644
index 56f187c76de9..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-21.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts"
-SRC_URI="https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-RDEPEND="
- app-portage/gentoolkit
- dev-perl/URI
- dev-util/pkgcheck
- dev-vcs/git
- net-misc/wget
- sys-apps/portage
- x11-misc/xdg-utils
- !dev-util/pkgdiff
-"
-
-src_install() {
- dodoc README.rst
- rm -f COPYING README.rst || die
- dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
deleted file mode 100644
index 09ed49fb3813..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-22.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts"
-SRC_URI="https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
- app-portage/gentoolkit
- dev-perl/URI
- dev-util/pkgcheck
- dev-vcs/git
- net-misc/wget
- sys-apps/portage
- x11-misc/xdg-utils
- !dev-util/pkgdiff
-"
-
-src_install() {
- dodoc README.rst
- rm -f COPYING README.rst || die
- dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24-r1.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24-r1.ebuild
deleted file mode 100644
index 2838be105fd2..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
- https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
- -> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
- app-portage/gentoolkit
- app-portage/portage-utils
- dev-perl/URI
- dev-util/pkgcheck
- dev-vcs/git
- net-misc/wget
- sys-apps/portage
- x11-misc/xdg-utils
- !dev-util/pkgdiff
-"
-
-src_install() {
- dodoc README.rst
- rm -f COPYING README.rst || die
- dobin *
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild
index 5da06e316e7b..72dfa58bd8fd 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild
@@ -22,14 +22,14 @@ S="${WORKDIR}/${MY_P}-src"
LICENSE="MIT"
SLOT="3.9-${PYPY_PV}"
KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
RDEPEND="
- >=sys-libs/zlib-1.1.3:0=
+ app-arch/bzip2:0=
+ dev-libs/expat:0=
dev-libs/libffi:0=
+ >=sys-libs/zlib-1.1.3:0=
virtual/libintl:0=
- dev-libs/expat:0=
- bzip2? ( app-arch/bzip2:0= )
ncurses? ( sys-libs/ncurses:0= )
!dev-python/pypy3-exe-bin:${SLOT}
"
@@ -120,24 +120,10 @@ src_configure() {
${jit_backend}
pypy/goal/targetpypystandalone
+ --withmod-bz2
+ $(usex ncurses --with{,out}mod-_minimal_curses)
)
- # Avoid linking against libraries disabled by use flags
- local opts=(
- bzip2:bz2
- ncurses:_minimal_curses
- )
-
- local opt
- for opt in "${opts[@]}"; do
- local flag=${opt%:*}
- local mod=${opt#*:}
-
- args+=(
- $(usex ${flag} --withmod --withoutmod)-${mod}
- )
- done
-
local interp=( "${EPYTHON}" )
if use low-memory; then
interp=( env PYPY_GC_MAX_DELTA=200MB
diff --git a/dev-python/pypy3/pypy3-7.3.9_p5-r1.ebuild b/dev-python/pypy3/pypy3-7.3.9_p5-r2.ebuild
index c205718e71f2..9da05e3e37f9 100644
--- a/dev-python/pypy3/pypy3-7.3.9_p5-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.9_p5-r2.ebuild
@@ -26,14 +26,14 @@ LICENSE="MIT"
# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
SLOT="0/pypy39-pp73-336"
KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +ensurepip gdbm +jit ncurses sqlite test tk"
+IUSE="+ensurepip gdbm +jit ncurses sqlite test tk"
# many tests are failing upstream
# see https://buildbot.pypy.org/summary?branch=py3.9
RESTRICT="test"
RDEPEND="
|| (
- >=dev-python/pypy3-exe-${PYPY_PV}_p3:3.9-${PYPY_PV}[bzip2?,ncurses?]
+ >=dev-python/pypy3-exe-${PYPY_PV}_p3:3.9-${PYPY_PV}[bzip2(+),ncurses?]
>=dev-python/pypy3-exe-bin-${PYPY_PV}_p3:3.9-${PYPY_PV}
)
dev-lang/python-exec[python_targets_pypy3(-)]
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 82bc7fe53950..fc125b0d7519 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -374,6 +374,7 @@ require_configured_kernel() {
# If linux_config_exists returns false, the results of this are UNDEFINED. You
# MUST call linux_config_exists first.
linux_chkconfig_present() {
+ [[ -n ${SKIP_KERNEL_CHECK} ]] && return
linux_config_qa_check linux_chkconfig_present
[[ $(getfilevar_noexec "CONFIG_$1" "$(linux_config_path)") == [my] ]]
}
@@ -386,6 +387,7 @@ linux_chkconfig_present() {
# If linux_config_exists returns false, the results of this are UNDEFINED. You
# MUST call linux_config_exists first.
linux_chkconfig_module() {
+ [[ -n ${SKIP_KERNEL_CHECK} ]] && return
linux_config_qa_check linux_chkconfig_module
[[ $(getfilevar_noexec "CONFIG_$1" "$(linux_config_path)") == m ]]
}
@@ -398,6 +400,7 @@ linux_chkconfig_module() {
# If linux_config_exists returns false, the results of this are UNDEFINED. You
# MUST call linux_config_exists first.
linux_chkconfig_builtin() {
+ [[ -n ${SKIP_KERNEL_CHECK} ]] && return
linux_config_qa_check linux_chkconfig_builtin
[[ $(getfilevar_noexec "CONFIG_$1" "$(linux_config_path)") == y ]]
}
@@ -410,6 +413,7 @@ linux_chkconfig_builtin() {
# If linux_config_exists returns false, the results of this are UNDEFINED. You
# MUST call linux_config_exists first.
linux_chkconfig_string() {
+ [[ -n ${SKIP_KERNEL_CHECK} ]] && return
linux_config_qa_check linux_chkconfig_string
getfilevar_noexec "CONFIG_$1" "$(linux_config_path)"
}
@@ -472,6 +476,7 @@ kernel_is() {
# - make is not present
# - corruption exists in the kernel makefile
get_makefile_extract_function() {
+ [[ -n ${SKIP_KERNEL_CHECK} ]] && return
local a='' b='' mkfunc='getfilevar'
a="$(getfilevar VERSION ${KERNEL_MAKEFILE})"
b="$(getfilevar_noexec VERSION ${KERNEL_MAKEFILE})"