summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass')
-rw-r--r--eclass/Manifest.gzbin37338 -> 37367 bytes
-rw-r--r--eclass/kernel-build.eclass10
-rw-r--r--eclass/kernel-install.eclass13
-rw-r--r--eclass/llvm.eclass43
-rw-r--r--eclass/plasma-mobile.kde.org.eclass5
-rwxr-xr-xeclass/tests/llvm.sh7
6 files changed, 18 insertions, 60 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 967e0d06aaba..6017c37a5c6e 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files differ
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index c8802b39fa8c..da215a055a46 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -6,7 +6,7 @@
# Distribution Kernel Project <dist-kernel@gentoo.org>
# @AUTHOR:
# Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
# @PROVIDES: kernel-install
# @BLURB: Build mechanics for Distribution Kernels
# @DESCRIPTION:
@@ -20,13 +20,14 @@
# the kernel and installing it along with its modules and subset
# of sources needed to build external modules.
-if [[ ! ${_KERNEL_BUILD_ECLASS} ]]; then
-
case ${EAPI} in
- 7|8) ;;
+ 8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
+if [[ ! ${_KERNEL_BUILD_ECLASS} ]]; then
+_KERNEL_BUILD_ECLASS=1
+
PYTHON_COMPAT=( python3_{8..11} )
inherit multiprocessing python-any-r1 savedconfig toolchain-funcs kernel-install
@@ -281,7 +282,6 @@ kernel-build_merge_configs() {
.config "${@}" "${user_configs[@]}" || die
}
-_KERNEL_BUILD_ECLASS=1
fi
EXPORT_FUNCTIONS src_configure src_compile src_test src_install pkg_postinst
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index fba65a76ccce..49aff35dea0d 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -6,7 +6,7 @@
# Distribution Kernel Project <dist-kernel@gentoo.org>
# @AUTHOR:
# Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
# @PROVIDES: dist-kernel-utils
# @BLURB: Installation mechanics for Distribution Kernels
# @DESCRIPTION:
@@ -29,9 +29,10 @@
# kernel-build.eclass obtains it from kernel config.
if [[ ! ${_KERNEL_INSTALL_ECLASS} ]]; then
+_KERNEL_INSTALL_ECLASS=1
case ${EAPI} in
- 7|8) ;;
+ 8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -46,17 +47,12 @@ RESTRICT+="
"
# note: we need installkernel with initramfs support!
-_INSTALL_DEPEND="
+IDEPEND="
|| (
sys-kernel/installkernel-gentoo
sys-kernel/installkernel-systemd-boot
)
initramfs? ( >=sys-kernel/dracut-049-r3 )"
-if [[ ${EAPI} == 7 ]]; then
- RDEPEND="${_INSTALL_DEPEND}"
-else
- IDEPEND="${_INSTALL_DEPEND}"
-fi
# needed by objtool that is installed along with the kernel and used
# to build external modules
# NB: linux-mod.eclass also adds this dep but it's cleaner to have
@@ -533,7 +529,6 @@ kernel-install_pkg_config() {
kernel-install_install_all "${PV}${KV_LOCALVERSION}"
}
-_KERNEL_INSTALL_ECLASS=1
fi
EXPORT_FUNCTIONS src_test pkg_preinst pkg_postinst pkg_prerm pkg_postrm
diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index 7657de4bc5a2..b4347163face 100644
--- a/eclass/llvm.eclass
+++ b/eclass/llvm.eclass
@@ -6,7 +6,7 @@
# Michał Górny <mgorny@gentoo.org>
# @AUTHOR:
# Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Utility functions to build against slotted LLVM
# @DESCRIPTION:
# The llvm.eclass provides utility functions that can be used to build
@@ -56,15 +56,9 @@
# }
# @CODE
-case "${EAPI:-0}" in
- 0|1|2|3|4|5)
- die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
- ;;
- 6|7|8)
- ;;
- *)
- die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
- ;;
+case ${EAPI} in
+ 7|8) ;;
+ *) die "EAPI=${EAPI:-0} not supported";;
esac
EXPORT_FUNCTIONS pkg_setup
@@ -95,7 +89,7 @@ declare -g -r _LLVM_KNOWN_SLOTS=( {16..8} )
#
# If -b is specified, the checks are performed relative to BROOT,
# and BROOT-path is returned. This is appropriate when your package
-# calls llvm-config executable. -b is supported since EAPI 7.
+# calls llvm-config executable.
#
# If -d is specified, the checks are performed relative to ESYSROOT,
# and ESYSROOT-path is returned. This is appropriate when your package
@@ -126,17 +120,6 @@ get_llvm_slot() {
shift
done
- if [[ ${EAPI} == 6 ]]; then
- case ${hv_switch} in
- -b)
- die "${FUNCNAME} -b is not supported in EAPI ${EAPI}"
- ;;
- -d)
- hv_switch=
- ;;
- esac
- fi
-
local max_slot=${1}
local slot
for slot in "${_LLVM_KNOWN_SLOTS[@]}"; do
@@ -179,17 +162,8 @@ get_llvm_slot() {
get_llvm_prefix() {
debug-print-function ${FUNCNAME} "${@}"
- local prefix=${EPREFIX}
- if [[ ${EAPI} != 6 ]]; then
- case ${1} in
- -b)
- prefix=${BROOT}
- ;;
- *)
- prefix=${ESYSROOT}
- ;;
- esac
- fi
+ local prefix=${ESYSROOT}
+ [[ ${1} == -b ]] && prefix=${BROOT}
echo "${prefix}/usr/lib/llvm/$(get_llvm_slot "${@}")"
}
@@ -277,8 +251,7 @@ llvm_pkg_setup() {
llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
llvm_fix_tool_path READELF STRINGS STRIP
- local prefix=${EPREFIX}
- [[ ${EAPI} != 6 ]] && prefix=${ESYSROOT}
+ local prefix=${ESYSROOT}
local llvm_path=${prefix}/usr/lib/llvm/${LLVM_SLOT}/bin
local IFS=:
local split_path=( ${PATH} )
diff --git a/eclass/plasma-mobile.kde.org.eclass b/eclass/plasma-mobile.kde.org.eclass
index 91397cd1c0e7..73cb98a3c153 100644
--- a/eclass/plasma-mobile.kde.org.eclass
+++ b/eclass/plasma-mobile.kde.org.eclass
@@ -35,9 +35,6 @@ inherit kde.org
HOMEPAGE="https://plasma-mobile.org/"
-SLOT=5/${PV}
-[[ ${KDE_BUILD_TYPE} == release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
-
# @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI
# @INTERNAL
# @DESCRIPTION:
@@ -45,7 +42,7 @@ SLOT=5/${PV}
KDE_ORG_SCHEDULE_URI="https://invent.kde.org/plasma/plasma-mobile/-/wikis/Release-Schedule"
if [[ ${KDE_BUILD_TYPE} != live && -z ${KDE_ORG_COMMIT} ]]; then
- SRC_URI="mirror://kde/stable/plasma-mobile/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
+ SRC_URI="mirror://kde/stable/plasma-mobile/$(ver_cut 1-2)/${KDE_ORG_NAME}-${PV}.tar.xz"
fi
fi
diff --git a/eclass/tests/llvm.sh b/eclass/tests/llvm.sh
index 93bc124a82af..e62fb4b002a2 100755
--- a/eclass/tests/llvm.sh
+++ b/eclass/tests/llvm.sh
@@ -74,13 +74,6 @@ eindent
check_prefix /sysroot/eprefix/usr/lib/llvm/11 -d
eoutdent
-ebegin "Testing check_setup_path EAPI 6 API"
-eindent
- EAPI=6 \
- LLVM_INSTALLED_SLOT=11 \
- check_prefix /usr/lib/llvm/11 -d
-eoutdent
-
BASEPATH=/usr/lib/ccache/bin:/usr/bin:/usr/sbin:/bin:/sbin
# TODO: cross support?
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 23:48:22 +0000