From 14cfb40363656f2e860c7ffabe2d5f9dc6bfc16b Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 20:45:56 +0000 Subject: autotools.eclass: inherit eutils for < EAPI 7 for eqawarn Signed-off-by: Sam James --- eclass/autotools.eclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 3e6906cb469a..12bc559bda75 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -27,7 +27,11 @@ if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then _AUTOTOOLS_ECLASS=1 case ${EAPI:-0} in - 0|1|2|3|4|5|6|7) ;; + 0|1|2|3|4|5|6) + # Needed for eqawarn + inherit eutils + ;; + 7) ;; *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; esac -- cgit v1.2.3-65-gdbad From c7bfb08288f13f2652d1000d66714e372796b8b0 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 20:46:23 +0000 Subject: autotools.eclass: convert ewarn to eqawarn Signed-off-by: Sam James --- eclass/autotools.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 12bc559bda75..00654822fb2a 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -528,7 +528,7 @@ autotools_run_tool() { done if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then - ewarn "QA Warning: running '$1' in ${EBUILD_PHASE} phase" + eqawarn "Running '$1' in ${EBUILD_PHASE} phase" fi if ${missing_ok} && ! type -P ${1} >/dev/null ; then -- cgit v1.2.3-65-gdbad From f1f86ebcccffc7be416e2330c0221714b5c52056 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 20:47:09 +0000 Subject: autotools.eclass: add @DESCRIPTION for _at_uses_pkg Signed-off-by: Sam James --- eclass/autotools.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 00654822fb2a..8058b45fca90 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -269,6 +269,7 @@ eautoreconf() { # @FUNCTION: _at_uses_pkg # @USAGE: # @INTERNAL +# @DESCRIPTION: # See if the specified macros are enabled. _at_uses_pkg() { if [[ -n $(autotools_check_macro "$@") ]] ; then -- cgit v1.2.3-65-gdbad From bac285b3dab50b171c7ec9db3ffdd5c087e9e6f5 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 20:52:26 +0000 Subject: autotools.eclass: use consistent 'case' style Signed-off-by: Sam James --- eclass/autotools.eclass | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 8058b45fca90..83b8bbd9134b 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -23,7 +23,7 @@ if [[ ${__AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then fi fi -if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then +if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then _AUTOTOOLS_ECLASS=1 case ${EAPI:-0} in @@ -78,7 +78,7 @@ _LATEST_AUTOMAKE=( 1.16.2-r1:1.16 ) _automake_atom="sys-devel/automake" _autoconf_atom="sys-devel/autoconf" -if [[ -n ${WANT_AUTOMAKE} ]]; then +if [[ -n ${WANT_AUTOMAKE} ]] ; then case ${WANT_AUTOMAKE} in # Even if the package doesn't use automake, we still need to depend # on it because we run aclocal to process m4 macros. This matches @@ -370,6 +370,7 @@ eautoconf() { echo die "No configure.{ac,in} present!" fi + if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then eqawarn "This package has a configure.in file which has long been deprecated. Please" eqawarn "update it to use configure.ac instead as newer versions of autotools will die" @@ -414,7 +415,7 @@ eautomake() { if [[ -z ${makefile_name} ]] ; then _at_uses_automake || return 0 - elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]]; then + elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]] ; then local used_automake local installed_automake @@ -422,7 +423,7 @@ eautomake() { used_automake=$(head -n 1 < ${makefile_name%.am}.in | \ sed -e 's:.*by automake \(.*\) from .*:\1:') - if [[ ${installed_automake} != ${used_automake} ]]; then + if [[ ${installed_automake} != ${used_automake} ]] ; then ewarn "Automake used for the package (${used_automake}) differs from" \ "the installed version (${installed_automake})." ewarn "Forcing a full rebuild of the autotools to workaround." @@ -437,8 +438,8 @@ eautomake() { # Older versions of automake do not support --force-missing. But we want # to use this whenever possible to update random bundled files, bug #133489. case $(_automake_version) in - 1.4|1.4[.-]*) ;; - *) extra_opts+=( --force-missing ) ;; + 1.4|1.4[.-]*) ;; + *) extra_opts+=( --force-missing ) ;; esac autotools_run_tool automake --add-missing --copy "${extra_opts[@]}" "$@" @@ -486,7 +487,7 @@ config_rpath_update() { autotools_env_setup() { # We do the "latest" → version switch here because it solves # possible order problems, see bug #270010 as an example. - if [[ ${WANT_AUTOMAKE} == "latest" ]]; then + if [[ ${WANT_AUTOMAKE} == "latest" ]] ; then local pv for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do # Break on first hit to respect _LATEST_AUTOMAKE order. @@ -518,17 +519,17 @@ autotools_run_tool() { local autofail=true m4flags=false missing_ok=false return_output=false while [[ -n $1 ]] ; do case $1 in - --at-no-fail) autofail=false;; - --at-m4flags) m4flags=true;; - --at-missing) missing_ok=true;; - --at-output) return_output=true;; - # whatever is left goes to the actual tool - *) break;; + --at-no-fail) autofail=false ;; + --at-m4flags) m4flags=true ;; + --at-missing) missing_ok=true ;; + --at-output) return_output=true ;; + # whatever is left goes to the actual tool + *) break ;; esac shift done - if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then + if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]] ; then eqawarn "Running '$1' in ${EBUILD_PHASE} phase" fi -- cgit v1.2.3-65-gdbad From 650763e87a32e18487d838d7677f6a198cb5007f Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 20:53:12 +0000 Subject: autotools.eclass: consistently use ${ECLASS}, not "autotools.eclass" Signed-off-by: Sam James --- eclass/autotools.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 83b8bbd9134b..8591199d1136 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -19,7 +19,7 @@ if [[ ${__AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then # eclass at that point, but that adds overhead, and it's trivial # to re-order inherit in eclasses/ebuilds instead. #409611 if [[ ${__AUTOTOOLS_AUTO_DEPEND} != ${AUTOTOOLS_AUTO_DEPEND} ]] ; then - die "AUTOTOOLS_AUTO_DEPEND changed value between inherits; please inherit autotools.eclass first! ${__AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}" + die "AUTOTOOLS_AUTO_DEPEND changed value between inherits; please inherit ${ECLASS} first! ${__AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}" fi fi @@ -648,7 +648,7 @@ _autotools_m4dir_include() { # We handle it below -${flag}) ;; *) - [[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist" + [[ ! -d ${x} ]] && ewarn "${ECLASS}: '${x}' does not exist" include_opts+=" -${flag} ${x}" ;; esac -- cgit v1.2.3-65-gdbad From 1efde6afca37fe458ca3ac2ba4feeedf3ea52563 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 21:01:21 +0000 Subject: autotools.eclass: consistent variable references Signed-off-by: Sam James --- eclass/autotools.eclass | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 8591199d1136..6c016e0b786d 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -342,7 +342,7 @@ eaclocal() { _elibtoolize() { local LIBTOOLIZE=${LIBTOOLIZE:-$(type -P glibtoolize > /dev/null && echo glibtoolize || echo libtoolize)} - if [[ $1 == "--auto-ltdl" ]] ; then + if [[ ${1} == "--auto-ltdl" ]] ; then shift _at_uses_libltdl && set -- "$@" --ltdl fi @@ -517,8 +517,8 @@ autotools_env_setup() { autotools_run_tool() { # Process our own internal flags first local autofail=true m4flags=false missing_ok=false return_output=false - while [[ -n $1 ]] ; do - case $1 in + while [[ -n ${1} ]] ; do + case ${1} in --at-no-fail) autofail=false ;; --at-m4flags) m4flags=true ;; --at-missing) missing_ok=true ;; @@ -530,11 +530,11 @@ autotools_run_tool() { done if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]] ; then - eqawarn "Running '$1' in ${EBUILD_PHASE} phase" + eqawarn "Running '${1}' in ${EBUILD_PHASE} phase" fi if ${missing_ok} && ! type -P ${1} >/dev/null ; then - einfo "Skipping '$*' because '$1' not installed" + einfo "Skipping '$*' because '${1}' not installed" return 0 fi @@ -563,19 +563,19 @@ autotools_run_tool() { return fi - printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}" + printf "***** ${1} *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}" - ebegin "Running $@" + ebegin "Running '$@'" "$@" >> "${STDERR_TARGET}" 2>&1 if ! eend $? && ${autofail} ; then echo - eerror "Failed running '$1'!" + eerror "Failed running '${1}'!" eerror eerror "Include in your bug report the contents of:" eerror eerror " ${STDERR_TARGET}" echo - die "Failed running '$1'!" + die "Failed running '${1}'!" fi } -- cgit v1.2.3-65-gdbad From 18fda95cea306efe8009d1100195225acd8f8756 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 21:13:23 +0000 Subject: autotools.eclass: drop support for < EAPI 5 Needed for a subsequent change. < EAPI 5 is no longer in ::gentoo (since December). Signed-off-by: Sam James --- eclass/autotools.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 6c016e0b786d..0e8f3cdc98ac 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -4,7 +4,7 @@ # @ECLASS: autotools.eclass # @MAINTAINER: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: Regenerates auto* build scripts # @DESCRIPTION: # This eclass is for safely handling autotooled software packages that need to @@ -27,7 +27,7 @@ if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then _AUTOTOOLS_ECLASS=1 case ${EAPI:-0} in - 0|1|2|3|4|5|6) + 5|6) # Needed for eqawarn inherit eutils ;; @@ -132,7 +132,7 @@ RDEPEND="" : ${AUTOTOOLS_AUTO_DEPEND:=yes} if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then case ${EAPI:-0} in - 0|1|2|3|4|5|6) DEPEND=${AUTOTOOLS_DEPEND} ;; + 4|5|6) DEPEND=${AUTOTOOLS_DEPEND} ;; 7) BDEPEND=${AUTOTOOLS_DEPEND} ;; esac fi -- cgit v1.2.3-65-gdbad From 70f9a291edb7321f350f87c5eb1901fb515330a2 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 21:12:43 +0000 Subject: autotools.eclass: convert phase test to EBUILD_PHASE_FUNC Introduced in EAPI 5. Signed-off-by: Sam James --- eclass/autotools.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 0e8f3cdc98ac..e24a07e79454 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -529,8 +529,8 @@ autotools_run_tool() { shift done - if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]] ; then - eqawarn "Running '${1}' in ${EBUILD_PHASE} phase" + if [[ ${EBUILD_PHASE_FUNC} != "src_unpack" && ${EBUILD_PHASE_FUNC} != "src_prepare" ]] ; then + eqawarn "Running '${1}' in ${EBUILD_PHASE_FUNC} phase" fi if ${missing_ok} && ! type -P ${1} >/dev/null ; then -- cgit v1.2.3-65-gdbad From 6d4683a9452f8ed703d7901eedce9dd0a872c64e Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 21:20:59 +0000 Subject: autotools.eclass: explicitly blank and mark variables as @DEFAULT_UNSET Provides consistency with existing style. Signed-off-by: Sam James --- eclass/autotools.eclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index e24a07e79454..3090da5a01f4 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -145,12 +145,14 @@ unset _automake_atom _autoconf_atom # @DESCRIPTION: # Additional options to pass to automake during # eautoreconf call. +: ${AM_OPTS:=} # @ECLASS-VARIABLE: AT_NOEAUTOHEADER # @DEFAULT_UNSET # @DESCRIPTION: # Don't run eautoheader command if set to 'yes'; only used to work around # packages that don't want their headers being modified. +: ${AT_NOEAUTOHEADER:=} # @ECLASS-VARIABLE: AT_NOEAUTOMAKE # @DEFAULT_UNSET @@ -158,6 +160,7 @@ unset _automake_atom _autoconf_atom # Don't run eautomake command if set to 'yes'; only used to workaround # broken packages. Generally you should, instead, fix the package to # not call AM_INIT_AUTOMAKE if it doesn't actually use automake. +: ${AT_NOEAUTOMAKE:=} # @ECLASS-VARIABLE: AT_NOELIBTOOLIZE # @DEFAULT_UNSET @@ -165,6 +168,7 @@ unset _automake_atom _autoconf_atom # Don't run elibtoolize command if set to 'yes', # useful when elibtoolize needs to be ran with # particular options +: ${AT_NOELIBTOOLIZE:=} # @ECLASS-VARIABLE: AT_M4DIR # @DEFAULT_UNSET -- cgit v1.2.3-65-gdbad From c1c786c56d7d3dc59a65f29f990b1a40f38102f2 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 21:24:58 +0000 Subject: autotools.eclass: use same ${WANT_AUTOCONF} comparison test throughout Signed-off-by: Sam James --- eclass/autotools.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 3090da5a01f4..ba631aa7d146 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -253,7 +253,7 @@ eautoreconf() { done ${rerun_aclocal} && eaclocal - if [[ ${WANT_AUTOCONF} = 2.1 ]] ; then + if [[ ${WANT_AUTOCONF} == "2.1" ]] ; then eautoconf else eautoconf --force -- cgit v1.2.3-65-gdbad From 6f8e2665e98fb14711ca26739d1cd715bfb181b5 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 27 Mar 2021 21:46:33 +0000 Subject: autotools.eclass: document AUTOTOOLS_DEPEND Signed-off-by: Sam James --- eclass/autotools.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index ba631aa7d146..8cf09f08d2f9 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -118,6 +118,11 @@ if [[ -n ${WANT_LIBTOOL} ]] ; then export WANT_LIBTOOL fi +# @ECLASS-VARIABLE: AUTOTOOLS_DEPEND +# @INTERNAL +# @DESCRIPTION: +# Contains the combination of requested automake/autoconf/libtool +# versions in *DEPEND format. AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_libtool_atom}" -- cgit v1.2.3-65-gdbad From 307c855dc6d7842098fae8738a7a5228670a71f6 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 31 Mar 2021 23:51:35 +0000 Subject: autotools.eclass: add explicit GNU awk dependency autotools_check_macro_val specifically requires GNU awk (sys-apps/gawk) rather than any awk (virtual/awk). Closes: https://bugs.gentoo.org/584254 Signed-off-by: Sam James --- eclass/autotools.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 8cf09f08d2f9..ab62584a5b79 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -125,7 +125,9 @@ fi # versions in *DEPEND format. AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} - ${_libtool_atom}" + ${_libtool_atom} + sys-apps/gawk +" RDEPEND="" # @ECLASS-VARIABLE: AUTOTOOLS_AUTO_DEPEND -- cgit v1.2.3-65-gdbad From fe3f65790fabb6e98d0b851d3013714c7706eccc Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 1 Apr 2021 00:00:39 +0000 Subject: autotools.eclass: rename configure.in to configure.ac on new EAPIs automake is eventually going to fail when it detects configure.in. Don't do this immediately - instead only on new EAPIs to avoid breaking existing ebuilds. Bug: https://bugs.gentoo.org/426262 Signed-off-by: Sam James --- eclass/autotools.eclass | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index ab62584a5b79..04d94d882607 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -383,9 +383,19 @@ eautoconf() { fi if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then - eqawarn "This package has a configure.in file which has long been deprecated. Please" - eqawarn "update it to use configure.ac instead as newer versions of autotools will die" - eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." + case ${EAPI:-0} in + 5|6|7) + eqawarn "This package has a configure.in file which has long been deprecated. Please" + eqawarn "update it to use configure.ac instead as newer versions of autotools will die" + eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." + ;; + *) + # Move configure file to the new location only on newer EAPIs to ensure + # checks are done rather than retroactively breaking ebuilds. + einfo "Moving configure.in to configure.ac (bug #426262)" + mv configure.{in,ac} || die + ;; + esac fi # Install config.guess and config.sub which are required by many macros -- cgit v1.2.3-65-gdbad From 4575a79c002ebac5b979164fd7e15fddfe91f331 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 31 Mar 2021 03:47:30 +0100 Subject: gnuconfig.eclass: provide basic @ECLASS block, docs Signed-off-by: Sam James --- eclass/gnuconfig.eclass | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass index 3433837787c2..24f2714b6c18 100644 --- a/eclass/gnuconfig.eclass +++ b/eclass/gnuconfig.eclass @@ -1,25 +1,40 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# -# Author: Will Woods -# + +# @ECLASS: gnuconfig.eclass +# @MAINTAINER: +# Sam James +# @AUTHOR: +# Will Woods +# @SUPPORTED_EAPIS: 5 6 7 +# @BLURB: Refresh bundled gnuconfig files (config.guess, config.sub) +# @DESCRIPTION: # This eclass is used to automatically update files that typically come with # automake to the newest version available on the system. The most common use # of this is to update config.guess and config.sub when configure dies from # misguessing your canonical system name (CHOST). It can also be used to update # other files that come with automake, e.g. depcomp, mkinstalldirs, etc. # -# usage: gnuconfig_update [file1 file2 ...] + +DEPEND="sys-devel/gnuconfig" + +if [[ -z ${_GNUCONFIG_ECLASS} ]] ; then + _GNUCONFIG_CLASS=1 + +BDEPEND="sys-devel/gnuconfig" + +[[ ${EAPI} == [56] ]] && DEPEND="${BDEPEND}" + +# @FUNCTION: gnuconfig_update +# @USAGE: [file1 file2 ...] +# @DESCRIPTION: # if called without arguments, config.guess and config.sub will be updated. # All files in the source tree ($S) with the given name(s) will be replaced # with the newest available versions chosen from the list of locations in # gnuconfig_findnewest(), below. # # gnuconfig_update should generally be called from src_unpack() - - -DEPEND="sys-devel/gnuconfig" - +# # Wrapper function for gnuconfig_do_update. If no arguments are given, update # config.sub and config.guess (old default behavior), otherwise update the # named files. @@ -42,6 +57,9 @@ gnuconfig_update() { return $? } +# @FUNCTION: gnuconfig_do_update +# @INTERNAL +# @DESCRIPTION: # Copy the newest available version of specified files over any old ones in the # source dir. This function shouldn't be called directly - use gnuconfig_update # @@ -75,7 +93,10 @@ gnuconfig_do_update() { return 0 } -# this searches the standard locations for the newest config.{sub|guess}, and +# @FUNCTION: gnuconfig_findnewest +# @INTERNAL +# @DESCRIPTION: +# This searches the standard locations for the newest config.{sub|guess}, and # returns the directory where they can be found. gnuconfig_findnewest() { local locations=( @@ -88,3 +109,5 @@ gnuconfig_findnewest() { sort -r -n -t\' -k2 | \ sed -n '1{s,/config.sub:.*$,,;p;q}' } + +fi -- cgit v1.2.3-65-gdbad From a1c0c8e4cc2a6a95e459f81fec6d50860870a07c Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 31 Mar 2021 08:06:04 +0100 Subject: gnuconfig.eclass: use BDEPEND, BROOT where available (drop support for EAPI <5) EPREFIX is only available in > EAPI 2 but let's take the opportuinty to clean up in general. We don't want to keep worrying about *very* old EAPI cases, especially given other eclasses either barely - or don't - support it. Signed-off-by: Sam James --- eclass/gnuconfig.eclass | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass index 24f2714b6c18..173df6fd25e9 100644 --- a/eclass/gnuconfig.eclass +++ b/eclass/gnuconfig.eclass @@ -16,7 +16,13 @@ # other files that come with automake, e.g. depcomp, mkinstalldirs, etc. # -DEPEND="sys-devel/gnuconfig" +case ${EAPI:-0} in + 5|6|7) + ;; + *) + die "EAPI ${EAPI} is unsupported!" + ;; +esac if [[ -z ${_GNUCONFIG_ECLASS} ]] ; then _GNUCONFIG_CLASS=1 @@ -99,12 +105,25 @@ gnuconfig_do_update() { # This searches the standard locations for the newest config.{sub|guess}, and # returns the directory where they can be found. gnuconfig_findnewest() { - local locations=( - "${EPREFIX}"/usr/share/misc/config.sub - "${EPREFIX}"/usr/share/gnuconfig/config.sub - "${EPREFIX}"/usr/share/automake*/config.sub - "${EPREFIX}"/usr/share/libtool/config.sub + local locations=() + local prefix + + case ${EAPI} in + 5|6) + prefix="${EPREFIX}" + ;; + *) + prefix="${BROOT}" + ;; + esac + + locations+=( + "${prefix}"/usr/share/misc/config.sub + "${prefix}"/usr/share/gnuconfig/config.sub + "${prefix}"/usr/share/automake*/config.sub + "${prefix}"/usr/share/libtool/config.sub ) + grep -s '^timestamp' "${locations[@]}" | \ sort -r -n -t\' -k2 | \ sed -n '1{s,/config.sub:.*$,,;p;q}' -- cgit v1.2.3-65-gdbad From 91d7d6378c8df8b0a116b8adcffa5268d040d515 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 1 Apr 2021 00:03:21 +0000 Subject: autotools.eclass: use gnuconfig.eclass for finding latest config.{guess, sub} No need to duplicate logic. Signed-off-by: Sam James --- eclass/autotools.eclass | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 04d94d882607..054a31781e72 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -35,7 +35,7 @@ case ${EAPI:-0} in *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; esac -inherit libtool +inherit gnuconfig libtool # @ECLASS-VARIABLE: WANT_AUTOCONF # @PRE_INHERIT @@ -400,15 +400,7 @@ eautoconf() { # Install config.guess and config.sub which are required by many macros # in autoconf >=2.70. - local _gnuconfig - case ${EAPI:-0} in - 0|1|2|3|4|5|6) - _gnuconfig="${EPREFIX}/usr/share/gnuconfig" - ;; - *) - _gnuconfig="${BROOT}/usr/share/gnuconfig" - ;; - esac + local _gnuconfig=$(gnuconfig_findnewest) cp "${_gnuconfig}"/config.{guess,sub} . || die autotools_run_tool --at-m4flags autoconf "$@" -- cgit v1.2.3-65-gdbad From 3cc3c088b3110126be84f74c0b8ffe0a6daab24f Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 3 Apr 2021 17:27:11 +0100 Subject: autotools.eclass: fix EAPI support logic in config_rpath_update ${EPREFIX} doesn't exist pre-EAPI 3, so let's make that clear. Signed-off-by: Sam James --- eclass/autotools.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 054a31781e72..4a963d78db58 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -475,7 +475,7 @@ config_rpath_update() { local dst src case ${EAPI:-0} in - 0|1|2|3|4|5|6) + 4|5|6) src="${EPREFIX}/usr/share/gettext/config.rpath" ;; *) -- cgit v1.2.3-65-gdbad From 5b663febf4634ea75ef9e7ab433a2e16e9fde975 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 31 Mar 2021 23:49:33 +0000 Subject: autotools.eclass: drop obsolete EAPI 0 compatibility code Signed-off-by: Sam James --- eclass/autotools.eclass | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 4a963d78db58..e01e72e69b6f 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -26,7 +26,7 @@ fi if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then _AUTOTOOLS_ECLASS=1 -case ${EAPI:-0} in +case ${EAPI} in 5|6) # Needed for eqawarn inherit eutils @@ -84,15 +84,8 @@ if [[ -n ${WANT_AUTOMAKE} ]] ; then # on it because we run aclocal to process m4 macros. This matches # the autoreconf tool, so this requirement is correct, bug #401605. none) ;; - latest) - # Use SLOT deps if we can. For EAPI=0, we get pretty close. - if [[ ${EAPI:-0} != 0 ]] ; then - _automake_atom="|| ( `printf '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )" - else - _automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )" - fi - ;; - *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; + latest) _automake_atom="|| ( `printf '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )" ;; + *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*";; esac export WANT_AUTOMAKE fi @@ -138,8 +131,8 @@ RDEPEND="" # their own DEPEND string. : ${AUTOTOOLS_AUTO_DEPEND:=yes} if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then - case ${EAPI:-0} in - 4|5|6) DEPEND=${AUTOTOOLS_DEPEND} ;; + case ${EAPI} in + 5|6) DEPEND=${AUTOTOOLS_DEPEND} ;; 7) BDEPEND=${AUTOTOOLS_DEPEND} ;; esac fi @@ -383,7 +376,7 @@ eautoconf() { fi if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then - case ${EAPI:-0} in + case ${EAPI} in 5|6|7) eqawarn "This package has a configure.in file which has long been deprecated. Please" eqawarn "update it to use configure.ac instead as newer versions of autotools will die" @@ -474,8 +467,8 @@ eautopoint() { config_rpath_update() { local dst src - case ${EAPI:-0} in - 4|5|6) + case ${EAPI} in + 5|6) src="${EPREFIX}/usr/share/gettext/config.rpath" ;; *) @@ -505,7 +498,7 @@ autotools_env_setup() { for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do # Break on first hit to respect _LATEST_AUTOMAKE order. local hv_args="" - case ${EAPI:-0} in + case ${EAPI} in 5|6) hv_args="--host-root" ;; -- cgit v1.2.3-65-gdbad From 45afdd17d7eecc191399315c88bc4b67aa796d32 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 3 Apr 2021 17:31:06 +0100 Subject: autotools.eclass: more case-style changes for consistency Signed-off-by: Sam James --- eclass/autotools.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index e01e72e69b6f..46f2c9744a08 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -85,7 +85,7 @@ if [[ -n ${WANT_AUTOMAKE} ]] ; then # the autoreconf tool, so this requirement is correct, bug #401605. none) ;; latest) _automake_atom="|| ( `printf '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )" ;; - *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*";; + *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; esac export WANT_AUTOMAKE fi @@ -381,13 +381,13 @@ eautoconf() { eqawarn "This package has a configure.in file which has long been deprecated. Please" eqawarn "update it to use configure.ac instead as newer versions of autotools will die" eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." - ;; + ;; *) # Move configure file to the new location only on newer EAPIs to ensure # checks are done rather than retroactively breaking ebuilds. einfo "Moving configure.in to configure.ac (bug #426262)" mv configure.{in,ac} || die - ;; + ;; esac fi -- cgit v1.2.3-65-gdbad From 12b96919c87fe9391c5ed4afb87838f6981c4d3d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 11 Apr 2021 22:36:57 +0200 Subject: flag-o-matic.eclass: SUPPORTED_EAPIS: 5,6,7; drop eutils, multilib - eutils was only used for eqawarn in old EAPI - multilib usage unknown, but is inherited by toolchain-funcs anyway Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- eclass/flag-o-matic.eclass | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 20ee39d98bad..b2510ec56009 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -1,18 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: flag-o-matic.eclass # @MAINTAINER: # toolchain@gentoo.org +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: common functions to manipulate and query toolchain flags # @DESCRIPTION: # This eclass contains a suite of functions to help developers sanely # and safely manage toolchain flags in their builds. +case ${EAPI:-0} in + 0|1|2|3|4) die "flag-o-matic.eclass: EAPI ${EAPI} is too old." ;; + 5|6|7) ;; + *) die "EAPI ${EAPI} is not supported by flag-o-matic.eclass." ;; +esac + if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then _FLAG_O_MATIC_ECLASS=1 -inherit eutils toolchain-funcs multilib +inherit toolchain-funcs + +[[ ${EAPI} == [567] ]] && inherit eutils # Return all the flag variables that our high level funcs operate on. all-flag-vars() { -- cgit v1.2.3-65-gdbad From bf1aeae30e2947b4c10d6c9a81e624ff79a6af6c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 11 Apr 2021 22:37:08 +0200 Subject: flag-o-matic.eclass: Make setup-allowed-flags() internal Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- eclass/flag-o-matic.eclass | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index b2510ec56009..8357050193bd 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -28,9 +28,23 @@ all-flag-vars() { echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS } +# @FUNCTION: setup-allowed-flags +# @INTERNAL +# @DESCRIPTION: # {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags # Note: shell globs and character lists are allowed setup-allowed-flags() { + [[ ${EAPI} == [567] ]] || + die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}." + _setup-allowed-flags "$@" +} + +# @FUNCTION: _setup-allowed-flags +# @INTERNAL +# @DESCRIPTION: +# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags +# Note: shell globs and character lists are allowed +_setup-allowed-flags() { ALLOWED_FLAGS=( -pipe -O '-O[12sg]' -mcpu -march -mtune '-fstack-protector*' '-fsanitize*' '-fstack-check*' -fno-stack-check @@ -414,7 +428,7 @@ strip-flags() { local x y var local ALLOWED_FLAGS - setup-allowed-flags + _setup-allowed-flags set -f # disable pathname expansion -- cgit v1.2.3-65-gdbad From c24ac2d8ddb273e640b43ca0af9b83e0ccf499a9 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 11 Apr 2021 22:37:10 +0200 Subject: flag-o-matic.eclass: Make test-flag-PROG() internal Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- eclass/flag-o-matic.eclass | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 8357050193bd..378ff0877400 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -461,7 +461,25 @@ strip-flags() { return 0 } +# @FUNCTION: test-flag-PROG +# @USAGE: +# @INTERNAL +# @DESCRIPTION: +# Returns shell true if is supported by given , +# else returns shell false. test-flag-PROG() { + [[ ${EAPI} == [567] ]] || + die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}." + _test-flag-PROG "$@" +} + +# @FUNCTION: _test-flag-PROG +# @USAGE: +# @INTERNAL +# @DESCRIPTION: +# Returns shell true if is supported by given , +# else returns shell false. +_test-flag-PROG() { local comp=$1 local lang=$2 shift 2 @@ -556,31 +574,31 @@ test-flag-PROG() { # @USAGE: # @DESCRIPTION: # Returns shell true if is supported by the C compiler, else returns shell false. -test-flag-CC() { test-flag-PROG "CC" c "$@"; } +test-flag-CC() { _test-flag-PROG CC c "$@"; } # @FUNCTION: test-flag-CXX # @USAGE: # @DESCRIPTION: # Returns shell true if is supported by the C++ compiler, else returns shell false. -test-flag-CXX() { test-flag-PROG "CXX" c++ "$@"; } +test-flag-CXX() { _test-flag-PROG CXX c++ "$@"; } # @FUNCTION: test-flag-F77 # @USAGE: # @DESCRIPTION: # Returns shell true if is supported by the Fortran 77 compiler, else returns shell false. -test-flag-F77() { test-flag-PROG "F77" f77 "$@"; } +test-flag-F77() { _test-flag-PROG F77 f77 "$@"; } # @FUNCTION: test-flag-FC # @USAGE: # @DESCRIPTION: # Returns shell true if is supported by the Fortran 90 compiler, else returns shell false. -test-flag-FC() { test-flag-PROG "FC" f95 "$@"; } +test-flag-FC() { _test-flag-PROG FC f95 "$@"; } # @FUNCTION: test-flag-CCLD # @USAGE: # @DESCRIPTION: # Returns shell true if is supported by the C compiler and linker, else returns shell false. -test-flag-CCLD() { test-flag-PROG "CC" c+ld "$@"; } +test-flag-CCLD() { _test-flag-PROG CC c+ld "$@"; } test-flags-PROG() { local comp=$1 -- cgit v1.2.3-65-gdbad From bebf48f48763ad6966a702f24bdabf225448cc98 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 11 Apr 2021 22:37:12 +0200 Subject: flag-o-matic.eclass: Make test-flags-PROG() internal Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- eclass/flag-o-matic.eclass | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 378ff0877400..0d2760d686f2 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -600,7 +600,25 @@ test-flag-FC() { _test-flag-PROG FC f95 "$@"; } # Returns shell true if is supported by the C compiler and linker, else returns shell false. test-flag-CCLD() { _test-flag-PROG CC c+ld "$@"; } +# @FUNCTION: test-flags-PROG +# @USAGE: [more flags...] +# @INTERNAL +# @DESCRIPTION: +# Returns shell true if are supported by given , +# else returns shell false. test-flags-PROG() { + [[ ${EAPI} == [567] ]] || + die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}." + _test-flags-PROG "$@" +} + +# @FUNCTION: _test-flags-PROG +# @USAGE: [more flags...] +# @INTERNAL +# @DESCRIPTION: +# Returns shell true if are supported by given , +# else returns shell false. +_test-flags-PROG() { local comp=$1 local flags=() local x @@ -637,31 +655,31 @@ test-flags-PROG() { # @USAGE: # @DESCRIPTION: # Returns shell true if are supported by the C compiler, else returns shell false. -test-flags-CC() { test-flags-PROG "CC" "$@"; } +test-flags-CC() { _test-flags-PROG CC "$@"; } # @FUNCTION: test-flags-CXX # @USAGE: # @DESCRIPTION: # Returns shell true if are supported by the C++ compiler, else returns shell false. -test-flags-CXX() { test-flags-PROG "CXX" "$@"; } +test-flags-CXX() { _test-flags-PROG CXX "$@"; } # @FUNCTION: test-flags-F77 # @USAGE: # @DESCRIPTION: # Returns shell true if are supported by the Fortran 77 compiler, else returns shell false. -test-flags-F77() { test-flags-PROG "F77" "$@"; } +test-flags-F77() { _test-flags-PROG F77 "$@"; } # @FUNCTION: test-flags-FC # @USAGE: # @DESCRIPTION: # Returns shell true if are supported by the Fortran 90 compiler, else returns shell false. -test-flags-FC() { test-flags-PROG "FC" "$@"; } +test-flags-FC() { _test-flags-PROG FC "$@"; } # @FUNCTION: test-flags-CCLD # @USAGE: # @DESCRIPTION: # Returns shell true if are supported by the C compiler and default linker, else returns shell false. -test-flags-CCLD() { test-flags-PROG "CCLD" "$@"; } +test-flags-CCLD() { _test-flags-PROG CCLD "$@"; } # @FUNCTION: test-flags # @USAGE: -- cgit v1.2.3-65-gdbad From ec597af5a1f701bea67abecfa0795e7569b07711 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 11 Apr 2021 22:37:14 +0200 Subject: flag-o-matic.eclass: Fix eclassdoc Signed-off-by: Andreas Sturmlechner Signed-off-by: Sam James --- eclass/flag-o-matic.eclass | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 0d2760d686f2..ed1b6e746cef 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -23,6 +23,8 @@ inherit toolchain-funcs [[ ${EAPI} == [567] ]] && inherit eutils +# @FUNCTION: all-flag-vars +# @DESCRIPTION: # Return all the flag variables that our high level funcs operate on. all-flag-vars() { echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS @@ -110,7 +112,10 @@ _setup-allowed-flags() { ) } -# inverted filters for hardened compiler. This is trying to unpick +# @FUNCTION: _filter-hardened +# @INTERNAL +# @DESCRIPTION: +# Inverted filters for hardened compiler. This is trying to unpick # the hardened compiler defaults. _filter-hardened() { local f @@ -144,6 +149,9 @@ _filter-hardened() { done } +# @FUNCTION: _filter-var +# @INTERNAL +# @DESCRIPTION: # Remove occurrences of strings from variable given in $1 # Strings removed are matched as globs, so for example # '-O*' would remove -O1, -O2 etc. @@ -336,6 +344,11 @@ replace-cpu-flags() { return 0 } +# @FUNCTION: _is_flagq +# @USAGE: +# @INTERNAL +# @DESCRIPTION: +# Returns shell true if is in a given , else returns shell false. _is_flagq() { local x var="$1[*]" for x in ${!var} ; do -- cgit v1.2.3-65-gdbad From fd52dbeb4c26bcb6b5331def1eb65c1339f2036a Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 11 Apr 2021 23:11:06 +0200 Subject: sys-auth/nss_ldap: Fix libdir symlinks Bug: https://bugs.gentoo.org/581306 Bug: https://bugs.gentoo.org/780108 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert --- sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch | 31 +++++ sys-auth/nss_ldap/nss_ldap-265-r8.ebuild | 147 ---------------------- sys-auth/nss_ldap/nss_ldap-265-r9.ebuild | 147 ++++++++++++++++++++++ 3 files changed, 178 insertions(+), 147 deletions(-) create mode 100644 sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch delete mode 100644 sys-auth/nss_ldap/nss_ldap-265-r8.ebuild create mode 100644 sys-auth/nss_ldap/nss_ldap-265-r9.ebuild diff --git a/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch b/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch new file mode 100644 index 000000000000..d3609b604a23 --- /dev/null +++ b/sys-auth/nss_ldap/files/nss_ldap-265-libdir.patch @@ -0,0 +1,31 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -38,17 +38,13 @@ + DEFS = @DEFS@ + #INCLUDES = -I$(top_builddir) -I$(srcdir) + +-if GCC +-MULTI_OS_DIRECTORY=$(shell $(CC) $(CFLAGS) -print-multi-os-directory) +-else + MULTI_OS_DIRECTORY=. +-endif + + if GLIBC +-LIBC_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|') ++LIBC_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|') + NSS_LDAP_LIBC_VERSIONED = libnss_ldap-$(LIBC_VERS).so + +-NSS_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|') ++NSS_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|') + NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS) + endif + +@@ -83,8 +79,6 @@ + $(mkinstalldirs) $(DESTDIR)$(libdir) + $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED) + (cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED)) +- $(mkinstalldirs) $(DESTDIR)/usr$(libdir) +- (cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .) + else + $(mkinstalldirs) $(DESTDIR)$(libdir) + if HPUX diff --git a/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild deleted file mode 100644 index e6ed3ba6fc38..000000000000 --- a/sys-auth/nss_ldap/nss_ldap-265-r8.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools fixheadtails multilib-minimal prefix - -DESCRIPTION="NSS LDAP Module" -HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html" -SRC_URI="http://www.padl.com/download/${P}.tar.gz" - -SLOT="0" -LICENSE="LGPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" -IUSE="debug kerberos ssl sasl" - -DEPEND=" - >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] - sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${DEPEND} - ! /lib* symlinks gone wrong - rm -rf "${ED}"/usr/usr || die - - insinto /etc - doins ldap.conf - - # Append two blank lines and some skip entries - echo >>"${ED}"/etc/ldap.conf || die - echo >>"${ED}"/etc/ldap.conf || die - sed -i "${ED}"/etc/ldap.conf \ - -e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' \ - || die - - dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \ - CVSVersionInfo.txt README nsswitch.ldap certutil - - docinto docs - dodoc doc/* -} - -pkg_postinst() { - elog "If you use a ldaps:// string in the 'uri' setting of" - elog "your /etc/ldap.conf, you must set 'ssl on'!" -} diff --git a/sys-auth/nss_ldap/nss_ldap-265-r9.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r9.ebuild new file mode 100644 index 000000000000..749cdb870cf0 --- /dev/null +++ b/sys-auth/nss_ldap/nss_ldap-265-r9.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools fixheadtails multilib-minimal prefix + +DESCRIPTION="NSS LDAP Module" +HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html" +SRC_URI="http://www.padl.com/download/${P}.tar.gz" + +SLOT="0" +LICENSE="LGPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" +IUSE="debug kerberos ssl sasl split-usr" + +DEPEND=" + >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] + sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${DEPEND} + !>"${ED}"/etc/ldap.conf || die + echo >>"${ED}"/etc/ldap.conf || die + sed -i "${ED}"/etc/ldap.conf \ + -e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' \ + || die + + dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \ + CVSVersionInfo.txt README nsswitch.ldap certutil + + docinto docs + dodoc -r doc/. +} + +pkg_postinst() { + elog "If you use a ldaps:// string in the 'uri' setting of" + elog "your /etc/ldap.conf, you must set 'ssl on'!" +} -- cgit v1.2.3-65-gdbad From 8a8bc44c12ae69dd00a29e6695a205675b9cda87 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 11 Apr 2021 23:15:11 +0200 Subject: sys-libs/gpm: make CONFIG_INPUT_MOUSEDEV check non-fatal Thanks-to: kurly Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert --- sys-libs/gpm/gpm-1.20.7-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/gpm/gpm-1.20.7-r3.ebuild b/sys-libs/gpm/gpm-1.20.7-r3.ebuild index bb7b8679025a..22f9f5d1a4aa 100644 --- a/sys-libs/gpm/gpm-1.20.7-r3.ebuild +++ b/sys-libs/gpm/gpm-1.20.7-r3.ebuild @@ -27,7 +27,7 @@ BDEPEND=" sys-apps/texinfo virtual/yacc" -CONFIG_CHECK="INPUT_MOUSEDEV" +CONFIG_CHECK="~INPUT_MOUSEDEV" ERROR_INPUT_MOUSEDEV="CONFIG_INPUT_MOUSEDEV:\tis not set (required to expose mice for GPM)" pkg_pretend() { -- cgit v1.2.3-65-gdbad