diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39903 -> 39738 bytes | |||
| -rw-r--r-- | eclass/distutils-r1.eclass | 2 | ||||
| -rw-r--r-- | eclass/guile-single.eclass | 4 | ||||
| -rw-r--r-- | eclass/guile.eclass | 6 | ||||
| -rw-r--r-- | eclass/plasma-mobile.kde.org.eclass | 49 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 3 | ||||
| -rw-r--r-- | eclass/xdg.eclass | 10 |
7 files changed, 17 insertions, 57 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 759eb218bafe..b112a178acba 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 53b40163c216..5a6ebdcede8a 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1339,9 +1339,9 @@ distutils_pep517_install() { ninjaopts = shlex.split(os.environ["NINJAOPTS"]) print(json.dumps({ "build.tool-args": ninjaopts, - "build.verbose": True, "cmake.args": ";".join(sys.argv[1:]), "cmake.build-type": "${CMAKE_BUILD_TYPE}", + "cmake.verbose": True, "install.strip": False, })) EOF diff --git a/eclass/guile-single.eclass b/eclass/guile-single.eclass index 91f6036139da..66898504a6c4 100644 --- a/eclass/guile-single.eclass +++ b/eclass/guile-single.eclass @@ -240,6 +240,6 @@ guile-single_src_install() { guile_unstrip_ccache } -EXPORT_FUNCTIONS pkg_setup src_prepare src_install - fi # _GUILE_SINGLE_ECLASS + +EXPORT_FUNCTIONS pkg_setup src_prepare src_install diff --git a/eclass/guile.eclass b/eclass/guile.eclass index 323d04ef1152..e8fde64266e5 100644 --- a/eclass/guile.eclass +++ b/eclass/guile.eclass @@ -353,7 +353,7 @@ guile_src_install() { einstalldocs } -EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile \ - src_install src_test - fi # _GUILE_ECLASS + +EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile \ + src_install src_test diff --git a/eclass/plasma-mobile.kde.org.eclass b/eclass/plasma-mobile.kde.org.eclass deleted file mode 100644 index 3349f90745bd..000000000000 --- a/eclass/plasma-mobile.kde.org.eclass +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# @DEAD -# @ECLASS: plasma-mobile.kde.org.eclass -# @MAINTAINER: -# kde@gentoo.org -# @SUPPORTED_EAPIS: 8 -# @PROVIDES: kde.org -# @BLURB: Support eclass for KDE Plasma Mobile packages. -# @DESCRIPTION: -# This eclass extends kde.org.eclass for Plasma Mobile release group to assemble -# default SRC_URI for tarballs, set up git-r3.eclass for stable/master branch -# versions or restrict access to unreleased (packager access only) tarballs -# in Gentoo KDE overlay. -# -# This eclass unconditionally inherits kde.org.eclass and all its public -# variables and helper functions (not phase functions) may be considered as -# part of this eclass's API. - -case ${EAPI} in - 8) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - -if [[ -z ${_PLASMA_MOBILE_KDE_ORG_ECLASS} ]]; then -_PLASMA_MOBILE_KDE_ORG_ECLASS=1 - -# @ECLASS_VARIABLE: KDE_ORG_CATEGORY -# @PRE_INHERIT -# @DESCRIPTION: -# For proper description see kde.org.eclass manpage. -: "${KDE_ORG_CATEGORY:=plasma-mobile}" - -inherit kde.org - -HOMEPAGE="https://plasma-mobile.org/" - -# @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI -# @INTERNAL -# @DESCRIPTION: -# For proper description see kde.org.eclass manpage. -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/$(ver_cut 1-2)/${KDE_ORG_NAME}-${PV}.tar.xz" -fi - -fi diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 0557db974035..53b64a470e37 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -574,6 +574,9 @@ toolchain_pkg_setup() { # bug #265283 unset LANGUAGES + # bug #932245 + [[ ${LIBTOOL} = rlibtool ]] && die "\$LIBTOOL is using rlibtool from dev-build/slibtool. You must not use rlibtool, only rclibtool." + # See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html # Avoid really confusing logs from subconfigure spam, makes logs far # more legible. diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass index 6af4b91875fc..2e16a438d840 100644 --- a/eclass/xdg.eclass +++ b/eclass/xdg.eclass @@ -45,8 +45,6 @@ case ${EAPI} in default } - EXPORT_FUNCTIONS src_prepare - DEPEND="${_XDG_DEPEND}" ;; *) @@ -131,4 +129,12 @@ xdg_pkg_postrm() { fi +case ${EAPI} in + 6|7) + EXPORT_FUNCTIONS src_prepare + ;; + *) + ;; +esac + EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_postrm |