summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-09-25 19:33:39 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-09-25 19:33:39 +0100
commita5b65c81168c90928784a1e92cda84ed5d6b9eb3 (patch)
tree4aa7483cd0ad7de54338afc8e7971417abe1dd81 /eclass
parente8f81810baa21f490d6910e8e2d424546b72a333 (diff)
gentoo resync : 25.09.2019
Diffstat (limited to 'eclass')
-rw-r--r--eclass/Manifest.gzbin37485 -> 37489 bytes
-rw-r--r--eclass/ada.eclass11
-rw-r--r--eclass/ant-tasks.eclass1
-rw-r--r--eclass/autotools-utils.eclass2
-rw-r--r--eclass/bazel.eclass3
-rw-r--r--eclass/common-lisp-3.eclass10
-rw-r--r--eclass/font.eclass2
-rw-r--r--eclass/freebsd.eclass4
-rw-r--r--eclass/games-mods.eclass4
-rw-r--r--eclass/kde5.eclass1
-rw-r--r--eclass/mozconfig-v6.60.eclass8
-rw-r--r--eclass/php-ext-source-r3.eclass19
-rw-r--r--eclass/qmail.eclass27
-rw-r--r--eclass/ruby-fakegem.eclass14
-rw-r--r--eclass/savedconfig.eclass1
-rw-r--r--eclass/sgml-catalog-r1.eclass1
-rw-r--r--eclass/toolchain-glibc.eclass18
17 files changed, 56 insertions, 70 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b54388dc8f83..e926bc25f3b3 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files differ
diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index 86a67fc24fd0..dad3d9acce85 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -6,6 +6,7 @@
# Ada team <ada@gentoo.org>
# @AUTHOR:
# Tupone Alfredo <tupone@gentoo.org>
+# @SUPPORTED_EAPIS: 6 7
# @BLURB: An eclass for Ada packages
# @DESCRIPTION:
# This eclass set the IUSE and REQUIRED_USE to request the ADA_TARGET
@@ -221,6 +222,10 @@ ada_export() {
export GCC_PV=${gcc_pv}
debug-print "${FUNCNAME}: GCC_PV = ${GCC_PV}"
;;
+ GNAT)
+ export GNAT=${EPREFIX}/usr/bin/gnat-${gcc_pv}
+ debug-print "${FUNCNAME}: GNAT = ${GNAT}"
+ ;;
GNATBIND)
export GNATBIND=${EPREFIX}/usr/bin/gnatbind-${gcc_pv}
debug-print "${FUNCNAME}: GNATBIND = ${GNATBIND}"
@@ -404,9 +409,9 @@ ada_setup() {
unset EADA
if [[ ${#_ADA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
- if use "ada_targets_${_ADA_SUPPORTED_IMPLS[0]}"; then
+ if use "ada_target_${_ADA_SUPPORTED_IMPLS[0]}"; then
# Only one supported implementation, enable it explicitly
- ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV
+ ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV GNAT GNATBIND GNATLS GNATMAKE
ada_wrapper_setup
fi
else
@@ -422,7 +427,7 @@ ada_setup() {
die "More than one implementation in ADA_TARGET."
fi
- ada_export "${impl}" EADA GCC GCC_PV GNATMAKE
+ ada_export "${impl}" EADA GCC_PV GNAT GNATBIND GNATLS GNATMAKE
ada_wrapper_setup
fi
done
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 84e657657952..309df084d156 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -6,6 +6,7 @@
# java@gentoo.org
# @AUTHOR:
# Vlastimil Babka <caster@gentoo.org>
+# @SUPPORTED_EAPIS: 6 7
# @BLURB: Eclass for building dev-java/ant-* packages
# @DESCRIPTION:
# This eclass provides functionality and default ebuild variables for building
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 0addf76a92f6..06c79fd652a6 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -5,7 +5,7 @@
# @MAINTAINER:
# Maciej Mrozowski <reavertm@gentoo.org>
# Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 2 3 4 5
+# @SUPPORTED_EAPIS: 4 5
# @BLURB: common ebuild functions for autotools-based packages
# @DESCRIPTION:
# autotools-utils.eclass is autotools.eclass(5) and base.eclass(5) wrapper
diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass
index ce80ea185e9c..4eacb75776e4 100644
--- a/eclass/bazel.eclass
+++ b/eclass/bazel.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Jason Zaman
+# Copyright 1999-2019 Jason Zaman
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: bazel.eclass
@@ -6,6 +6,7 @@
# Jason Zaman <perfinion@gentoo.org>
# @AUTHOR:
# Jason Zaman <perfinion@gentoo.org>
+# @SUPPORTED_EAPIS: 7
# @BLURB: Utility functions for packages using Bazel Build
# @DESCRIPTION:
# A utility eclass providing functions to run the Bazel Build system.
diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass
index ae2294910252..65ad5a58a343 100644
--- a/eclass/common-lisp-3.eclass
+++ b/eclass/common-lisp-3.eclass
@@ -75,6 +75,7 @@ common-lisp-install-one-source() {
}
# @FUNCTION: lisp-file-p
+# @USAGE: <file>
# @DESCRIPTION:
# Returns true if ${1} is lisp source file.
lisp-file-p() {
@@ -84,6 +85,7 @@ lisp-file-p() {
}
# @FUNCTION: common-lisp-get-fpredicate
+# @USAGE: <type>
# @DESCRIPTION:
# Outputs the corresponding predicate to check files of type ${1}.
common-lisp-get-fpredicate() {
@@ -98,7 +100,7 @@ common-lisp-get-fpredicate() {
}
# @FUNCTION: common-lisp-install-sources
-# @USAGE: common-lisp-install-sources path [<other_paths>...]
+# @USAGE: <path> [...]
# @DESCRIPTION:
# Recursively install lisp sources of type ${2} if ${1} is -t or
# Lisp by default. When given a directory, it will be recursively
@@ -126,6 +128,7 @@ common-lisp-install-sources() {
}
# @FUNCTION: common-lisp-install-one-asdf
+# @USAGE: <file>
# @DESCRIPTION:
# Installs ${1} asdf file in CLSOURCEROOT/CLPACKAGE and symlinks it in
# CLSYSTEMROOT.
@@ -140,7 +143,7 @@ common-lisp-install-one-asdf() {
}
# @FUNCTION: common-lisp-install-asdf
-# @USAGE: common-lisp-install-asdf path [<other_paths>...]
+# @USAGE: <path> [...]
# @DESCRIPTION:
# Installs all ASDF files and creates symlinks in CLSYSTEMROOT.
# When given a directory, it will be recursively scanned for ASDF
@@ -167,7 +170,6 @@ common-lisp-3_src_install() {
}
# @FUNCTION: common-lisp-find-lisp-impl
-# @USAGE: common-lisp-find-lisp-impl
# @DESCRIPTION:
# Outputs an installed Common Lisp implementation. Transverses
# CLIMPLEMENTATIONS to find it.
@@ -179,7 +181,7 @@ common-lisp-find-lisp-impl() {
}
# @FUNCTION: common-lisp-export-impl-args
-# @USAGE: common-lisp-export-impl-args <lisp-implementation>
+# @USAGE: <lisp-implementation>
# @DESCRIPTION:
# Export a few variables containing the switches necessary
# to make the CL implementation perform basic functions:
diff --git a/eclass/font.eclass b/eclass/font.eclass
index 5f3e15eafc59..1570bf3f6e19 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -199,7 +199,7 @@ font_src_install() {
[[ -n ${DOCS} ]] && { dodoc ${DOCS} || die "docs installation failed" ; }
# install common docs
- for commondoc in COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog FONTLOG.txt; do
+ for commondoc in COPYRIGHT README{,.md,.txt} NEWS AUTHORS BUGS ChangeLog FONTLOG.txt; do
[[ -s ${commondoc} ]] && dodoc ${commondoc}
done
}
diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 7c89d953c4ba..420312b50833 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
#
# @MAINTAINER:
@@ -76,7 +76,7 @@ if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then
if [[ ${DL_PV} == ${MY_PV} ]]; then
DL_PV="${DL_PV}-RELEASE"
fi
- SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz"
+ SRC_URI="mirror://gentoo/freebsd-src-${MY_PV}.tar.xz"
fi
IUSE="profile"
diff --git a/eclass/games-mods.eclass b/eclass/games-mods.eclass
index f2e4a25841fc..bbc9423154dd 100644
--- a/eclass/games-mods.eclass
+++ b/eclass/games-mods.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Variables to specify in an ebuild which uses this eclass:
@@ -133,7 +133,7 @@ DESCRIPTION="${GAME_NAME} ${MOD_NAME} - ${MOD_DESC}"
SLOT="0"
IUSE="dedicated opengl"
-RESTRICT="mirror strip"
+RESTRICT="bindist mirror strip"
DEPEND="app-arch/unzip"
RDEPEND="dedicated? ( $(games-mods_get_rdepend --ded) )
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9f71e428c54f..db9fc4427c71 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -4,6 +4,7 @@
# @ECLASS: kde5.eclass
# @MAINTAINER:
# kde@gentoo.org
+# @SUPPORTED_EAPIS: 6 7
# @BLURB: Support eclass for packages that follow KDE packaging conventions.
# @DESCRIPTION:
# This eclass is intended to streamline the creation of ebuilds for packages
diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index 2a6e0e07bb60..ae83ebd6c314 100644
--- a/eclass/mozconfig-v6.60.eclass
+++ b/eclass/mozconfig-v6.60.eclass
@@ -160,6 +160,14 @@ DEPEND="app-arch/zip
sys-apps/findutils
|| (
(
+ sys-devel/clang:9
+ !clang? ( sys-devel/llvm:9 )
+ clang? (
+ =sys-devel/lld-9*
+ sys-devel/llvm:9[gold]
+ )
+ )
+ (
sys-devel/clang:8
!clang? ( sys-devel/llvm:8 )
clang? (
diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
index 5ef879a2be23..385bdb9dae0b 100644
--- a/eclass/php-ext-source-r3.eclass
+++ b/eclass/php-ext-source-r3.eclass
@@ -15,7 +15,8 @@ inherit autotools
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
case ${EAPI:-0} in
- 6|7) ;;
+ 6) inherit eapi7-ver ;;
+ 7) ;;
*)
die "${ECLASS} is not compatible with EAPI=${EAPI}"
esac
@@ -183,10 +184,18 @@ php-ext-source-r3_phpize() {
# WANT_AUTOMAKE (see bugs #329071 and #549268).
autotools_run_tool "${PHPIZE}"
- # Force libtoolize to run and regenerate autotools files (bug
- # #220519).
- rm aclocal.m4 || die "failed to remove aclocal.m4"
- eautoreconf
+ # PHP >=7.4 no longer works with eautoreconf
+ if ver_test $PHP_CURRENTSLOT -ge 7.4 ; then
+ rm -fr aclocal.m4 autom4te.cache config.cache \
+ configure main/php_config.h.in || die
+ eautoconf --force
+ eautoheader
+ else
+ # Force libtoolize to run and regenerate autotools files (bug
+ # #220519).
+ rm aclocal.m4 || die "failed to remove aclocal.m4"
+ eautoreconf
+ fi
fi
}
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 150b6c00aab3..158cf1607cf5 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -69,7 +69,7 @@ dospp() {
}
# @FUNCTION: dosupervise
-# @USAGE: dosupervise <service> [<runfile> <logfile>]
+# @USAGE: <service> [<runfile> <logfile>]
# @DESCRIPTION:
# Install runfiles for services and logging to supervise directory
dosupervise() {
@@ -105,31 +105,6 @@ qmail_set_cc() {
sed -e "s#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i make-makelib.sh
}
-# @FUNCTION: qmail_create_groups
-# @DESCRIPTION:
-# Keep qmail groups in sync across ebuilds
-qmail_create_groups() {
- einfo "Creating qmail groups"
- enewgroup nofiles 200
- enewgroup qmail 201
-}
-
-# @FUNCTION: qmail_create_users
-# @DESCRIPTION:
-# Keep qmail users in sync across ebuilds
-qmail_create_users() {
- qmail_create_groups
-
- einfo "Creating qmail users"
- enewuser alias 200 -1 "${QMAIL_HOME}"/alias 200
- enewuser qmaild 201 -1 "${QMAIL_HOME}" 200
- enewuser qmaill 202 -1 "${QMAIL_HOME}" 200
- enewuser qmailp 203 -1 "${QMAIL_HOME}" 200
- enewuser qmailq 204 -1 "${QMAIL_HOME}" 201
- enewuser qmailr 205 -1 "${QMAIL_HOME}" 201
- enewuser qmails 206 -1 "${QMAIL_HOME}" 201
-}
-
genqmail_src_unpack() {
cd "${WORKDIR}"
[[ -n ${GENQMAIL_PV} ]] && unpack "${GENQMAIL_F}"
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index a6a7654f9e6d..f75e1669b0ca 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -207,7 +207,7 @@ ruby_fakegem_gemsdir() {
}
# @FUNCTION: ruby_fakegem_doins
-# @USAGE: file [file...]
+# @USAGE: <file> [file...]
# @DESCRIPTION:
# Installs the specified file(s) into the gems directory.
ruby_fakegem_doins() {
@@ -217,8 +217,8 @@ ruby_fakegem_doins() {
) || die "failed $0 $@"
}
-# @FUNCTION: ruby_fakegem_newsins
-# @USAGE: file filename
+# @FUNCTION: ruby_fakegem_newins
+# @USAGE: <file> <newname>
# @DESCRIPTION:
# Installs the specified file into the gems directory using the provided filename.
ruby_fakegem_newins() {
@@ -262,7 +262,7 @@ ruby_fakegem_install_gemspec() {
}
# @FUNCTION: ruby_fakegem_gemspec_gemspec
-# @USAGE: gemspec-input gemspec-output
+# @USAGE: <gemspec-input> <gemspec-output>
# @DESCRIPTION:
# Generates an installable version of the specification indicated by
# RUBY_FAKEGEM_GEMSPEC. This file is eval'ed to produce a final specification
@@ -272,7 +272,7 @@ ruby_fakegem_gemspec_gemspec() {
}
# @FUNCTION: ruby_fakegem_metadata_gemspec
-# @USAGE: gemspec-metadata gemspec-output
+# @USAGE: <gemspec-metadata> <gemspec-output>
# @DESCRIPTION:
# Generates an installable version of the specification indicated by
# the metadata distributed by the gem itself. This is similar to how
@@ -282,7 +282,7 @@ ruby_fakegem_metadata_gemspec() {
}
# @FUNCTION: ruby_fakegem_genspec
-# @USAGE: output-gemspec
+# @USAGE: <output-gemspec>
# @DESCRIPTION:
# Generates a gemspec for the package and places it into the "specifications"
# directory of RubyGems.
@@ -327,7 +327,7 @@ EOF
}
# @FUNCTION: ruby_fakegem_binwrapper
-# @USAGE: command [path] [content]
+# @USAGE: <command> [path] [content]
# @DESCRIPTION:
# Creates a new binary wrapper for a command installed by the RubyGem.
# path defaults to /usr/bin/$command content is optional and can be used
diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index b2be715630af..dab2283fe0f4 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -4,6 +4,7 @@
# @ECLASS: savedconfig.eclass
# @MAINTAINER:
# base-system@gentoo.org
+# @SUPPORTED_EAPIS: 5 6 7
# @BLURB: common API for saving/restoring complex configuration files
# @DESCRIPTION:
# It is not uncommon to come across a package which has a very fine
diff --git a/eclass/sgml-catalog-r1.eclass b/eclass/sgml-catalog-r1.eclass
index 6dc870af629a..f466f97fdcce 100644
--- a/eclass/sgml-catalog-r1.eclass
+++ b/eclass/sgml-catalog-r1.eclass
@@ -6,6 +6,7 @@
# Michał Górny <mgorny@gentoo.org>
# @AUTHOR:
# Michał Górny <mgorny@gentoo.org>
+# @SUPPORTED_EAPIS: 7
# @BLURB: Functions for installing SGML catalogs
# @DESCRIPTION:
# This eclass regenerates /etc/sgml/catalog, /etc/sgml.{,c}env
diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index 81d494c6fd53..4aa06db55293 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -1395,23 +1395,6 @@ toolchain-glibc_headers_install() {
dosym usr/include $(alt_prefix)/sys-include
}
-src_strip() {
- # gdb is lame and requires some debugging information to remain in
- # libpthread, so we need to strip it by hand. libthread_db makes no
- # sense stripped as it is only used when debugging.
- local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
- env \
- -uRESTRICT \
- CHOST=${CTARGET} \
- STRIP_MASK="/*/{,tls/}${pthread}*" \
- prepallstrip
- # if user has stripping enabled and does not have split debug turned on,
- # then leave the debugging sections in libpthread.
- if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
- ${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"/*/libpthread-*.so
- fi
-}
-
toolchain-glibc_src_install() {
if just_headers ; then
export ABI=default
@@ -1420,7 +1403,6 @@ toolchain-glibc_src_install() {
fi
foreach_abi toolchain-glibc_do_src_install
- src_strip
}
# Simple test to make sure our new glibc isn't completely broken.