[gentoo-dev] [PATCH 2/2] python-utils-r1.eclass: Remove python.eclass guards
python.eclass is gone for a long time, ::progress is discontinued,
it should be safe to assume people will no longer be copying old stuff.
Signed-off-by: Michał Górny
---
eclass/python-utils-r1.eclass | 170 --
1 file changed, 170 deletions(-)
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 52d064e4af80..3036148b8383 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -907,8 +907,6 @@ _python_wrapper_setup() {
[[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON specified."
if [[ ! -x ${workdir}/bin/python ]]; then
- _python_check_dead_variables
-
mkdir -p "${workdir}"/{bin,pkgconfig} || die
# Clean up, in case we were supposed to do a cheap update.
@@ -1301,173 +1299,5 @@ epytest() {
return ${?}
}
-# -- python.eclass functions --
-
-_python_check_dead_variables() {
- local v
-
- for v in PYTHON_DEPEND PYTHON_USE_WITH{,_OR,_OPT}
{RESTRICT,SUPPORT}_PYTHON_ABIS
- do
- if [[ ${!v} ]]; then
- die "${v} is invalid for python-r1 suite, please take a
look @
https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head";
- fi
- done
-
- for v in PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS}
- do
- if [[ ${!v} ]]; then
- die "${v} is invalid for python-r1 suite, please take a
look @
https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS";
- fi
- done
-
- for v in PYTHON_TESTS_RESTRICTED_ABIS PYTHON_EXPORT_PHASE_FUNCTIONS \
- PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES}
PYTHON_NONVERSIONED_EXECUTABLES
- do
- if [[ ${!v} ]]; then
- die "${v} is invalid for python-r1 suite"
- fi
- done
-
- for v in DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES
DISTUTILS_SETUP_FILES \
- DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST PYTHON_MODNAME
- do
- if [[ ${!v} ]]; then
- die "${v} is invalid for distutils-r1, please take a
look @
https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}";
- fi
- done
-
- if [[ ${DISTUTILS_DISABLE_TEST_DEPENDENCY} ]]; then
- die "${v} is invalid for distutils-r1, please take a look @
https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST";
- fi
-
- # python.eclass::progress
- for v in PYTHON_BDEPEND PYTHON_MULTIPLE_ABIS PYTHON_ABI_TYPE \
- PYTHON_RESTRICTED_ABIS PYTHON_TESTS_FAILURES_TOLERANT_ABIS \
- PYTHON_CFFI_MODULES_GENERATION_COMMANDS
- do
- if [[ ${!v} ]]; then
- die "${v} is invalid for python-r1 suite"
- fi
- done
-}
-
-python_pkg_setup() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @
https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup";
-}
-
-python_convert_shebangs() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @
https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs";
-}
-
-python_clean_py-compile_files() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-python_clean_installation_image() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-python_execute_function() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @
https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function";
-}
-
-python_generate_wrapper_scripts() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-python_merge_intermediate_installation_images() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-python_set_active_version() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @
https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup";
-}
-
-python_need_rebuild() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-PYTHON() {
- die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @
https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D";
-}
-
-python_get_implementation() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-python_get_implementational_package() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-python_get_libdir() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-python_get_library() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-python_get_version() {
- die "${FUNCNAME}() is invalid for python-r1 suite"
-}
-
-python_get_implementation_and_version()
[gentoo-dev] [PATCH 1/2] distutils-r1.eclass: Remove distutils.eclass guards
distutils.eclass is gone for a long time, ::progress is discontinued,
it should be safe to assume people will no longer be copying old stuff.
Signed-off-by: Michał Górny
---
eclass/distutils-r1.eclass | 34 --
1 file changed, 34 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f5b151d4b8e2..a5015e096ce5 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1185,39 +1185,5 @@ distutils-r1_src_install() {
_distutils-r1_check_namespace_pth
}
-# -- distutils.eclass functions --
-
-distutils_get_intermediate_installation_image() {
- die "${FUNCNAME}() is invalid for distutils-r1"
-}
-
-distutils_src_unpack() {
- die "${FUNCNAME}() is invalid for distutils-r1, and you don't want it
in EAPI ${EAPI} anyway"
-}
-
-distutils_src_prepare() {
- die "${FUNCNAME}() is invalid for distutils-r1, you probably want:
${FUNCNAME/_/-r1_}"
-}
-
-distutils_src_compile() {
- die "${FUNCNAME}() is invalid for distutils-r1, you probably want:
${FUNCNAME/_/-r1_}"
-}
-
-distutils_src_test() {
- die "${FUNCNAME}() is invalid for distutils-r1, you probably want:
${FUNCNAME/_/-r1_}"
-}
-
-distutils_src_install() {
- die "${FUNCNAME}() is invalid for distutils-r1, you probably want:
${FUNCNAME/_/-r1_}"
-}
-
-distutils_pkg_postinst() {
- die "${FUNCNAME}() is invalid for distutils-r1, and pkg_postinst is
unnecessary"
-}
-
-distutils_pkg_postrm() {
- die "${FUNCNAME}() is invalid for distutils-r1, and pkg_postrm is
unnecessary"
-}
-
_DISTUTILS_R1=1
fi
--
2.30.1
[gentoo-dev] [PATCH v2] aspell-dict-r1.eclass: add EAPI=7 support
This adds support for EAPI=7.
Also overhauled the ebuild and dropped aspell-0.50 from *DEPEND, as it's
not anymore in tree. Also slightly adjusted messages and taking ownership.
Since there is a open bug ticket about setting a default value for
ASPELL_VERSION, I am changing the logic a little bit. ASPELL_VERSION
will be by default version 6, while version 5 or no version can be set
by an empty variable instead. It's needed for automatic SRC_URI, since
there are packages starting with 'aspell', 'aspell5' or 'aspell6',
despite being all for aspell-0.60.
This is a preparation for an major version bump off all
app-dicts/aspell-* language dicts ebuilds. Most of them are anyway
outdated, so we could bump them directly to EAPI=7 after merging this
one here.
Closes: https://bugs.gentoo.org/637710
Closes: https://bugs.gentoo.org/770259
Signed-off-by: Conrad Kostecki
---
eclass/aspell-dict-r1.eclass | 74 ++--
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index b07af61fdf1..14bbfcb98d2 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -1,42 +1,48 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: aspell-dict-r1.eclass
# @MAINTAINER:
-# maintainer-nee...@gentoo.org
+# Conrad Kostecki
# @AUTHOR:
-# Original author: Seemant Kulleen
-# -r1 author: David Seifert
-# @SUPPORTED_EAPIS: 6
-# @BLURB: An eclass to streamline the construction of ebuilds for new aspell
dicts
+# Seemant Kulleen
+# David Seifert
+# Conrad Kostecki
+# @SUPPORTED_EAPIS: 6 7
+# @BLURB: An eclass to streamline the construction of ebuilds for new aspell
dictionaries.
# @DESCRIPTION:
-# The aspell-dict-r1 eclass is designed to streamline the construction of
-# ebuilds for the new aspell dictionaries (from gnu.org) which support
-# aspell-0.50. Support for aspell-0.60 has been added by Sergey Ulanov.
+# The aspell-dict-r1 eclass is designed to streamline the construction of
ebuilds
+# for the new aspell dictionaries (from gnu.org) which support aspell-0.50.
+# Support for aspell-0.60 has been added by Sergey Ulanov.
# @ECLASS-VARIABLE: ASPELL_LANG
# @REQUIRED
# @DESCRIPTION:
-# Pure cleartext string that is included into DESCRIPTION. This is the name
-# of the language, for instance "Hungarian". Needs to be defined before
-# inheriting the eclass.
+# Pure cleartext string that is included into DESCRIPTION.
+# This is the name of the language, for instance "Hungarian".
+# Needs to be defined before inheriting the eclass.
+
+# @ECLASS-VARIABLE: ASPELL_SPELLANG
+# @DESCRIPTION:
+# Short (readonly) form of the language code, generated from ${PN}.
+# For instance, 'aspell-hu' yields to the value 'hu'.
+readonly ASPELL_SPELLANG="${PN/aspell-/}"
# @ECLASS-VARIABLE: ASPELL_VERSION
# @DESCRIPTION:
-# What major version of aspell is this dictionary for? Valid values are 5, 6
or undefined.
-# This value is used to construct SRC_URI and *DEPEND strings. If defined to 6,
-# >=app-text/aspell-0.60 will be added to DEPEND and RDEPEND, otherwise,
-# >=app-text/aspell-0.50 is added to DEPEND and RDEPEND. If the value is to be
overridden,
-# it needs to be overridden before inheriting the eclass.
+# What major version of aspell is this dictionary for? Valid values are 5, 6
or empty.
+# This value is used to construct SRC_URI strings.
+# If the value needs to be overridden, it needs to be overridden before
inheriting the eclass.
+: ${ASPELL_VERSION:-6}
case ${EAPI:-0} in
- [0-5])
- die "aspell-dict-r1.eclass is banned in EAPI ${EAPI:-0}"
+ 0|1|2|3|4|5)
+ die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
;;
- 6)
+ 6|7)
;;
*)
- die "Unknown EAPI ${EAPI:-0}"
+ die "Unknown EAPI=${EAPI} for ${ECLASS}"
;;
esac
@@ -44,29 +50,22 @@ EXPORT_FUNCTIONS src_configure src_install
if [[ ! ${_ASPELL_DICT_R1} ]]; then
-# aspell packages have an idiosyncratic versioning scheme, that is
-# the last separating version separator is replaced by a '-'.
-_ASPELL_P=aspell${ASPELL_VERSION}-${PN/aspell-/}-${PV%.*}-${PV##*.}
+[[ ! -z "${ASPELL_VERSION}" && "${ASPELL_VERSION}" != [56] ]] && die
"Unsupported ASPELL_VERSION=${ASPELL_VERSION} for ${ECLASS}"
-# @ECLASS-VARIABLE: ASPELL_SPELLANG
-# @DESCRIPTION:
-# Short (readonly) form of the language code, generated from ${PN}
-# For instance, 'aspell-hu' yields the value 'hu'.
-readonly ASPELL_SPELLANG=${PN/aspell-/}
-S="${WORKDIR}/${_ASPELL_P}"
+# Most of those aspell packages have an idiosyncratic versioning scheme,
+# where the last separating version separator is replaced by a '-'.
+_ASPELL_P="aspell${ASPELL_VERSION}-${PN/aspell-/}-${PV%.*}-${PV##*.}"
-DESCRIPTION="${ASPELL_LANG} language dictionary for aspell"
+DE
[gentoo-dev] Last-rites: sci-physics/herwig++
# Andreas Sturmlechner (2021-03-07) # Unresolved build issue since 2019, QA issues, bugs #697870 and #705236 # Blocks cleanup of equally broken sci-physics/looptools-2.8, bug #770796 # Masked for removal on 2021-03-06. sci-physics/herwig++ signature.asc Description: This is a digitally signed message part.
Re: [gentoo-dev] [PATCH] aspell-dict-r1.eclass: add EAPI=7 support
> On Sun, 07 Mar 2021, conikost wrote:
> case ${EAPI:-0} in
> - [0-5])
> - die "aspell-dict-r1.eclass is banned in EAPI ${EAPI:-0}"
> + 0|1|2|3|4|5)
> + die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
> ;;
> - 6)
> + 6|7)
> ;;
> *)
> - die "Unknown EAPI ${EAPI:-0}"
> + die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
Same message as above? Then the 0-5 case isn't needed.
> ;;
> esac
signature.asc
Description: PGP signature
[gentoo-dev] [PATCH] aspell-dict-r1.eclass: add EAPI=7 support
From: Conrad Kostecki
Those changes add support for EAPI=7 for all aspell- ebuilds.
Also slightly adjusted messages and taking ownership.
Closes: https://bugs.gentoo.org/637710
Closes: https://bugs.gentoo.org/770259
Signed-off-by: Conrad Kostecki
---
eclass/aspell-dict-r1.eclass | 25 +
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index b07af61fdf1..12d9036bce3 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: aspell-dict-r1.eclass
# @MAINTAINER:
-# maintainer-nee...@gentoo.org
+# conik...@gentoo.org
# @AUTHOR:
# Original author: Seemant Kulleen
-# -r1 author: David Seifert
-# @SUPPORTED_EAPIS: 6
+# -r1 authors: David Seifert, Conrad Kostecki
+# @SUPPORTED_EAPIS: 6 7
# @BLURB: An eclass to streamline the construction of ebuilds for new aspell
dicts
# @DESCRIPTION:
# The aspell-dict-r1 eclass is designed to streamline the construction of
@@ -28,15 +28,16 @@
# >=app-text/aspell-0.60 will be added to DEPEND and RDEPEND, otherwise,
# >=app-text/aspell-0.50 is added to DEPEND and RDEPEND. If the value is to be
overridden,
# it needs to be overridden before inheriting the eclass.
+: ${ASPELL_VERSION:=5}
case ${EAPI:-0} in
- [0-5])
- die "aspell-dict-r1.eclass is banned in EAPI ${EAPI:-0}"
+ 0|1|2|3|4|5)
+ die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
;;
- 6)
+ 6|7)
;;
*)
- die "Unknown EAPI ${EAPI:-0}"
+ die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
;;
esac
@@ -53,18 +54,17 @@
_ASPELL_P=aspell${ASPELL_VERSION}-${PN/aspell-/}-${PV%.*}-${PV##*.}
# Short (readonly) form of the language code, generated from ${PN}
# For instance, 'aspell-hu' yields the value 'hu'.
readonly ASPELL_SPELLANG=${PN/aspell-/}
-S="${WORKDIR}/${_ASPELL_P}"
DESCRIPTION="${ASPELL_LANG} language dictionary for aspell"
HOMEPAGE="http://aspell.net";
SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${_ASPELL_P}.tar.bz2"
+S="${WORKDIR}/${_ASPELL_P}"
unset _ASPELL_P
-IUSE=""
SLOT="0"
-_ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-5}
-[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "${ASPELL_VERSION} is not a
valid version"
+_ASPELL_MAJOR_VERSION=${ASPELL_VERSION}
+[[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "Unsupported
ASPELL_VERSION=${ASPELL_VERSION} for ${ECLASS}"
RDEPEND=">=app-text/aspell-0.${_ASPELL_MAJOR_VERSION}0"
DEPEND="${RDEPEND}"
@@ -88,3 +88,4 @@ aspell-dict-r1_src_install() {
_ASPELL_DICT_R1=1
fi
+
--
2.30.1
[gentoo-dev] cmake-multilib.eclass: Drop EAPI-6 support and prepare to drop cmake-utils w/ future EAPI
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: cmake-multilib.eclass
@@ -6,27 +6,41 @@
# gx86-multilib team
# @AUTHOR:
# Author: Michał Górny
-# @SUPPORTED_EAPIS: 6 7
-# @BLURB: cmake-utils wrapper for multilib builds
+# @SUPPORTED_EAPIS: 7
+# @BLURB: cmake wrapper for multilib builds
# @DESCRIPTION:
-# The cmake-multilib.eclass provides a glue between cmake-utils.eclass(5)
+# The cmake-multilib.eclass provides a glue between cmake.eclass(5)
# and multilib-minimal.eclass(5), aiming to provide a convenient way
# to build packages using cmake for multiple ABIs.
#
# Inheriting this eclass sets IUSE and exports default multilib_src_*()
-# sub-phases that call cmake-utils phase functions for each ABI enabled.
+# sub-phases that call cmake phase functions for each ABI enabled.
# The multilib_src_*() functions can be defined in ebuild just like
-# in multilib-minimal, yet they ought to call appropriate cmake-utils
+# in multilib-minimal, yet they ought to call appropriate cmake
# phase rather than 'default'.
# @ECLASS-VARIABLE: CMAKE_ECLASS
# @DESCRIPTION:
-# Default is "cmake-utils" for compatibility. Specify "cmake" for ebuilds
-# that ported from cmake-utils.eclass to cmake.eclass already.
+# Default is "cmake-utils" for compatibility in EAPI-7. Specify "cmake" for
+# ebuilds that ported to cmake.eclass already. Future EAPI is "cmake" only.
: ${CMAKE_ECLASS:=cmake-utils}
+# @ECLASS-VARIABLE: _CMAKE_ECLASS_IMPL
+# @INTERNAL
+# @DESCRIPTION:
+# Default is "cmake" for future EAPI. Cleanup once EAPI-7 support is gone.
+_CMAKE_ECLASS_IMPL=cmake
+
case ${EAPI:-0} in
- [67]) ;;
+ 7) case ${CMAKE_ECLASS} in
+ cmake-utils|cmake) ;;
+ *)
+ eerror "Unknown value for \$
{CMAKE_ECLASS}"
+ die "Value ${CMAKE_ECLASS} is not
supported"
+ ;;
+ esac
+ _CMAKE_ECLASS_IMPL=${CMAKE_ECLASS}
+ ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
@@ -34,15 +48,7 @@ if [[ ${CMAKE_IN_SOURCE_BUILD} ]]; then
die "${ECLASS}: multilib support requires out-of-source builds."
fi
-case ${CMAKE_ECLASS} in
- cmake-utils|cmake) ;;
- *)
- eerror "Unknown value for \${CMAKE_ECLASS}"
- die "Value ${CMAKE_ECLASS} is not supported"
- ;;
-esac
-
-inherit ${CMAKE_ECLASS} multilib-minimal
+inherit ${_CMAKE_ECLASS_IMPL} multilib-minimal
EXPORT_FUNCTIONS src_configure src_compile src_test src_install
@@ -53,7 +59,7 @@ cmake-multilib_src_configure() {
}
multilib_src_configure() {
- ${CMAKE_ECLASS}_src_configure "${_cmake_args[@]}"
+ ${_CMAKE_ECLASS_IMPL}_src_configure "${_cmake_args[@]}"
}
cmake-multilib_src_compile() {
@@ -63,7 +69,7 @@ cmake-multilib_src_compile() {
}
multilib_src_compile() {
- ${CMAKE_ECLASS}_src_compile "${_cmake_args[@]}"
+ ${_CMAKE_ECLASS_IMPL}_src_compile "${_cmake_args[@]}"
}
cmake-multilib_src_test() {
@@ -73,7 +79,7 @@ cmake-multilib_src_test() {
}
multilib_src_test() {
- ${CMAKE_ECLASS}_src_test "${_cmake_args[@]}"
+ ${_CMAKE_ECLASS_IMPL}_src_test "${_cmake_args[@]}"
}
cmake-multilib_src_install() {
@@ -83,5 +89,5 @@ cmake-multilib_src_install() {
}
multilib_src_install() {
- ${CMAKE_ECLASS}_src_install "${_cmake_args[@]}"
+ ${_CMAKE_ECLASS_IMPL}_src_install "${_cmake_args[@]}"
}
signature.asc
Description: This is a digitally signed message part.
[gentoo-dev] Last rites: app-portage/splat
# Conrad Kostecki (2021-03-07) # Upstream since 2004 gone, does not supportnon-English characters, # multiple bugs open and unmaintained. # Removal in 30 days. app-portage/splat
